Commit Graph

3533 Commits

Author SHA1 Message Date
Andy Miller
c84866b93c Merge branch 'develop' into 1.10
# Conflicts:
#	blueprints.yaml
2019-06-21 15:15:11 -06:00
Andy Miller
d626305f11 Merge tag '1.9.7' into develop
Release v1.9.7
2019-06-21 15:14:40 -06:00
Andy Miller
5dea5f4e2c Merge branch 'release/1.9.7' 1.9.7 2019-06-21 15:14:39 -06:00
Andy Miller
3edf86f5cc prepare for release 2019-06-21 15:14:28 -06:00
Andy Miller
928517ac0c cleanup changelog 2019-06-20 19:40:23 -06:00
Andy Miller
6f317ac7a6 Merge branch 'develop' into 1.10
# Conflicts:
#	themes/grav/css-compiled/preset.css.map
#	themes/grav/css-compiled/template.css
#	themes/grav/css-compiled/template.css.map
2019-06-20 19:35:24 -06:00
Andy Miller
496e20367f Fixes issue with permission toggle #1702 2019-06-20 19:33:57 -06:00
Matias Griese
fba6118836 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
2019-06-20 22:15:16 +03:00
Matias Griese
f2a8194572 Resetting a user's password clears the user's site access [grav#2528] 2019-06-20 22:13:04 +03:00
Djamil Legato
2e85583141 Fixed missing check for maximum allowed files in files field 2019-06-18 19:02:31 -07:00
Djamil Legato
8f07fcb790 Moved Remodal in-house and added support for stackable modals (fixes #1698, fixes #1699) 2019-06-18 17:24:27 -07:00
Matias Griese
3c28443e13 Merge remote-tracking branch 'origin/1.10' into 1.10 2019-06-18 12:16:32 +03:00
Matias Griese
902447a50c WIP: Added new controller for admin 2019-06-18 12:15:58 +03:00
Andy Miller
b0ff3511aa missing lang strings 2019-06-17 22:16:31 -06:00
Andy Miller
6e462efc5e Fixex #1700 - dashboard chart labels cut off 2019-06-17 22:10:58 -06:00
Djamil Legato
186f6f26bf Fixed issue with charts in dashboard where label would cut off (fixes #1700) 2019-06-17 16:52:29 -07:00
Andy Miller
cab56f403a Merge branch 'release/1.9.6' 1.9.6 2019-06-15 12:11:40 -06:00
Andy Miller
5201e142d4 Merge tag '1.9.6' into develop
Release v1.9.6
2019-06-15 12:11:40 -06:00
Andy Miller
1d3c4b514d prepare for release 2019-06-15 12:11:29 -06:00
Andy Miller
3ff690b8a6 Updated changelog 2019-06-15 12:10:51 -06:00
Andy Miller
e14ac82803 revert parents_levels: 2 2019-06-15 12:09:56 -06:00
Andy Miller
8127dd38f2 Changelog updated 1.10.0-beta.1 2019-06-14 14:56:32 -06:00
Andy Miller
d10ae1916b prepare for beta release 2019-06-14 14:49:15 -06:00
Andy Miller
304514d4b0 Merge branch 'develop' into 1.10
# Conflicts:
#	CHANGELOG.md
#	blueprints.yaml
2019-06-14 14:49:05 -06:00
Andy Miller
e478343d8f Merge branch 'release/1.9.5' 1.9.5 2019-06-14 13:54:21 -06:00
Andy Miller
49986d9672 Merge tag '1.9.5' into develop
Release v1.9.5
2019-06-14 13:54:21 -06:00
Andy Miller
9afff7f95a prepare for release 2019-06-14 13:54:01 -06:00
Andy Miller
c828849e47 update changelog 2019-06-14 13:53:08 -06:00
Matias Griese
49a96a16b5 Changelog update (wrong place) 2019-06-14 12:24:04 +03:00
Matias Griese
c74cc716e9 Fixed admin caching issues 2019-06-14 12:19:31 +03:00
Matias Griese
4be66fd382 Group admin tasks for better readability 2019-06-14 11:39:37 +03:00
Andy Miller
526e2e097d flipped order 2019-06-13 09:55:39 -06:00
Andy Miller
c7b6617905 minor css tweaks 2019-06-08 23:45:14 -06:00
Djamil Legato
eabf2fc3a9 Reworked move modal for pages to use the new parents field 2019-06-08 20:40:59 -07:00
Djamil Legato
42a758c419 Moved parents modal rendering in the proper pages twig 2019-06-08 17:52:16 -07:00
Djamil Legato
81614817d0 More finder styling specificity to avoid admin conflicts 2019-06-08 17:45:15 -07:00
Djamil Legato
e9d83115ae Add node type class name to the finder and pathbar node items 2019-06-08 17:38:17 -07:00
Djamil Legato
1354c57107 Recompiled JS 2019-06-08 17:32:10 -07:00
Djamil Legato
7da0be9a97 Update parent page title upon selection 2019-06-08 17:32:05 -07:00
Andy Miller
eaebc0059f added title 2019-06-08 00:15:46 -06:00
Andy Miller
20c34bdbee Default to folders only 2019-06-07 19:08:48 -06:00
Djamil Legato
9466d784e9 Implemented filters in folderlisting task for parents field 2019-06-07 17:20:56 -07:00
Djamil Legato
2a1ba67822 Pass the field name to the controller task 2019-06-07 17:20:31 -07:00
Djamil Legato
f34e7b53e8 Escape entities in pathBar node items 2019-06-07 16:51:09 -07:00
Djamil Legato
3a224b36fa Fixed and optimized instances to prevent multiple initializations of parents field 2019-06-07 16:29:06 -07:00
Andy Miller
a962e4ffbf use rawroute() 2019-06-07 14:16:59 -06:00
Djamil Legato
b6917d799f Implemented selection of the finder node 2019-06-07 12:36:07 -07:00
Andy Miller
100bcf1b21 scss to fix jumping in finder modal 2019-06-07 12:17:35 -06:00
Djamil Legato
4f39020055 Better breadcrumb (pathbar) navigation implementation 2019-06-06 19:00:37 -07:00
Djamil Legato
cac68b9520 Silently fail if node is not yet available instead of throwing errors 2019-06-06 19:00:15 -07:00