Merge branch 'develop' into 1.10

# Conflicts: # CHANGELOG.md # blueprints.yaml # classes/plugin/Admin.php # classes/plugin/AdminController.php # languages/en.yaml # themes/grav/css-compiled/fonts.css # themes/grav/css-compiled/fonts.css.map # themes/grav/css-compiled/template.css # themes/grav/css-compiled/template.css.map # themes/grav/js/admin.min.js # themes/grav/js/vendor.min.js # themes/grav/scss/fonts.scss
2025-10-26 07:46:31 +01:00 · 2020-10-07 17:35:49 -06:00
parent 813527b40b ade299f73d
commit 8f4aca88d7
29 changed files with 48 additions and 2 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -279,6 +279,18 @@
 1. [](#bugfix)
    * Fixed admin caching issues

+# v1.9.17
+## 10/07/2020
+
+1. [](#new)
+    * Support premium themes
+    * Back-ported functionality from Admin 1.10 required for upcoming WYSIWYM Nextgen Editor
+1. [](#improved)
+    * Improved some error messages for better readability
+1. [](#bugfix)
+    * Fixed issue that would force a page reload when failing to install/update a plugin or theme
+    * Fixed proxy/browser caching issues in admin pages
+
 # v1.9.16
 ## 09/01/2020

--- a/admin.php
+++ b/admin.php
@@ -522,6 +522,8 @@ class AdminPlugin extends Plugin
        // Replace page service with admin.
        $this->grav['page'] = function () use ($self) {
            $page = new Page();
+
+            // Plugins may not have the correct Cache-Control header set, force no-store for the proxies.
            $page->expires(0);

            if ($this->grav['user']->authorize('admin.login')) {
--- a/pages/admin/ajax.md
+++ b/pages/admin/ajax.md
@@ -1,6 +1,7 @@
 ---
 title: Generic Ajax
 template: default
+expires: 0

 access:
    admin.login: true
--- a/pages/admin/backup.md
+++ b/pages/admin/backup.md
@@ -1,6 +1,7 @@
 ---
 title: Backup
 template: default
+expires: 0

 access:
    admin.maintenance: true
--- a/pages/admin/cache.md
+++ b/pages/admin/cache.md
@@ -1,6 +1,7 @@
 ---
 title: Cache
 template: default
+expires: 0

 access:
    admin.cache: true
--- a/pages/admin/config.md
+++ b/pages/admin/config.md
@@ -1,5 +1,6 @@
 ---
 title: Config
+expires: 0

 access:
    admin.configuration.system: true
--- a/pages/admin/dashboard.md
+++ b/pages/admin/dashboard.md
@@ -1,5 +1,6 @@
 ---
 title: Dashboard
+expires: 0

 access:
    admin.login: true
--- a/pages/admin/denied.md
+++ b/pages/admin/denied.md
@@ -1,4 +1,5 @@
 ---
 title: Access Denied
+expires: 0
 ---

--- a/pages/admin/error.md
+++ b/pages/admin/error.md
@@ -4,6 +4,7 @@ robots: noindex,nofollow
 template: error
 routable: false
 http_response_code: 404
+expires: 0
 ---

 Woops! Looks like this page doesn't exist.
--- a/pages/admin/feed.md
+++ b/pages/admin/feed.md
@@ -1,6 +1,7 @@
 ---
 title: News Feed
 template: ajax
+expires: 0

 access:
    admin.login: true
--- a/pages/admin/forgot.md
+++ b/pages/admin/forgot.md
@@ -1,5 +1,6 @@
 ---
 title: Forgot password
+expires: 0

 form:
    fields:
--- a/pages/admin/info.md
+++ b/pages/admin/info.md
@@ -1,6 +1,8 @@
 ---
 title: PHP Info
 template: config
+expires: 0
+
 access:
    admin.configuration.info: true
    admin.super: true
--- a/pages/admin/installer.md
+++ b/pages/admin/installer.md
@@ -1,5 +1,6 @@
 ---
 title: Installer
+expires: 0

 access:
    admin.install: true
--- a/pages/admin/login.md
+++ b/pages/admin/login.md
@@ -1,5 +1,6 @@
 ---
 title: Admin Login
+expires: 0

 forms:
  login:
@@ -13,7 +14,7 @@ forms:
        autofocus: true
        validate:
          required: true
-    
+
      password:
        type: password
        placeholder: PLUGIN_ADMIN.PASSWORD
@@ -33,5 +34,5 @@ forms:
        type: text
        id: twofa-code
        autofocus: true
-        placeholder: PLUGIN_ADMIN.2FA_CODE_INPUT 
+        placeholder: PLUGIN_ADMIN.2FA_CODE_INPUT
 ---
--- a/pages/admin/media.md
+++ b/pages/admin/media.md
@@ -1,6 +1,7 @@
 ---
 title: Media
 template: default
+expires: 0

 access:
    admin.pages: true
--- a/pages/admin/notifications.md
+++ b/pages/admin/notifications.md
@@ -1,6 +1,7 @@
 ---
 title: Notifications
 template: default
+expires: 0

 access:
    admin.login: true
--- a/pages/admin/pages-filter.md
+++ b/pages/admin/pages-filter.md
@@ -1,6 +1,7 @@
 ---
 title: Pages Filter
 template: default
+expires: 0

 access:
    admin.pages: true
--- a/pages/admin/pages.md
+++ b/pages/admin/pages.md
@@ -1,5 +1,6 @@
 ---
 title: Pages
+expires: 0

 access:
    admin.pages: true
--- a/pages/admin/plugins.md
+++ b/pages/admin/plugins.md
@@ -1,5 +1,6 @@
 ---
 title: Plugins
+expires: 0

 access:
    admin.plugins: true
--- a/pages/admin/preview.md
+++ b/pages/admin/preview.md
@@ -1,5 +1,6 @@
 ---
 title: Preview
+expires: 0

 access:
    admin.pages: true
--- a/pages/admin/register.md
+++ b/pages/admin/register.md
@@ -1,4 +1,6 @@
 ---
+expires: 0
+
 form:
  fields:
    - name: username
--- a/pages/admin/reset.md
+++ b/pages/admin/reset.md
@@ -1,5 +1,6 @@
 ---
 title: Reset password
+expires: 0

 form:
    fields:
--- a/pages/admin/site.md
+++ b/pages/admin/site.md
@@ -1,6 +1,8 @@
 ---
 title: Site Settings
 template: config
+expires: 0
+
 access:
    admin.configuration.site: true
    admin.super: true
--- a/pages/admin/statistics.md
+++ b/pages/admin/statistics.md
@@ -1,5 +1,6 @@
 ---
 title: Statistics
+expires: 0

 access:
    admin.statistics: true
--- a/pages/admin/system.md
+++ b/pages/admin/system.md
@@ -1,6 +1,8 @@
 ---
 title: Configuration
 template: config
+expires: 0
+
 access:
    admin.configuration.system: true
    admin.super: true
--- a/pages/admin/themes.md
+++ b/pages/admin/themes.md
@@ -1,5 +1,6 @@
 ---
 title: Grav Themes
+expires: 0

 access:
    admin.themes: true
--- a/pages/admin/tools.md
+++ b/pages/admin/tools.md
@@ -1,5 +1,7 @@
 ---
 title: Grav Tools
+expires: 0
+
 access:
    admin.login: true
 ---
--- a/pages/admin/update.md
+++ b/pages/admin/update.md
@@ -1,6 +1,7 @@
 ---
 title: Updates
 template: default
+expires: 0

 access:
    admin.maintenance: true
--- a/pages/admin/user.md
+++ b/pages/admin/user.md
@@ -1,5 +1,6 @@
 ---
 title: User
+expires: 0

 access:
    admin.users: true