Merge branch 'release/1.10.34'

.gitignore

@@ -14,3 +14,4 @@ tests/_support/_generated/*
 tests/cache/*
 tests/error.log
 /crowdin.yaml
+.vscode

CHANGELOG.md

@@ -1,8 +1,16 @@
+# v1.10.34
+## 06/22/2022
+
+1. [](#improved)
+   * Exposed `UriToMarkdown` util (`Grav.default.Utils.UriToMarkdown`) in admin, to convert links/images
+1. [](#bugfix)
+   * Fixed `Latest Page Updates` permissions [#2294](https://github.com/getgrav/grav-plugin-admin/pull/2294)
+
 # v1.10.33.1
 ## 04/25/2022
 
 1. [](#bugfix)
-   * Reverted [PR#2265](https://github.com/getgrav/grav-plugin-admin/pull/2265) as it broke sections output.
+   * Reverted [PR#2265](https://github.com/getgrav/grav-plugin-admin/pull/2265) as it broke sections output
 
 # v1.10.33
 ## 04/25/2022

blueprints.yaml

@@ -1,7 +1,7 @@
 name: Admin Panel
 slug: admin
 type: plugin
-version: 1.10.33.1
+version: 1.10.34
 description: Adds an advanced administration panel to manage your site
 icon: empire
 author:

languages/en.yaml

@@ -454,8 +454,11 @@ PLUGIN_ADMIN:
   IMAGES_DEBUG_HELP: "Show an overlay over images indicating the pixel depth of the image when working with retina for example"
   IMAGES_LOADING: "Image loading behavior"
   IMAGES_LOADING_HELP: "The loading attribute allows a browser to defer loading offscreen images and iframes until users scroll near them. loading supports three values: auto, lazy, eager"
+
+  # Removed in Grav 1.8
   IMAGES_SEOFRIENDLY: "SEO-Friendly Image names"
   IMAGES_SEOFRIENDLY_HELP: "When enabled, the image name is displayed first, then a smaller hash to reflect processed operations"
+
   UPLOAD_LIMIT: "File upload limit"
   UPLOAD_LIMIT_HELP: "Set maximum upload size in bytes (0 is unlimited)"
   ENABLE_MEDIA_TIMESTAMP: "Enable timestamps on media"
@@ -1142,3 +1145,7 @@ PLUGIN_ADMIN:
   AVATAR: "Avatar Generator"
   AVATAR_HELP: "Multiavatar is a locally generated avatar.  Gravatar is an external service that uses your email address to pull a preconfigured Avatar remotely"
   AVATAR_HASH: "NOTE: Optional Avatar custom 'hash' string"
+  IMAGES_TITLE: "Images"
+  LEGACY_MEDIA_MUTATION: "Legacy Media Manipulation Compatibility"
+  LEGACY_MEDIA_MUTATION_HELP: "Enable this setting only if image manipulation broke after Grav update."
+  BACKWARD_COMPATIBILITY: "Backward Compatibility"

themes/grav/app/main.js

@@ -4,6 +4,7 @@ import '@babel/polyfill';
 import $ from 'jquery';
 import './utils/remodal';
 import 'simplebar/dist/simplebar.min.js';
+import { UriToMarkdown } from './forms/fields/files.js';
 import GPM, { Instance as gpm } from './utils/gpm';
 import KeepAlive from './utils/keepalive';
 import Updates, { Instance as updates, Notifications, Feed } from './updates';
@@ -68,5 +69,5 @@ export default {
         Instance: MediaFilterInstance
     },
     Scrollbar: { Scrollbar: { deprecated: true }, Instance: { deprecated: true } },
-    Utils: { request, toastr, Cookies }
+    Utils: { request, toastr, Cookies, UriToMarkdown }
 };

themes/grav/templates/partials/dashboard-pages.html.twig

@@ -1,4 +1,4 @@
-{% if authorize(['admin.pages', 'admin.super']) %}
+{% if authorize(['admin.pages.list', 'admin.pages', 'admin.super']) %}
     <div id="latest">
         <div class="button-bar">
             <a class="button" href="{{ admin_route('/pages') }}"><i class="fa fa-fw fa-file-text-o"></i>{{ "PLUGIN_ADMIN.MANAGE_PAGES"|t }}</a>
@@ -15,6 +15,4 @@
         {% endfor %}
         </table>
     </div>
-{% else %}
-    <div class="padding">You don't have sufficient access to view the dashboard...</div>
 {% endif %}

vendor/composer/installed.json

@@ -193,17 +193,17 @@
         },
         {
             "name": "scssphp/scssphp",
-            "version": "v1.10.2",
-            "version_normalized": "1.10.2.0",
+            "version": "v1.10.3",
+            "version_normalized": "1.10.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/scssphp/scssphp.git",
-                "reference": "387f4f4abf5d99f16be16314c5ab856f81c82f46"
+                "reference": "0f1e1516ed2412ad43e42a6a319e77624ba1f713"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/scssphp/scssphp/zipball/387f4f4abf5d99f16be16314c5ab856f81c82f46",
-                "reference": "387f4f4abf5d99f16be16314c5ab856f81c82f46",
+                "url": "https://api.github.com/repos/scssphp/scssphp/zipball/0f1e1516ed2412ad43e42a6a319e77624ba1f713",
+                "reference": "0f1e1516ed2412ad43e42a6a319e77624ba1f713",
                 "shasum": ""
             },
             "require": {
@@ -226,7 +226,7 @@
                 "ext-iconv": "Can be used as fallback when ext-mbstring is not available",
                 "ext-mbstring": "For best performance, mbstring should be installed as it is faster than ext-iconv"
             },
-            "time": "2022-03-02T21:15:09+00:00",
+            "time": "2022-05-16T07:22:18+00:00",
             "bin": [
                 "bin/pscss"
             ],
@@ -264,7 +264,7 @@
             ],
             "support": {
                 "issues": "https://github.com/scssphp/scssphp/issues",
-                "source": "https://github.com/scssphp/scssphp/tree/v1.10.2"
+                "source": "https://github.com/scssphp/scssphp/tree/v1.10.3"
             },
             "install-path": "../scssphp/scssphp"
         }

vendor/composer/installed.php

@@ -5,7 +5,7 @@
         'type' => 'grav-plugin',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
-        'reference' => '5c1e6d6d52f8fc8e0540b5599e736e25ea20c446',
+        'reference' => '0a5b51b9e2c2eb9626b17c8b164dcfc3296ccf3c',
         'name' => 'getgrav/grav-plugin-admin',
         'dev' => false,
     ),
@@ -16,7 +16,7 @@
             'type' => 'grav-plugin',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),
-            'reference' => '5c1e6d6d52f8fc8e0540b5599e736e25ea20c446',
+            'reference' => '0a5b51b9e2c2eb9626b17c8b164dcfc3296ccf3c',
             'dev_requirement' => false,
         ),
         'laminas/laminas-xml' => array(
@@ -53,12 +53,12 @@
             'dev_requirement' => false,
         ),
         'scssphp/scssphp' => array(
-            'pretty_version' => 'v1.10.2',
-            'version' => '1.10.2.0',
+            'pretty_version' => 'v1.10.3',
+            'version' => '1.10.3.0',
             'type' => 'library',
             'install_path' => __DIR__ . '/../scssphp/scssphp',
             'aliases' => array(),
-            'reference' => '387f4f4abf5d99f16be16314c5ab856f81c82f46',
+            'reference' => '0f1e1516ed2412ad43e42a6a319e77624ba1f713',
             'dev_requirement' => false,
         ),
         'symfony/polyfill-php72' => array(

vendor/scssphp/scssphp/src/Compiler.php

@@ -2350,9 +2350,9 @@ protected function compileChildren($stms, OutputBlock $out, $traceName = '')
     }
 
     /**
-     * Compile children and throw exception if unexpected `@return`
+     * Compile children and throw exception if unexpected at-return
      *
-     * @param array                                  $stms
+     * @param array[]                                $stms
      * @param \ScssPhp\ScssPhp\Formatter\OutputBlock $out
      * @param \ScssPhp\ScssPhp\Block                 $selfParent
      * @param string                                 $traceName
@@ -2367,13 +2367,13 @@ protected function compileChildrenNoReturn($stms, OutputBlock $out, $selfParent
 
         foreach ($stms as $stm) {
             if ($selfParent && isset($stm[1]) && \is_object($stm[1]) && $stm[1] instanceof Block) {
+                $oldSelfParent = $stm[1]->selfParent;
                 $stm[1]->selfParent = $selfParent;
                 $ret = $this->compileChild($stm, $out);
-                $stm[1]->selfParent = null;
+                $stm[1]->selfParent = $oldSelfParent;
             } elseif ($selfParent && \in_array($stm[0], [Type::T_INCLUDE, Type::T_EXTEND])) {
                 $stm['selfParent'] = $selfParent;
                 $ret = $this->compileChild($stm, $out);
-                unset($stm['selfParent']);
             } else {
                 $ret = $this->compileChild($stm, $out);
             }

vendor/scssphp/scssphp/src/Logger/QuietLogger.php

@@ -14,6 +14,8 @@
 
 /**
  * A logger that silently ignores all messages.
+ *
+ * @final
  */
 class QuietLogger implements LoggerInterface
 {

vendor/scssphp/scssphp/src/Logger/StreamLogger.php

@@ -14,6 +14,8 @@
 
 /**
  * A logger that prints to a PHP stream (for instance stderr)
+ *
+ * @final
  */
 class StreamLogger implements LoggerInterface
 {

vendor/scssphp/scssphp/src/Version.php

@@ -19,5 +19,5 @@
  */
 class Version
 {
-    const VERSION = '1.10.2';
+    const VERSION = '1.10.3';
 }