mirror of
https://github.com/getgrav/grav-plugin-admin.git
synced 2025-11-01 19:06:16 +01:00
Merge branches '1.10' and 'develop' of github.com:getgrav/grav-plugin-admin into 1.10
# Conflicts: # CHANGELOG.md # blueprints.yaml # themes/grav/js/admin.min.js
This commit is contained in:
13
CHANGELOG.md
13
CHANGELOG.md
@@ -21,6 +21,19 @@
|
||||
1. [](#bugfix)
|
||||
* Fixed admin caching issues
|
||||
|
||||
# v1.9.7
|
||||
## mm/dd/2019
|
||||
|
||||
1. [](#bugfix)
|
||||
* Fixed issue with charts in dashboard where label would cut off [#1700](https://github.com/getgrav/grav-plugin-admin/issues/1700)
|
||||
* Resetting a user's password clears the user's site access [grav#2528](https://github.com/getgrav/grav/issues/2528)
|
||||
|
||||
# v1.9.6
|
||||
## 06/15/2019
|
||||
|
||||
1. [](#bugfix)
|
||||
* Fixed regression issue with `parents_levels` defaulting to `2`
|
||||
|
||||
# v1.9.5
|
||||
## 06/14/2019
|
||||
|
||||
|
||||
@@ -22,7 +22,6 @@ widgets:
|
||||
pages:
|
||||
show_parents: both
|
||||
show_modular: true
|
||||
parents_levels: "2"
|
||||
session:
|
||||
timeout: 1800
|
||||
warnings:
|
||||
|
||||
@@ -287,9 +287,6 @@ class AdminController extends AdminBaseController
|
||||
$user->undef('hashed_password');
|
||||
$user->undef('reset');
|
||||
$user->set('password', $password);
|
||||
|
||||
$user->validate();
|
||||
$user->filter();
|
||||
$user->save();
|
||||
|
||||
$this->admin->setMessage($this->admin::translate('PLUGIN_ADMIN.RESET_PASSWORD_RESET'), 'info');
|
||||
|
||||
Reference in New Issue
Block a user