Nemcio/Grav-Admin-Plugin
1
0
Fork 0
mirror of https://github.com/getgrav/grav-plugin-admin.git synced 2025-11-01 19:06:16 +01:00
Code Issues Packages Projects Releases Activity

Merge branches '1.10' and 'develop' of github.com:getgrav/grav-plugin-admin into 1.10

Browse Source 
# Conflicts:
#	CHANGELOG.md
#	blueprints.yaml
#	themes/grav/js/admin.min.js
This commit is contained in:
Matias Griese
2019-06-20 22:15:16 +03:00
parent 2e85583141 f2a8194572
commit fba6118836
3 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
CHANGELOG.md
View File

@@ -21,6 +21,19 @@
1. [](#bugfix) 1. [](#bugfix)
* Fixed admin caching issues * 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 # v1.9.5
## 06/14/2019 ## 06/14/2019

1
admin.yaml
View File

@@ -22,7 +22,6 @@ widgets:
pages: pages:
show_parents: both show_parents: both
show_modular: true show_modular: true
parents_levels: "2"
session: session:
timeout: 1800 timeout: 1800
warnings: warnings:

3
classes/plugin/AdminController.php
View File

@@ -287,9 +287,6 @@ class AdminController extends AdminBaseController
$user->undef('hashed_password'); $user->undef('hashed_password');
$user->undef('reset'); $user->undef('reset');
$user->set('password', $password); $user->set('password', $password);
$user->validate();
$user->filter();
$user->save(); $user->save();
$this->admin->setMessage($this->admin::translate('PLUGIN_ADMIN.RESET_PASSWORD_RESET'), 'info'); $this->admin->setMessage($this->admin::translate('PLUGIN_ADMIN.RESET_PASSWORD_RESET'), 'info');