Merge branch 'dev'

smallhacks · Apr 8, 2019 · 4ad2cdb · 4ad2cdb
2 parents 55e5eb9 + 21f6a4e
commit 4ad2cdb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/client/templates/admin/admin.html b/src/client/templates/admin/admin.html
@@ -96,7 +96,7 @@ <h3>{{_ 'admin--page-title'}}</h3>
 										<td>{{userCreatedAt}}</td>
 										<td>{{#if this.status.lastLogin.date}}{{livestamp this.status.lastLogin.date}}{{/if}}</td>
 										<td>
-											<a href="#" class="admin--user-change-password small">{{_ 'admin--users-change-password'}}</a>
+											<a href="#" data-userid="{{_id}}" class="admin--user-change-password small">{{_ 'admin--users-change-password'}}</a>
 													{{#unless admin}}
 												<a href="#" class="ml-3 small admin--user-delete text-danger">{{_ 'admin--users-delete'}}</a>
 													{{/unless}}

diff --git a/src/private/version.json b/src/private/version.json
@@ -1,3 +1,3 @@
 {
-  "version": "1.28"
+  "version": "1.29"
 }