Commit Graph

3578 Commits

Author SHA1 Message Date
Matias Griese
dcaf9ec01f Define blueprints if not defined 2019-07-19 12:42:30 +03:00
Andy Miller
4a11ded7d1 Merge branch 'develop' into 1.10 2019-07-16 13:02:23 -06:00
Matias Griese
a5d385066e Made RAW blueprints (expert mode) to work properly with Flex Form 2019-07-16 20:29:42 +03:00
Djamil Legato
d85a6777de Attach _list_index to fields within list items so that the index/key is available 2019-07-16 09:56:16 -07:00
Andy Miller
4715aef559 Merge branch 'develop' into 1.10
# Conflicts:
#	languages/en.yaml
#	themes/grav/js/admin.min.js
2019-07-12 11:48:22 -06:00
ricardo118
2562cfbb34 Fix for user without config_system permissions (#1540)
When a user doesn't have admin.configuration_system permissions, rather than opening the next tab (site) it just blanks out without a tab open. This simple fix let's it check for system permission and if not add site. Ideally we should check in order:

if not system use site
if not site use media
if not media use info

but I don't see that being required too much as Info is the most likely one for a user to have if not system (since its just the basic site information)
2019-07-12 11:19:57 -06:00
Stefan Bauer
b4d61dbd4a reduce padding left and right to avoid buttons are displayed on two lines (in German " Passwort vergessen" and "Anmelden" needs to much space to display the buttons side by side) (#1720) 2019-07-12 11:19:27 -06:00
Andy Miller
9fcccdf194 Fix minor CSS layout issue #1717 2019-07-12 11:17:13 -06:00
Matias Griese
b7cc19893c Fixed missing XSS check field when editing modular page as raw 2019-07-11 20:55:11 +03:00
Andy Miller
c318d88f03 Fix '+New Folder' to work with new parent picker 2019-07-11 09:15:07 -06:00
Andy Miller
29c2e12e85 Updated lang file
# Conflicts:
#	languages/en.yaml
2019-07-11 09:02:38 -06:00
Djamil Legato
27f7408afd Removed sneaked in .idea folder 2019-07-09 18:39:46 -07:00
Djamil Legato
b3f5a129ff Updated CHANGELOG after cherry-pick 2019-07-09 17:02:13 -07:00
Djamil Legato
8f6bcc93d3 Fixed issue with nested list fields both utilizing the custom key functionality
# Conflicts:
#	themes/grav/js/admin.min.js
2019-07-09 17:01:15 -07:00
Djamil Legato
7fa8bca2e9 Better support for array field into list field
# Conflicts:
#	CHANGELOG.md
2019-07-09 17:00:24 -07:00
Matias Griese
06bd7664e8 Regression: Page Preview not working, bad url [#1715] 2019-07-09 10:14:48 +03:00
Djamil Legato
3e8f4e6e74 Fixed issue with nested list fields both utilizing the custom key functionality 2019-07-08 17:57:04 -07:00
Djamil Legato
788329c3d2 Better support for array field into list field 2019-07-08 17:56:35 -07:00
Andy Miller
29c7a12dd2 Updated lang file 2019-07-08 15:53:40 -06:00
Matias Griese
539b7add20 Merge branch 'develop' of github.com:getgrav/grav-plugin-admin into 1.10 2019-07-04 11:50:12 +03:00
ricardo118
9bb6afeb91 support for field.classes and field.outer_classes in type:section (#1704) 2019-07-03 13:13:31 -06:00
Romarain
40a49e59ac Added class support in the h1 (#1705)
The option "classes:" is now working and will generate a class in the h1.
2019-07-03 13:12:27 -06:00
Romarain
a5a4ed0aa7 Added class support for the whole container (#1706)
I copied/pasted the original `{% if field.classes is defined %}class="{{ field.classes }}" {% endif %}` present in the extended template of the form plugin.

Now, adding a "classes:" in the fieldset declaration should generate a correspondant class in the HTML.
2019-07-03 13:10:48 -06:00
Hugh Barnes
ad6e9833ab Avoid errors when backups Twig variable not set (#1711)
I don't make backups this way myself, so testing is tricky. I came to this through a discord question.
2019-07-03 13:09:58 -06:00
Andy Miller
1fb881c575 prepare for release 1.10.0-beta.4 2019-07-01 14:50:55 -06:00
Andy Miller
784a83f8c4 fixed changelog 2019-07-01 14:49:30 -06:00
Andy Miller
76c390943d Merge branch 'develop' into 1.10
# Conflicts:
#	CHANGELOG.md
2019-07-01 13:43:58 -06:00
Djamil Legato
4add413d11 Fixed configuration reference in admin 2019-07-01 11:26:24 -07:00
Matias Griese
c3b7285fa2 Fixed 2FA regenerate for Flex Users
# Conflicts:
#	CHANGELOG.md
2019-07-01 11:50:31 -06:00
Matias Griese
b2276071d4 Fixed 2FA regenerate for Flex Users 2019-07-01 20:43:53 +03:00
Matias Griese
30e38312c5 Fixed double slashes in Admin::adminRoute() 2019-07-01 20:35:53 +03:00
Matias Griese
121469311d Fixed redirect when using full path on subfolder install 2019-07-01 20:18:42 +03:00
Matias Griese
be946c16ac Fixed redirect when languages aren't enabled 2019-07-01 20:18:08 +03:00
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