Merge branch 'master' into admin-disable-user

This commit is contained in:
Daniel García authored and GitHub committed 2020-12-08 15:42:37 +01:00
commit b32f4451ee
14 files changed
+263 -261

No files matched your search

+2
View File
@@ -21,6 +21,8 @@
<div class="float-left">
<strong>{{Name}}</strong>
<span class="d-block">{{Email}}</span>
<span class="d-block">Created at: {{created_at}}</span>
<span class="d-block">Last active: {{last_active}}</span>
<span class="d-block">
{{#unless user_enabled}}
<span class="badge badge-danger mr-2" title="User is disabled">Disabled</span>