Merge branch 'release/1.10.26'

getgrav · Jan 3, 2022 · 18ca8e3 · 18ca8e3
2 parents 21ba082 + 5bfc5ee
commit 18ca8e3
Show file tree

Hide file tree

Showing 51 changed files with 1,300 additions and 6,545 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,12 @@
+# v1.10.26
+## 01/03/2022
+
+2. [](#improved)
+   * Updated SCSS compiler to v1.9 and other vendor libraries
+   * Fixed various deprecation warnings
+   * Localized dialog buttons and icons [#2207](https://github.com/getgrav/grav-plugin-admin/pull/2207)
+   * Updated copyright year
+
 # v1.10.25
 ## 11/16/2021
 

diff --git a/admin.php b/admin.php
@@ -452,11 +452,11 @@ public function onPagesInitialized()
             $legacyController = true;
         }
 
+        /** @var UserInterface $user */
+        $user = $this->grav['user'];
+
         // Replace page service with admin.
         if (empty($this->grav['page'])) {
-            /** @var UserInterface $user */
-            $user = $this->grav['user'];
-
             $this->grav['page'] = function () use ($user) {
                 $page = new Page();
 

diff --git a/blueprints.yaml b/blueprints.yaml
@@ -1,7 +1,7 @@
 name: Admin Panel
 slug: admin
 type: plugin
-version: 1.10.25
+version: 1.10.26
 description: Adds an advanced administration panel to manage your site
 icon: empire
 author:

diff --git a/classes/plugin/Admin.php b/classes/plugin/Admin.php
@@ -2407,7 +2407,7 @@ public function getLogFiles()
     /**
      * Get changelog for a given GPM package based on slug
      *
-     * @param null $slug
+     * @param string|null $slug
      * @return array
      */
     public function getChangelog($slug = null)

diff --git a/classes/plugin/AdminForm.php b/classes/plugin/AdminForm.php
@@ -3,7 +3,7 @@
 /**
  * @package    Grav\Plugin\Admin
  *
- * @copyright  Copyright (c) 2015 - 2021 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 

diff --git a/classes/plugin/Controllers/AdminController.php b/classes/plugin/Controllers/AdminController.php
@@ -3,7 +3,7 @@
 /**
  * @package    Grav\Plugin\Admin
  *
- * @copyright  Copyright (c) 2015 - 2021 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 

diff --git a/classes/plugin/Controllers/Login/LoginController.php b/classes/plugin/Controllers/Login/LoginController.php
@@ -3,7 +3,7 @@
 /**
  * @package    Grav\Plugin\Admin
  *
- * @copyright  Copyright (c) 2015 - 2021 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 

diff --git a/classes/plugin/Routers/LoginRouter.php b/classes/plugin/Routers/LoginRouter.php
@@ -3,7 +3,7 @@
 /**
  * @package    Grav\Plugin\Admin
  *
- * @copyright  Copyright (c) 2015 - 2021 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */