Andy Miller e5166c85d4 Merge branch 'develop' into 1.9 ...

# Conflicts:
#	languages/en.yaml
#	themes/grav/css-compiled/preset.css
#	themes/grav/css-compiled/preset.css.map
#	themes/grav/js/admin.min.js
#	themes/grav/js/vendor.min.js
#	themes/grav/scss/preset.scss

2018-09-29 21:47:54 -06:00

..

Twig

Switched to new Grav Yaml class

2018-08-22 12:45:39 -06:00

admin.php

Merge branch 'develop' into 1.9

2018-09-29 13:10:10 -06:00

adminbasecontroller.php

Fixed broken folder attribute on filepicker [#1465]

2018-06-14 16:47:06 +03:00

admincontroller.php

Merge branch 'develop' into 1.9

2018-09-29 21:47:54 -06:00

gpm.php

Code cleanup

2018-05-10 11:09:13 +03:00

popularity.php

Addressed GPDR rules for popularity #1436

2018-05-15 11:47:46 -06:00

themes.php

Re-implemented Admin::initTheme() with Grav fix

2017-04-19 17:11:45 -06:00

utils.php

Code cleanup

2018-05-10 11:09:13 +03:00