Merge branch 'develop' into 1.10

# Conflicts: # CHANGELOG.md # classes/plugin/AdminController.php # themes/grav/app/forms/fields/index.js # themes/grav/css-compiled/fonts.css.map # themes/grav/css-compiled/nucleus.css.map # themes/grav/css-compiled/preset.css # themes/grav/css-compiled/preset.css.map # themes/grav/css-compiled/simple-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/package.json # themes/grav/scss/template/modules/_base.scss # themes/grav/yarn.lock
2026-05-06 10:16:37 +02:00 · 2020-11-17 11:11:51 -08:00
parent 3bf8642cb9 f586fbbb9b
commit 8f6e76be43
12 changed files with 85 additions and 29 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -302,6 +302,17 @@
 1. [](#bugfix)
    * Fixed admin caching issues

+# v1.9.18
+## mm/dd/2020
+
+1. [](#improved)
+    * Auto-link a plugin/theme license in details if it starts with `http`
+    * Allow to fallback to `docs:` instead of `readme:`
+    * Backported finder/pages navigation from 1.10 (you will still need 1.10 for the fancy Parent Picker)
+    * Forward a `sid` to GPM when downloading a premium package
+1. [](#bugfix)
+    * Escape page title in `pages` field
+
 # v1.9.17
 ## 10/07/2020

--- a/languages/en.yaml
+++ b/languages/en.yaml
@@ -654,6 +654,8 @@ PLUGIN_ADMIN:
  EXTERNAL_URL: "External URL"
  SESSION_PATH: "The session path"
  SESSION_PATH_HELP: "Use only if you choose a custom base URL (you rewrite the site domain / subfolder)"
+  SESSION_SAMESITE: "The session SameSite attribute"
+  SESSION_SAMESITE_HELP: "Lax|Strict|None. See https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Set-Cookie/SameSite for more info"
  CUSTOM_BASE_URL: "Custom base URL"
  CUSTOM_BASE_URL_HELP: "Use if you want to rewrite the site domain or use a different subfolder than the one used by Grav. Example: http://localhost"
  FILEUPLOAD_PREVENT_SELF: 'Cannot use "%s" outside of pages.'
--- a/themes/grav/css-compiled/fonts.css
+++ b/themes/grav/css-compiled/fonts.css
@@ -1,3 +1,3 @@
@import url("https://fonts.googleapis.com/css?family=Josefin+Slab:400|Roboto:300,400,500|Inconsolata:400,700&subset=latin-ext");body,h5,h6,.badge,.note,.grav-mdeditor-preview,input,select,textarea,button,.selectize-input{font-family:"Roboto","Helvetica","Tahoma","Geneva","Arial",sans-serif}h1,h2,h3,h4,.form-tabs>label,.label{font-family:"Josefin Slab","Helvetica","Tahoma","Geneva","Arial",sans-serif}code,kbd,pre,samp,body .CodeMirror{font-family:"Inconsolata","Monaco","Consolas","Lucida Console",monospace !important}

-/*# sourceMappingURL=fonts.css.map */
+/*# sourceMappingURL=../css-compiled/fonts.css.map */
--- a/themes/grav/css-compiled/preset.css
+++ b/themes/grav/css-compiled/preset.css
--- a/themes/grav/css-compiled/preset.css.map
+++ b/themes/grav/css-compiled/preset.css.map
--- a/themes/grav/css-compiled/template.css
+++ b/themes/grav/css-compiled/template.css
--- a/themes/grav/css-compiled/template.css.map
+++ b/themes/grav/css-compiled/template.css.map
--- a/themes/grav/package.json
+++ b/themes/grav/package.json
@@ -14,33 +14,31 @@
  "author": "RocketTheme, LLC",
  "license": "MIT",
  "dependencies": {
-    "bootstrap": "^3.4",
-    "chartist": "0.11.4",
-    "codemirror": "^5.58.2",
+    "chartist": "0.11.0",
+    "codemirror": "^5.30.0",
    "cookies-js": "^1.2.3",
-    "debounce": "^1.2.0",
-    "dropzone": "getgrav/dropzone#master",
+    "debounce": "^1.0.2",
+    "dropzone": "^5.3.0",
+    "eonasdan-bootstrap-datetimepicker": "^4.17.47",
    "es6-map": "^0.1.5",
-    "es6-promise": "^4.2.8",
-    "eventemitter3": "^4.0.0",
+    "es6-promise": "^4.1.1",
+    "eventemitter3": "^4.0.7",
    "exif-js": "^2.3.0",
-    "immutable": "^3.8.2",
+    "gemini-scrollbar": "^1.5.2",
+    "immutable": "^3.8.1",
    "immutablediff": "^0.4.4",
-    "js-yaml": "^3.14.0",
-    "moment": "^2.29.1",
-    "moment-timezone": "^0.5.32",
-    "mout": "^1.2.2",
-    "npm-check-updates": "^4.0.1",
-    "popper.js": "^1.16.1",
-    "rangetouch": "^2.0.0",
-    "selectize": "^0.12.6",
-    "simplebar": "^5.2.0",
-    "sortablejs": "^1.10.2",
+    "js-yaml": "^3.10.0",
+    "mout": "^1.0.0",
+    "popper.js": "^1.14.4",
+    "rangetouch": "^1.0.5",
+    "remodal": "^1.1.1",
+    "selectize": "^0.12.4",
+    "sortablejs": "^1.6.1",
    "speakingurl": "^14.0.1",
-    "toastr": "^2.1.4",
+    "toastr": "^2.1.2",
    "watchjs": "0.0.0",
-    "whatwg-fetch": "^2.0.4",
-    "yarn": "^1.21.1"
+    "whatwg-fetch": "^2.0.3",
+    "yarn": "^1.15.2"
  },
  "devDependencies": {
    "babel-core": "^6.25.0",
--- a/themes/grav/scss/template/_forms.scss
+++ b/themes/grav/scss/template/_forms.scss
@@ -523,6 +523,49 @@ div.frontmatter {
    margin-bottom: 3rem;
 }

+// parents
+[data-grav-field="parents"] {
+
+    .form-input-wrapper {
+        cursor: pointer;
+
+        i {
+            margin-right: .25rem;
+        }
+    }
+}
+
+[data-remodal-id].parents-container {
+    form {
+        overflow: hidden;
+    }
+
+    form > h1 {
+        margin-bottom: 0;
+        border-bottom: 1px solid #eee;
+    }
+    form > .button-bar {
+        margin-top: 0;
+    }
+
+    .fjs-list {
+        overflow: auto;
+        overflow-y: scroll;
+        max-height: 400px;
+        min-height: 100%;
+    }
+
+    .fjs-item {
+        margin-left: 0;
+        list-style-type: none;
+        text-align: left;
+    }
+
+    .parents-content:empty {
+        display: none;
+    }
+}
+
 textarea.frontmatter {
    height: 130px !important;

--- a/themes/grav/scss/template/modules/_buttons.scss
+++ b/themes/grav/scss/template/modules/_buttons.scss
@@ -42,6 +42,7 @@
    }

    @if ($lighter) {
+        &:focus,
        &:hover {
            background: shade($color,15%);
            color: $text;
@@ -50,6 +51,7 @@
            border-left: 1px solid lighten($color, 5%);
        }
    } @else {
+        &:focus,
        &:hover {
            background: tint($color,15%);
            color: $text;
--- a/themes/grav/templates/forms/fields/fieldset/fieldset.html.twig
+++ b/themes/grav/templates/forms/fields/fieldset/fieldset.html.twig
@@ -50,9 +50,9 @@
          {% block group %}
              {% if field.text %}
                {% if grav.twig.twig.filters['tu'] is defined %}
-                    {{ field.markdown ? field.text|tu|markdown : '<p>' ~ field.text|tu ~ '</p>' }}
+                    {{ field.markdown ? field.text|tu|markdown : ('<p>' ~ field.text|tu ~ '</p>')|raw }}
                {% else %}
-                    {{ field.markdown ? field.text|t|markdown : '<p>' ~ field.t ~ '</p>' }}
+                    {{ field.markdown ? field.text|t|markdown : ('<p>' ~ field.t ~ '</p>')|raw }}
                {% endif %}
              {% endif %}

--- a/themes/grav/templates/forms/fields/pages/pages.html.twig
+++ b/themes/grav/templates/forms/fields/pages/pages.html.twig
@@ -10,7 +10,7 @@
    {% endif %}

    {% for page_route, option in pages_list %}
-        <option {% if page_route == value or (field.multiple and page_route in value) %}selected="selected"{% endif %} value="{{ page_route }}">{{ option|raw }}</option>
+        <option {% if page_route == value or (field.multiple and page_route in value) %}selected="selected"{% endif %} value="{{ page_route }}">{{ option }}</option>
    {% endfor %}
 {% endmacro %}