kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-31 02:36:28 +00:00
Code Issues Projects Releases Wiki Activity

Remove a lot of stuff that deals with user activation.

Browse Source
This commit is contained in:
James Cole
2016-12-28 17:07:44 +01:00
parent 98d4bc48b6
commit f44336f7aa
18 changed files with 10 additions and 511 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
resources/views/admin/configuration/index.twig
View File

@@ -24,20 +24,6 @@
</div>
</div>
</div>
{# need to activate account #}
<div class="col-lg-4 col-md-6 col-sm-12 col-xs-12">
<div class="box box-default">
<div class="box-header with-border">
<h3 class="box-title">{{ 'setting_must_confirm_account'|_ }}</h3>
</div>
<div class="box-body">
<p class="text-info">
{{ 'setting_must_confirm_account_explain'|_ }}
</p>
{{ ExpandedForm.checkbox('must_confirm_account','1', mustConfirmAccount) }}
</div>
</div>
</div>
{# installation is demo site #}
<div class="col-lg-4 col-md-6 col-sm-12 col-xs-12">

18
resources/views/admin/users/show.twig
View File

@@ -28,14 +28,6 @@
{{ user.created_at.formatLocalized(monthAndDayFormat) }}
{{ user.created_at.format('H:i') }}</td>
</tr>
<tr>
<td>{{ trans('list.registered_from') }}</td>
<td>{{ registration }} ({{ registrationHost }})</td>
</tr>
<tr>
<td>{{ trans('list.confirmed_from') }}</td>
<td>{{ confirmation }} ({{ confirmationHost }})</td>
</tr>
<tr>
<td>{{ trans('list.is_admin') }}</td>
<td>
@@ -56,16 +48,6 @@
{% endif %}
</td>
</tr>
<tr>
<td>{{ trans('list.is_activated') }}</td>
<td>
{% if information.is_activated %}
<small class="text-success"><i class="fa fa-fw fa-check"></i></small> Yes
{% else %}
<small class="text-danger"><i class="fa fa-fw fa-times"></i></small> No
{% endif %}
</td>
</tr>
<tr>
<td>{{ trans('list.is_blocked') }}</td>
<td>

4
resources/views/auth/register.twig
View File

@@ -27,10 +27,6 @@
<div class="form-group has-feedback">
<input type="email" name="email" value="{{ email }}" class="form-control" placeholder="Email"/>
{% if mustConfirmAccount %}
<p class="help-block">
You must activate your account. If your email address is incorrect, your account will not work.</p>
{% endif %}
</div>
<div class="form-group has-feedback">
<input type="password" class="form-control" placeholder="Password" name="password"/>