Commit Graph

3545 Commits

Author SHA1 Message Date
Matias Griese
00a3a7d1aa Added configuration option translations to set fallback content languages individually for every language 2019-07-01 14:46:43 +03:00
Matias Griese
bf4329c2d1 Merge branch 'feature/multilang' of github.com:getgrav/grav-plugin-admin into 1.10
# Conflicts:
#	CHANGELOG.md
#	classes/plugin/AdminController.php
#	classes/plugin/Twig/AdminTwigExtension.php
2019-06-29 14:57:22 +03:00
Matias Griese
a717729a4d Changelog update 2019-06-27 15:32:51 +03:00
Matias Griese
2a9f194afb Merge branch 'develop' of github.com:getgrav/grav-plugin-admin into feature/multilang 2019-06-27 14:47:36 +03:00
Matias Griese
8872455e1a Much improved multi-language support for pages
Added `Admin::redirect()` method to allow redirects to be used outside of controllers
Added `$admin->adminRoute()` method and `admin_route()` twig function to create language aware admin page links
Renamed `Admin::route()` to `Admin::getCurrentRoute()` and deprecated the old call
Admin redirects should now work better with multiple languages enabled
Fixed default language being renamed to `page.en.md` (English) instead of keeping existing `page.md` filename
2019-06-27 14:39:03 +03:00
Andy Miller
26a284b306 Merge branch 'develop' into 1.10 2019-06-26 09:06:33 -06:00
Miguel Pereira
8575c1e206 Update pages.html.twig
* Added missing closing </li> in language loops
2019-06-26 10:53:18 +03:00
Andy Miller
5c3a9cf3a4 prepare for release 1.10.0-beta.3 2019-06-24 17:39:53 -06:00
Andy Miller
2d6619a5da Smarter handling of symlinks in parent field 2019-06-24 16:36:17 -06:00
Andy Miller
4c20470137 More windows fixes for parent field 2019-06-24 11:22:38 -06:00
Andy Miller
da2f761aeb Fixed issue with windows paths in parent field #1699 2019-06-22 17:24:20 -06:00
Andy Miller
06eff3bcf4 prepaer for release 1.10.0-beta.2 2019-06-21 15:16:58 -06:00
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