Merge branch 'release/1.7.10'

* Add option images.defaults.size to set default height/width

- Add option to config/system.yaml
- Add option to blueprints/config/system.yaml
- Add ImageSizeTrait.php
- Add ImageSizeTrait to ImageMedium.php
- Add Unit tests

* moved width/height to rendering phase

* Add test: height/width should be of resized image.

* Added optional apsect-ratio variable

* more improvements

* Added aspectRatio and retinaScale image functions

* remove use for old trait

* reset the CLS variables after calling reset on the image

Co-authored-by: Andy Miller <rhuk@mac.com>

.editorconfig

@@ -7,11 +7,11 @@ root = true
 [*]
 charset = utf-8
 end_of_line = lf
-trim_trailing_whitespace = true
 insert_final_newline = true
 indent_style = space
 indent_size = 4
+trim_trailing_whitespace = true
 
 # 2 space indentation
-[*.{yaml,.yml}]
+[*.{yaml,yml}]
 indent_size = 2

.github/workflows/build.yaml

@@ -0,0 +1,66 @@
+name: Release Builds
+
+on:
+  release:
+    types: [published]
+
+jobs:
+  build:
+    if: "!github.event.release.prerelease"
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: 7.3
+          extensions: opcache, gd
+          coverage: none
+        env:
+          COMPOSER_TOKEN: ${{ secrets.GLOBAL_TOKEN }}
+
+      - name: Install Dependencies
+        run: |
+          sudo apt-get -y update -qq  < /dev/null > /dev/null
+          sudo apt-get -y install -qq git zip < /dev/null > /dev/null
+
+      - name: Retrieval of Builder Scripts
+        run: |
+          # Real Grav URL
+          curl --silent -H "Authorization: token ${{ secrets.GLOBAL_TOKEN }}" -H "Accept: application/vnd.github.v3.raw" ${{ secrets.BUILD_SCRIPT_URL }} --output build-grav.sh
+
+          # Development Local URL
+          # curl ${{ secrets.BUILD_SCRIPT_URL }} --output build-grav.sh
+
+      - name: Grav Builder
+        run: |
+          bash ./build-grav.sh
+
+      - name: Upload Grav Release Assets
+        id: upload-release-asset
+        uses: alexellis/upload-assets@0.2.3
+        env:
+          GITHUB_TOKEN: ${{ secrets.GLOBAL_TOKEN }}
+        with:
+          asset_paths: '["./grav-dist/*.zip"]'
+
+  slack:
+    name: Slack
+    needs: build
+    runs-on: ubuntu-latest
+    if: always()
+    steps:
+      - uses: technote-space/workflow-conclusion-action@v2
+      - uses: 8398a7/action-slack@v3
+        with:
+          status: failure
+          fields: repo,message,author,action
+          icon_emoji: ':octocat:'
+          author_name: 'Github Action Build'
+          text: '🚚 Automated Build Failure'
+        env:
+          GITHUB_TOKEN: ${{ secrets.GLOBAL_TOKEN }}
+          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
+        if: env.WORKFLOW_CONCLUSION == 'failure'

.github/workflows/tests.yaml

@@ -0,0 +1,72 @@
+name: PHP Tests
+
+on:
+  push:
+    branches: [ develop ]
+  pull_request:
+    branches: [ develop ]
+
+jobs:
+
+  unit-tests:
+
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      matrix:
+        php: [ 8.0, 7.4, 7.3]
+        os: [ubuntu-latest]
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php }}
+          extensions: opcache, gd
+          coverage: none
+        env:
+          COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+#      - name: Update composer
+#        run: composer update
+#
+#      - name: Validate composer.json and composer.lock
+#        run: composer validate
+
+      - name: Get composer cache directory
+        id: composer-cache
+        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
+
+      - name: Cache dependencies
+        uses: actions/cache@v2
+        with:
+          path: ${{ steps.composer-cache.outputs.dir }}
+          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+          restore-keys: ${{ runner.os }}-composer-
+
+      - name: Install dependencies
+        run: composer install --prefer-dist --no-progress
+
+      - name: Run test suite
+        run: vendor/bin/codecept run
+
+#  slack:
+#      name: Slack
+#      needs: unit-tests
+#      runs-on: ubuntu-latest
+#      if: always()
+#      steps:
+#        - uses: technote-space/workflow-conclusion-action@v2
+#        - uses: 8398a7/action-slack@v3
+#          with:
+#             status: failure
+#             fields: repo,message,author,action
+#             icon_emoji: ':octocat:'
+#             author_name: 'Github Action Tests'
+#             text: '💥 Automated Test Failure'
+#          env:
+#            GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+#            SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
+#          if: env.WORKFLOW_CONCLUSION == 'failure'

.github/workflows/trigger-skeletons.yml

@@ -0,0 +1,45 @@
+name: Trigger Skeletons Build
+
+on:
+  workflow_dispatch:
+    inputs:
+      version:
+        description: 'Which Grav release to use'
+        required: true
+        default: 'latest'
+      admin:
+        description: 'Create also a package with Admin'
+        required: true
+        default: true
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    env:
+      WORKFLOW: "build-skeleton.yml"
+      AUTH: ":${{secrets.GLOBAL_TOKEN}}"
+    steps:
+      - uses: actions/checkout@v2
+      - name: Make it rain ☔️
+        run: |
+          SKELETONS=`curl -s "${{secrets.SKELETONS_JSON_LIST}}"`
+          echo "$SKELETONS" | jq -cr '.[]' | while read SKELETON; do
+            KEY=$(echo "$SKELETON" | jq -cr 'keys[0]')
+            VERSION=$(echo "$SKELETON" | jq -cr '.[]')
+            URL="https://api.github.com/repos/${KEY}/actions/workflows/${WORKFLOW}/dispatches"
+
+            curl -X POST \
+            -u "${AUTH}" \
+            -H "Accept: application/vnd.github.everest-preview+json" \
+            -H "Content-Type: application/json" \
+            -sS \
+            ${URL} \
+            --data '{ "ref": "develop", 
+                      "inputs": { 
+                        "tag": "'"$VERSION"'", 
+                        "version": "'"$INPUT_VERSION"'", 
+                        "admin": "'"$INPUT_ADMIN"'" 
+                      } 
+                    }' > /dev/null
+            echo "Dispatched Worfklow for ${KEY}@$VERSION"
+          done

.gitignore

@@ -44,3 +44,4 @@ tests/_support/_generated/*
 tests/cache/*
 tests/error.log
 system/templates/testing/*
+/user/config/versions.yaml

.htaccess

@@ -27,6 +27,9 @@ RewriteEngine On
 # If you experience problems on your site block out the operations listed below
 # This attempts to block the most common type of exploit `attempts` to Grav
 #
+# Block out any script trying to use twig tags in URL.
+RewriteCond %{REQUEST_URI} ({{|}}|{%|%}) [OR]
+RewriteCond %{QUERY_STRING} ({{|}}|{%25|%25}) [OR]
 # Block out any script trying to base64_encode data within the URL.
 RewriteCond %{QUERY_STRING} base64_encode[^(]*\([^)]*\) [OR]
 # Block out any script that includes a <script> tag in URL.

.phan/config.php

@@ -0,0 +1,44 @@
+<?php
+return [
+    "target_php_version" => null,
+    'pretend_newer_core_functions_exist' => true,
+    'allow_missing_properties' => false,
+    'null_casts_as_any_type' => false,
+    'null_casts_as_array' => false,
+    'array_casts_as_null' => false,
+    'strict_method_checking' => true,
+    'quick_mode' => false,
+    'simplify_ast' => false,
+    'directory_list' => [
+        '.',
+    ],
+    "exclude_analysis_directory_list" => [
+        'vendor/'
+    ],
+    'exclude_file_list' => [
+        'system/src/Grav/Common/Errors/Resources/layout.html.php',
+        'tests/_support/AcceptanceTester.php',
+        'tests/_support/FunctionalTester.php',
+        'tests/_support/UnitTester.php',
+    ],
+    'autoload_internal_extension_signatures' => [
+        'memcached' => '.phan/internal_stubs/memcached.phan_php',
+        'memcache' => '.phan/internal_stubs/memcache.phan_php',
+        'redis' => '.phan/internal_stubs/Redis.phan_php',
+    ],
+    'plugins' => [
+        'AlwaysReturnPlugin',
+        'UnreachableCodePlugin',
+        'DuplicateArrayKeyPlugin',
+        'PregRegexCheckerPlugin',
+        'PrintfCheckerPlugin',
+    ],
+    'suppress_issue_types' => [
+        'PhanUnreferencedUseNormal',
+        'PhanTypeObjectUnsetDeclaredProperty',
+        'PhanTraitParentReference',
+        'PhanTypeInvalidThrowsIsInterface',
+        'PhanRequiredTraitNotAdded',
+        'PhanDeprecatedFunction',  // Uncomment this to see all the deprecated calls
+    ]
+];

.phan/internal_stubs/memcache.phan_php

@@ -0,0 +1,460 @@
+<?php
+
+// Start of memcache v.3.0.8
+
+class MemcachePool  {
+
+    /**
+     * (PECL memcache &gt;= 0.2.0)<br/>
+     * Open memcached server connection
+     * @link https://php.net/manual/en/memcache.connect.php
+     * @param string $host <p>
+     * Point to the host where memcached is listening for connections. This parameter
+     * may also specify other transports like <em>unix:///path/to/memcached.sock</em>
+     * to use UNIX domain sockets, in this case <b>port</b> must also
+     * be set to <em>0</em>.
+     * </p>
+     * @param int $port [optional] <p>
+     * Point to the port where memcached is listening for connections. Set this
+     * parameter to <em>0</em> when using UNIX domain sockets.
+     * </p>
+     * <p>
+     * Please note: <b>port</b> defaults to
+     * {@link https://php.net/manual/ru/memcache.ini.php#ini.memcache.default-port memcache.default_port}
+     * if not specified. For this reason it is wise to specify the port
+     * explicitly in this method call.
+     * </p>
+     * @param int $timeout [optional] <p>Value in seconds which will be used for connecting to the daemon. Think twice before changing the default value of 1 second - you can lose all the advantages of caching if your connection is too slow.</p>
+     * @return bool <p>Returns <b>TRUE</b> on success or <b>FALSE</b> on failure.</p>
+     */
+    public function connect ($host, $port, $timeout = 1) {}
+
+    /**
+     * (PECL memcache &gt;= 2.0.0)<br/>
+     * Add a memcached server to connection pool
+     * @link https://php.net/manual/en/memcache.addserver.php
+     * @param string $host <p>
+     * Point to the host where memcached is listening for connections. This parameter
+     * may also specify other transports like unix:///path/to/memcached.sock
+     * to use UNIX domain sockets, in this case <i>port</i> must also
+     * be set to 0.
+     * </p>
+     * @param int $port [optional] <p>
+     * Point to the port where memcached is listening for connections.
+     * Set this
+     * parameter to 0 when using UNIX domain sockets.
+     * </p>
+     * <p>
+     * Please note: <i>port</i> defaults to
+     * memcache.default_port
+     * if not specified. For this reason it is wise to specify the port
+     * explicitly in this method call.
+     * </p>
+     * @param bool $persistent [optional] <p>
+     * Controls the use of a persistent connection. Default to <b>TRUE</b>.
+     * </p>
+     * @param int $weight [optional] <p>
+     * Number of buckets to create for this server which in turn control its
+     * probability of it being selected. The probability is relative to the
+     * total weight of all servers.
+     * </p>
+     * @param int $timeout [optional] <p>
+     * Value in seconds which will be used for connecting to the daemon. Think
+     * twice before changing the default value of 1 second - you can lose all
+     * the advantages of caching if your connection is too slow.
+     * </p>
+     * @param int $retry_interval [optional] <p>
+     * Controls how often a failed server will be retried, the default value
+     * is 15 seconds. Setting this parameter to -1 disables automatic retry.
+     * Neither this nor the <i>persistent</i> parameter has any
+     * effect when the extension is loaded dynamically via <b>dl</b>.
+     * </p>
+     * <p>
+     * Each failed connection struct has its own timeout and before it has expired
+     * the struct will be skipped when selecting backends to serve a request. Once
+     * expired the connection will be successfully reconnected or marked as failed
+     * for another <i>retry_interval</i> seconds. The typical
+     * effect is that each web server child will retry the connection about every
+     * <i>retry_interval</i> seconds when serving a page.
+     * </p>
+     * @param bool $status [optional] <p>
+     * Controls if the server should be flagged as online. Setting this parameter
+     * to <b>FALSE</b> and <i>retry_interval</i> to -1 allows a failed
+     * server to be kept in the pool so as not to affect the key distribution
+     * algorithm. Requests for this server will then failover or fail immediately
+     * depending on the <i>memcache.allow_failover</i> setting.
+     * Default to <b>TRUE</b>, meaning the server should be considered online.
+     * </p>
+     * @param callable $failure_callback [optional] <p>
+     * Allows the user to specify a callback function to run upon encountering an
+     * error. The callback is run before failover is attempted. The function takes
+     * two parameters, the hostname and port of the failed server.
+     * </p>
+     * @param int $timeoutms [optional] <p>
+     * </p>
+     * @return bool <b>TRUE</b> on success or <b>FALSE</b> on failure.
+     */
+    public function addServer ($host, $port = 11211, $persistent = true, $weight = null, $timeout = 1, $retry_interval = 15, $status = true, callable $failure_callback = null, $timeoutms = null) {}
+
+    /**
+     * (PECL memcache &gt;= 2.1.0)<br/>
+     * Changes server parameters and status at runtime
+     * @link https://secure.php.net/manual/en/memcache.setserverparams.php
+     * @param string $host <p>Point to the host where memcached is listening for connections.</p.
+     * @param int $port [optional] <p>
+     * Point to the port where memcached is listening for connections.
+     * </p>
+     * @param int $timeout [optional] <p>
+     * Value in seconds which will be used for connecting to the daemon. Think twice before changing the default value of 1 second - you can lose all the advantages of caching if your connection is too slow.
+     * </p>
+     * @param int $retry_interval [optional] <p>
+     * Controls how often a failed server will be retried, the default value
+     * is 15 seconds. Setting this parameter to -1 disables automatic retry.
+     * Neither this nor the <b>persistent</b> parameter has any
+     * effect when the extension is loaded dynamically via {@link https://secure.php.net/manual/en/function.dl.php dl()}.
+     * </p>
+     * @param bool $status [optional] <p>
+     * Controls if the server should be flagged as online. Setting this parameter
+     * to <b>FALSE</b> and <b>retry_interval</b> to -1 allows a failed
+     * server to be kept in the pool so as not to affect the key distribution
+     * algorithm. Requests for this server will then failover or fail immediately
+     * depending on the <b>memcache.allow_failover</b> setting.
+     * Default to <b>TRUE</b>, meaning the server should be considered online.
+     * </p>
+     * @param callable $failure_callback [optional] <p>
+     * Allows the user to specify a callback function to run upon encountering an error. The callback is run before failover is attempted.
+     * The function takes two parameters, the hostname and port of the failed server.
+     * </p>
+     * @return bool <p>Returns <b>TRUE</b> on success or <b>FALSE</b> on failure.</p>
+     */
+    public function setServerParams ($host, $port = 11211, $timeout = 1, $retry_interval = 15, $status = true, callable $failure_callback = null) {}
+
+    /**
+     *
+     */
+    public function setFailureCallback () {}
+
+    /**
+     * (PECL memcache &gt;= 2.1.0)<br/>
+     * Returns server status
+     * @link https://php.net/manual/en/memcache.getserverstatus.php
+     * @param string $host Point to the host where memcached is listening for connections.
+     * @param int $port Point to the port where memcached is listening for connections.
+     * @return int Returns a the servers status. 0 if server is failed, non-zero otherwise
+     */
+    public function getServerStatus ($host, $port = 11211) {}
+
+    /**
+     *
+     */
+    public function findServer () {}
+
+    /**
+     * (PECL memcache &gt;= 0.2.0)<br/>
+     * Return version of the server
+     * @link https://php.net/manual/en/memcache.getversion.php
+     * @return string|false Returns a string of server version number or <b>FALSE</b> on failure.
+     */
+    public function getVersion () {}
+
+    /**
+     * (PECL memcache &gt;= 2.0.0)<br/>
+     * Add an item to the server. If the key already exists, the value will not be added and <b>FALSE</b> will be returned.
+     * @link https://php.net/manual/en/memcache.add.php
+     * @param string $key The key that will be associated with the item.
+     * @param mixed $var The variable to store. Strings and integers are stored as is, other types are stored serialized.
+     * @param int $flag [optional] <p>
+     * Use <b>MEMCACHE_COMPRESSED</b> to store the item
+     * compressed (uses zlib).
+     * </p>
+     * @param int $expire [optional] <p>Expiration time of the item.
+     * If it's equal to zero, the item will never expire.
+     * You can also use Unix timestamp or a number of seconds starting from current time, but in the latter case the number of seconds may not exceed 2592000 (30 days).</p>
+     * @return bool Returns <b>TRUE</b> on success or <b>FALSE</b> on failure. Returns <b>FALSE</b> if such key already exist. For the rest Memcache::add() behaves similarly to Memcache::set().
+     */
+    public function add ($key , $var, $flag = null, $expire = null) {}
+
+    /**
+     * (PECL memcache &gt;= 0.2.0)<br/>
+     * Stores an item var with key on the memcached server. Parameter expire is expiration time in seconds.
+     * If it's 0, the item never expires (but memcached server doesn't guarantee this item to be stored all the time,
+     * it could be deleted from the cache to make place for other items).
+     * You can use MEMCACHE_COMPRESSED constant as flag value if you want to use on-the-fly compression (uses zlib).
+     * @link https://php.net/manual/en/memcache.set.php
+     * @param string $key The key that will be associated with the item.
+     * @param mixed $var The variable to store. Strings and integers are stored as is, other types are stored serialized.
+     * @param int $flag [optional] Use MEMCACHE_COMPRESSED to store the item compressed (uses zlib).
+     * @param int $expire [optional] Expiration time of the item. If it's equal to zero, the item will never expire. You can also use Unix timestamp or a number of seconds starting from current time, but in the latter case the number of seconds may not exceed 2592000 (30 days).
+     * @return bool Returns <b>TRUE</b> on success or <b>FALSE</b> on failure.
+     */
+    public function set ($key, $var, $flag = null, $expire = null) {}
+
+    /**
+     * (PECL memcache &gt;= 0.2.0)<br/>
+     * Replace value of the existing item
+     * @link https://php.net/manual/en/memcache.replace.php
+     * @param string $key <p>The key that will be associated with the item.</p>
+     * @param mixed $var <p>The variable to store. Strings and integers are stored as is, other types are stored serialized.</p>
+     * @param int $flag [optional] <p>Use <b>MEMCACHE_COMPRESSED</b> to store the item compressed (uses zlib).</p>
+     * @param int $expire [optional] <p>Expiration time of the item. If it's equal to zero, the item will never expire. You can also use Unix timestamp or a number of seconds starting from current time, but in the latter case the number of seconds may not exceed 2592000 (30 days).</p>
+     * @return bool Returns TRUE on success or FALSE on failure.
+     */
+    public function replace ($key,  $var, $flag = null, $expire = null) {}
+
+	public function cas () {}
+
+	public function append () {}
+
+    /**
+     * @return string
+     */
+    public function prepend () {}
+
+    /**
+     * (PECL memcache &gt;= 0.2.0)<br/>
+     * Retrieve item from the server
+     * @link https://php.net/manual/en/memcache.get.php
+     * @param string|array $key <p>
+     * The key or array of keys to fetch.
+     * </p>
+     * @param int|array $flags [optional] <p>
+     * If present, flags fetched along with the values will be written to this parameter. These
+     * flags are the same as the ones given to for example {@link https://php.net/manual/en/memcache.set.php Memcache::set()}.
+     * The lowest byte of the int is reserved for pecl/memcache internal usage (e.g. to indicate
+     * compression and serialization status).
+     * </p>
+     * @return string|array|false <p>
+     * Returns the string associated with the <b>key</b> or
+     * an array of found key-value pairs when <b>key</b> is an {@link https://php.net/manual/en/language.types.array.php array}.
+     * Returns <b>FALSE</b> on failure, <b>key</b> is not found or
+     * <b>key</b> is an empty {@link https://php.net/manual/en/language.types.array.php array}.
+     * </p>
+     */
+    public function get ($key, &$flags = null) {}
+
+    /**
+     * (PECL memcache &gt;= 0.2.0)<br/>
+     * Delete item from the server
+     * https://secure.php.net/manual/ru/memcache.delete.php
+     * @param $key string The key associated with the item to delete.
+     * @param $timeout int [optional] This deprecated parameter is not supported, and defaults to 0 seconds. Do not use this parameter.
+     * @return bool Returns <b>TRUE</b> on success or <b>FALSE</b> on failure.
+     */
+    public function delete ($key, $timeout = 0 ) {}
+
+    /**
+     * (PECL memcache &gt;= 0.2.0)<br/>
+     * Get statistics of the server
+     * @link https://php.net/manual/ru/memcache.getstats.php
+     * @param string $type [optional] <p>
+     * The type of statistics to fetch.
+     * Valid values are {reset, malloc, maps, cachedump, slabs, items, sizes}.
+     * According to the memcached protocol spec these additional arguments "are subject to change for the convenience of memcache developers".</p>
+     * @param int $slabid [optional] <p>
+     * Used in conjunction with <b>type</b> set to
+     * cachedump to identify the slab to dump from. The cachedump
+     * command ties up the server and is strictly to be used for
+     * debugging purposes.
+     * </p>
+     * @param int $limit [optional] <p>
+     * Used in conjunction with <b>type</b> set to cachedump to limit the number of entries to dump.
+     * </p>
+     * @return array|false Returns an associative array of server statistics or <b>FALSE</b> on failure.
+     */
+    public function getStats ($type = null, $slabid = null, $limit = 100) {}
+
+    /**
+     * (PECL memcache &gt;= 2.0.0)<br/>
+     * Get statistics from all servers in pool
+     * @link https://php.net/manual/en/memcache.getextendedstats.php
+     * @param string $type [optional] <p>The type of statistics to fetch. Valid values are {reset, malloc, maps, cachedump, slabs, items, sizes}. According to the memcached protocol spec these additional arguments "are subject to change for the convenience of memcache developers".</p>
+     * @param int $slabid [optional] <p>
+     * Used in conjunction with <b>type</b> set to
+     * cachedump to identify the slab to dump from. The cachedump
+     * command ties up the server and is strictly to be used for
+     * debugging purposes.
+     * </p>
+     * @param int $limit Used in conjunction with type set to cachedump to limit the number of entries to dump.
+     * @return array|false Returns a two-dimensional associative array of server statistics or <b>FALSE</b>
+     * Returns a two-dimensional associative array of server statistics or <b>FALSE</b>
+     * on failure.
+     */
+    public function getExtendedStats ($type = null, $slabid = null, $limit = 100) {}
+
+    /**
+     * (PECL memcache &gt;= 2.0.0)<br/>
+     * Enable automatic compression of large values
+     * @link https://php.net/manual/en/memcache.setcompressthreshold.php
+     * @param int $thresold <p>Controls the minimum value length before attempting to compress automatically.</p>
+     * @param float $min_saving [optional] <p>Specifies the minimum amount of savings to actually store the value compressed. The supplied value must be between 0 and 1. Default value is 0.2 giving a minimum 20% compression savings.</p>
+     * @return bool Returns <b>TRUE</b> on success or <b>FALSE</b> on failure.
+     */
+    public function setCompressThreshold ($thresold, $min_saving = 0.2) {}
+    /**
+     * (PECL memcache &gt;= 0.2.0)<br/>
+     * Increment item's value
+     * @link https://php.net/manual/en/memcache.increment.php
+     * @param $key string Key of the item to increment.
+     * @param $value int [optional] increment the item by <b>value</b>
+     * @return int|false Returns new items value on success or <b>FALSE</b> on failure.
+     */
+    public function increment ($key, $value = 1) {}
+
+    /**
+     * (PECL memcache &gt;= 0.2.0)<br/>
+     * Decrement item's value
+     * @link https://php.net/manual/en/memcache.decrement.php
+     * @param $key string Key of the item do decrement.
+     * @param $value int Decrement the item by <b>value</b>.
+     * @return int|false Returns item's new value on success or <b>FALSE</b> on failure.
+     */
+    public function decrement ($key, $value = 1) {}
+
+    /**
+     * (PECL memcache &gt;= 0.4.0)<br/>
+     * Close memcached server connection
+     * @link https://php.net/manual/en/memcache.close.php
+     * @return bool Returns <b>TRUE</b> on success or <b>FALSE</b> on failure.
+     */
+    public function close () {}
+
+    /**
+     * (PECL memcache &gt;= 1.0.0)<br/>
+     * Flush all existing items at the server
+     * @link https://php.net/manual/en/memcache.flush.php
+     * @return bool Returns <b>TRUE</b> on success or <b>FALSE</b> on failure.
+     */
+    public function flush () {}
+
+}
+
+/**
+ * Represents a connection to a set of memcache servers.
+ * @link https://php.net/manual/en/class.memcache.php
+ */
+class Memcache extends MemcachePool  {
+
+
+	/**
+	 * (PECL memcache &gt;= 0.4.0)<br/>
+	 * Open memcached server persistent connection
+	 * @link https://php.net/manual/en/memcache.pconnect.php
+	 * @param string $host <p>
+	 * Point to the host where memcached is listening for connections. This parameter
+	 * may also specify other transports like unix:///path/to/memcached.sock
+	 * to use UNIX domain sockets, in this case <i>port</i> must also
+	 * be set to 0.
+	 * </p>
+	 * @param int $port [optional] <p>
+	 * Point to the port where memcached is listening for connections. Set this
+	 * parameter to 0 when using UNIX domain sockets.
+	 * </p>
+	 * @param int $timeout [optional] <p>
+	 * Value in seconds which will be used for connecting to the daemon. Think
+	 * twice before changing the default value of 1 second - you can lose all
+	 * the advantages of caching if your connection is too slow.
+	 * </p>
+	 * @return mixed a Memcache object or <b>FALSE</b> on failure.
+	 */
+	public function pconnect ($host, $port, $timeout = 1) {}
+}
+
+//  string $host [, int $port [, int $timeout ]]
+
+/**
+ * (PECL memcache >= 0.2.0)</br>
+ * Memcache::connect — Open memcached server connection
+ * @link https://php.net/manual/en/memcache.connect.php
+ * @param string $host <p>
+ * Point to the host where memcached is listening for connections.
+ * This parameter may also specify other transports like
+ * unix:///path/to/memcached.sock to use UNIX domain sockets,
+ * in this case port must also be set to 0.
+ * </p>
+ * @param int $port [optional] <p>
+ * Point to the port where memcached is listening for connections.
+ * Set this parameter to 0 when using UNIX domain sockets.
+ * Note:  port defaults to memcache.default_port if not specified.
+ * For this reason it is wise to specify the port explicitly in this method call.
+ * </p>
+ * @param int $timeout [optional] <p>
+ * Value in seconds which will be used for connecting to the daemon.
+ * </p>
+ * @return bool Returns <b>TRUE</b> on success or <b>FALSE</b> on failure.
+ */
+function memcache_connect ($host, $port, $timeout = 1) {}
+
+/**
+ * (PECL memcache >= 0.4.0)
+ * Memcache::pconnect — Open memcached server persistent connection
+ * 
+ * @link https://php.net/manual/en/memcache.pconnect.php#example-5242
+ * @param      $host
+ * @param null $port
+ * @param int  $timeout
+ * @return Memcache
+ */
+function memcache_pconnect ($host, $port=null, $timeout=1) {}
+
+function memcache_add_server () {}
+
+function memcache_set_server_params () {}
+
+function memcache_set_failure_callback () {}
+
+function memcache_get_server_status () {}
+
+function memcache_get_version () {}
+
+function memcache_add () {}
+
+function memcache_set () {}
+
+function memcache_replace () {}
+
+function memcache_cas () {}
+
+function memcache_append () {}
+
+function memcache_prepend () {}
+
+function memcache_get () {}
+
+function memcache_delete () {}
+
+/**
+ * (PECL memcache &gt;= 0.2.0)<br/>
+ * Turn debug output on/off
+ * @link https://php.net/manual/en/function.memcache-debug.php
+ * @param bool $on_off <p>
+ * Turns debug output on if equals to <b>TRUE</b>.
+ * Turns debug output off if equals to <b>FALSE</b>.
+ * </p>
+ * @return bool <b>TRUE</b> if PHP was built with --enable-debug option, otherwise
+ * returns <b>FALSE</b>.
+ */
+function memcache_debug ($on_off) {}
+
+function memcache_get_stats () {}
+
+function memcache_get_extended_stats () {}
+
+function memcache_set_compress_threshold () {}
+
+function memcache_increment () {}
+
+function memcache_decrement () {}
+
+function memcache_close () {}
+
+function memcache_flush () {}
+
+define ('MEMCACHE_COMPRESSED', 2);
+define ('MEMCACHE_USER1', 65536);
+define ('MEMCACHE_USER2', 131072);
+define ('MEMCACHE_USER3', 262144);
+define ('MEMCACHE_USER4', 524288);
+define ('MEMCACHE_HAVE_SESSION', 1);
+
+// End of memcache v.3.0.8
+?>

.travis.yml

@@ -3,10 +3,9 @@ php:
   - '7.1'
   - '7.2'
   - '7.3'
+  - '7.4'
 branches:
   only:
-    - develop
-    - master
     - build_test
 notifications:
   email:
@@ -45,10 +44,11 @@ before_install:
   - if [ $TRAVIS_BRANCH == 'develop' ] || [ $TRAVIS_PULL_REQUEST != 'false' ]; then
         composer install --dev --prefer-dist;
     fi
-  - if [ $TRAVIS_BRANCH != 'develop' ] && [ $TRAVIS_PHP_VERSION == "7.1" ] && [ $TRAVIS_PULL_REQUEST == "false" ]; then
-        export TRAVIS_TAG=$(curl --fail --user "${GH_API_USER}" -s https://api.github.com/repos/getgrav/grav/releases/latest | grep tag_name | head -n 1 | cut -d '"' -f 4);
-        eval "$(curl -sL https://raw.githubusercontent.com/travis-ci/gimme/master/gimme | GIMME_GO_VERSION=1.8 bash)";
-        go get github.com/aktau/github-release;
+  - |
+    if [ $TRAVIS_BRANCH != 'develop' ] && [ $TRAVIS_PHP_VERSION == "7.1" ] && [ $TRAVIS_PULL_REQUEST == "false" ]; then
+        export TRAVIS_TAG=$(curl -H "Authorization: token ${GH_TOKEN}" --fail -s https://api.github.com/repos/getgrav/grav/releases/latest | grep tag_name | head -n 1 | cut -d '"' -f 4);
+        eval "$(curl -sL https://raw.githubusercontent.com/travis-ci/gimme/master/gimme | GIMME_GO_VERSION=1.13 bash)";
+        go get github.com/github-release/github-release;
         git clone --quiet --depth=50 --branch=master https://${BB_TOKEN}bitbucket.org/rockettheme/grav-devtools.git $RT_DEVTOOLS  &>/dev/null;
         if [ ! -z "$TRAVIS_TAG" ]; then
             cd ${RT_DEVTOOLS};
@@ -56,7 +56,7 @@ before_install:
         fi;
     fi
 before_script:
-    - if [ $TRAVIS_PHP_VERSION != 'hhvm' ]; then phpenv config-rm xdebug.ini; fi
+  - phpenv config-rm xdebug.ini
 script:
   - if [ $TRAVIS_BRANCH == 'develop' ] || [ $TRAVIS_PULL_REQUEST != 'false' ]; then
         vendor/bin/codecept run;

CHANGELOG.md

@@ -1,3 +1,679 @@
+# v1.7.10
+## 04/06/2021
+
+1. [](#new)
+    * Added initial support for running Grav library from outside the webroot [#3297](https://github.com/getgrav/grav/issues/3297)
+1. [](#improved)
+    * Improved password handling when saving a user
+1. [](#bugfix)
+    * Ignore errors when using `set_time_limit` in `Archiver` and `GPM\Response` classes [#3023](https://github.com/getgrav/grav/issues/3023)
+    * Fixed `Folder::move()` deleting the folder if you move folder into itself, created empty file instead
+    * Fixed moving `Flex Page` to itself causing the page to be lost [#3227](https://github.com/getgrav/grav/issues/3227)
+    * Fixed `PageStorage` from detecting files as pages
+    * Fixed `UserIndex` not implementing `UserCollectionInterface`
+    * Fixed missing `onAdminAfterDelete` event call in `Flex Pages`
+    * Fixed system templates not getting scanned [#3296](https://github.com/getgrav/grav/issues/3296)
+    * Fixed incorrect routing if url path looks like a domain name [#2184](https://github.com/getgrav/grav/issues/2184)
+
+# v1.7.9
+## 03/19/2021
+
+1. [](#new)
+    * Added `Media::hide()` method to hide files from media
+    * Added `Utils::getPathFromToken()` method which works also with `Flex Objects`
+    * Added `FlexMediaTrait::getMediaField()`, which can be used to access custom media set in the blueprint fields
+    * Added `FlexMediaTrait::getFieldSettings()`, which can be used to get media field settings
+1. [](#improved)
+    * Method `Utils::getPagePathFromToken()` now calls the more generic `Utils::getPathFromToken()`
+    * Updated `SECURITY.md` to use security@getgrav.org
+1. [](#bugfix)
+    * Fixed broken media upload in `Flex` with `@self/path`, `@page` and `@theme` destinations [#3275](https://github.com/getgrav/grav/issues/3275)
+    * Fixed media fields excluding newly deleted files before saving the object
+    * Fixed method `$pages->find()` should never redirect [#3266](https://github.com/getgrav/grav/pull/3266)
+    * Fixed `Page::activeChild()` throwing an error [#3276](https://github.com/getgrav/grav/issues/3276)
+    * Fixed `Flex Page` CRUD ACL when creating a new page (needs Flex Objects plugin update) [grav-plugin-flex-objects#115](https://github.com/trilbymedia/grav-plugin-flex-objects/issues/115)
+    * Fixed the list of pages not showing up in admin [#3280](https://github.com/getgrav/grav/issues/3280)
+    * Fixed text field min/max validation for UTF8 characters [#3281](https://github.com/getgrav/grav/issues/3281)
+    * Fixed redirects using wrong redirect code
+
+# v1.7.8
+## 03/17/2021
+
+1. [](#new)
+    * Added `ControllerResponseTrait::createDownloadResponse()` method
+    * Added full blueprint support to theme if you move existing files in `blueprints/` to `blueprints/pages/` folder [#3255](https://github.com/getgrav/grav/issues/3255)
+    * Added support for `Theme::getFormFieldTypes()` just like in plugins
+1. [](#improved)
+    * Optimized `Flex Pages` for speed
+    * Optimized saving visible/ordered pages when there are a lot of siblings [#3231](https://github.com/getgrav/grav/issues/3231)
+    * Clearing cache now deletes all clockwork files
+    * Improved `system.pages.redirect_default_route` and `system.pages.redirect_trailing_slash` configuration options to accept redirect code
+1. [](#bugfix)
+    * Fixed clockwork error when clearing cache
+    * Fixed missing method `translated()` in `Flex Pages`
+    * Fixed missing `Flex Pages` in site if multi-language support has been enabled
+    * Fixed Grav using blueprints and form fields from disabled plugins
+    * Fixed `FlexIndex::sortBy(['key' => 'ASC'])` having no effect
+    * Fixed default Flex Pages collection ordering to order by filesystem path
+    * Fixed disappearing pages on save if `pages://` stream resolves to multiple folders where the preferred folder doesn't exist
+    * Fixed Markdown image attribute `loading` [#3251](https://github.com/getgrav/grav/pull/3251)
+    * Fixed `Uri::isValidExtension()` returning false positives
+    * Fixed `page.html` returning duplicated content with `system.pages.redirect_default_route` turned on [#3130](https://github.com/getgrav/grav/issues/3130)
+    * Fixed site redirect with redirect code failing when redirecting to sub-pages [#3035](https://github.com/getgrav/grav/pull/3035/files)
+    * Fixed `Uncaught ValueError: Path cannot be empty` when failing to upload a file [#3265](https://github.com/getgrav/grav/issues/3265)
+    * Fixed `Path cannot be empty` when viewing non-existent log file [#3270](https://github.com/getgrav/grav/issues/3270)
+    * Fixed `onAdminSave` original page having empty header [#3259](https://github.com/getgrav/grav/issues/3259)
+
+# v1.7.7
+## 02/23/2021
+
+1. [](#new)
+    * Added `Utils::arrayToQueryParams()` to convert an array into query params
+1. [](#improved)
+    * Added original image support for all flex objects and media fields
+    * Improved `Pagination` class to allow custom pagination query parameter
+1. [](#bugfix)
+    * Fixed avatar of the user not being saved [grav-plugin-flex-objects#111](https://github.com/trilbymedia/grav-plugin-flex-objects/issues/111)
+    * Replaced special space character with regular space in `system/blueprints/user/account_new.yaml`
+
+# v1.7.6
+## 02/17/2021
+
+1. [](#new)
+    * Added `Medium::attribute()` to pass arbitrary attributes [#3065](https://github.com/getgrav/grav/pull/3065)
+    * Added `Plugins::getPlugins()` and `Plugins::getPlugin($name)` to make it easier to access plugin instances [#2277](https://github.com/getgrav/grav/pull/2277)
+    * Added `regex_match` and `regex_split` twig functions [#2788](https://github.com/getgrav/grav/pull/2788)
+    * Updated all languages from [Crowdin](https://crowdin.com/project/grav-core) - Please update any translations here
+1. [](#improved)
+    * Added abstract `FlexObject`, `FlexCollection` and `FlexIndex` classes to `\Grav\Common\Flex` namespace (extend those instead of Framework or Generic classes)
+    * Updated bundled `composer.phar` binary to latest version `2.0.9`
+    * Improved session fixation handling in PHP 7.4+ (cannot fix it in PHP 7.3 due to PHP bug)
+    * Added optional password/database attributes for redis in `system.yaml`
+    * Added ability to filter enabled or disabled with bin/gpm index [#3187](https://github.com/getgrav/grav/pull/3187)
+    * Added `$grav->getVersion()` or `grav.version` in twig to get the current Grav version [#3142](https://github.com/getgrav/grav/issues/3142)
+    * Added second parameter to `$blueprint->flattenData()` to include every field, including those which have no data
+    * Added support for setting session domain [#2040](https://github.com/getgrav/grav/pull/2040)
+    * Better support inheriting languages when using child themes [#3226](https://github.com/getgrav/grav/pull/3226)
+    * Added option for `FlexForm` constructor to reset the form
+1. [](#bugfix)
+    * Fixed issue with `content-security-policy` not being properly supported with `http-equiv` + support single quotes
+    * Fixed CLI progressbar in `backup` and `security` commands to use styled output [#3198](https://github.com/getgrav/grav/issues/3198)
+    * Fixed page save failing because of uploaded images [#3191](https://github.com/getgrav/grav/issues/3191)
+    * Fixed `Flex Pages` using only default language in frontend [#106](https://github.com/trilbymedia/grav-plugin-flex-objects/issues/106)
+    * Fixed empty `route()` and `raw_route()` when getting translated pages [#3184](https://github.com/getgrav/grav/pull/3184)
+    * Fixed error on `bin/gpm plugin uninstall` [#3207](https://github.com/getgrav/grav/issues/3207)
+    * Fixed broken min/max validation for field `type: int`
+    * Fixed lowering uppercase characters in usernames when saving from frontend [#2565](https://github.com/getgrav/grav/pull/2565)
+    * Fixed save error when editing accounts that have been created with capital letters in their username [#3211](https://github.com/getgrav/grav/issues/3211)
+    * Fixed renaming flex objects key when using file storage
+    * Fixed wrong values in Admin pages list [#3214](https://github.com/getgrav/grav/issues/3214)
+    * Fixed pipelined asset using different hash when extra asset is added to before/after position [#2781](https://github.com/getgrav/grav/issues/2781)
+    * Fixed trailing slash redirect to only apply to GET/HEAD requests and use 301 status code [#3127](https://github.com/getgrav/grav/issues/3127)
+    * Fixed root page to always contain trailing slash [#3127](https://github.com/getgrav/grav/issues/3127)
+    * Fixed `<meta name="flattr:*" content="*">` to use name instead property [#3010](https://github.com/getgrav/grav/pull/3010)
+    * Fixed behavior of opposite filters in `Pages::getCollection()` to match Grav 1.6 [#3216](https://github.com/getgrav/grav/pull/3216)
+    * Fixed modular content with missing template file ending up using non-modular template [#3218](https://github.com/getgrav/grav/issues/3218)
+    * Fixed broken attachment image in Flex Objects Admin when `destination: self@` used [#3225](https://github.com/getgrav/grav/issues/3225)
+    * Fixed bug in page content with both markdown and twig enabled [#3223](https://github.com/getgrav/grav/issues/3223)
+
+# v1.7.5
+## 02/01/2021
+
+1. [](#bugfix)
+    * Revert: Fixed page save failing because of uploaded images [#3191](https://github.com/getgrav/grav/issues/3191) - breaking save
+
+# v1.7.4
+## 02/01/2021
+
+1. [](#new)
+    * Added `FlexForm::setSubmitMethod()` to customize form submit action
+1. [](#improved)
+    * Improved GPM error handling
+1. [](#bugfix)
+    * Fixed `bin/gpm uninstall` script not working because of bad typehint [#3172](https://github.com/getgrav/grav/issues/3172)
+    * Fixed `login: visibility_requires_access` not working in pages [#3176](https://github.com/getgrav/grav/issues/3176)
+    * Fixed cannot change image format [#3173](https://github.com/getgrav/grav/issues/3173)
+    * Fixed saving page in expert mode [#3174](https://github.com/getgrav/grav/issues/3174)
+    * Fixed exception in `$flexPage->frontmatter()` method when setting value
+    * Fixed `onBlueprintCreated` event being called multiple times in `Flex Pages` [grav-plugin-flex-objects#97](https://github.com/trilbymedia/grav-plugin-flex-objects/issues/97)
+    * Fixed wrong ordering in page collections if `intl` extension has been enabled [#3167](https://github.com/getgrav/grav/issues/3167)
+    * Fixed page redirect to the first visible child page (needs to be routable and published, too)
+    * Fixed untranslated module pages showing up in the menu
+    * Fixed page save failing because of uploaded images [#3191](https://github.com/getgrav/grav/issues/3191)
+    * Fixed incorrect config lookup for loading in `ImageLoadingTrait` [#3192](https://github.com/getgrav/grav/issues/3192)
+
+# v1.7.3
+## 01/21/2021
+
+1. [](#improved)
+    * IMPORTANT - Please [checkout the process](https://getgrav.org/blog/grav-170-cli-self-upgrade-bug) to `self-upgrade` from CLI if you are on **Grav 1.7.0 or 1.7.1**
+    * Added support for symlinking individual plugins and themes by using `bin/grav install -p myplugin` or `-t mytheme`
+    * Added support for symlinking plugins and themes with `hebe.json` file to support custom folder structures
+    * Added support for running post-install scripts in `bin/gpm selfupgrade` if Grav was updated manually
+1. [](#bugfix)
+    * Fixed default GPM Channel back to 'stable' - this was inadvertently left as 'testing' [#3163](https://github.com/getgrav/grav/issues/3163)
+    * Fixed broken stream initialization if `environment://` paths aren't streams
+    * Fixed Clockwork debugger in sub-folder multi-site setups
+    * Fixed `Unsupported option "curl" passed to "Symfony\Component\HttpClient\CurlHttpClient"` in `bin/gpm selfupgrade` [#3165](https://github.com/getgrav/grav/issues/3165)
+
+# v1.7.2
+## 01/21/2021
+
+1. [](#improved)
+    * This release was pulled due to a bug in the installer, 1.7.3 replaces it.
+
+# v1.7.1
+## 01/20/2021
+
+1. [](#bugfix)
+    * Fixed fatal error when `site.taxonomies` contains a bad value
+    * Sanitize valid Page extensions from `Page::template_format()`
+    * Fixed `bin/gpm index` erroring out [#3158](https://github.com/getgrav/grav/issues/3158)
+    * Fixed `bin/gpm selfupgrade` failing to report failed Grav update [#3116](https://github.com/getgrav/grav/issues/3116)
+    * Fixed `bin/gpm selfupgrade` error on `Call to undefined method` [#3160](https://github.com/getgrav/grav/issues/3160)
+    * Flex Pages: Fixed fatal error when trying to move a page to Root (/) [#3161](https://github.com/getgrav/grav/issues/3161)
+    * Fixed twig parsing errors in pages where twig is parsed after markdown [#3162](https://github.com/getgrav/grav/issues/3162)
+    * Fixed `lighttpd.conf` access-deny rule [#1876](https://github.com/getgrav/grav/issues/1876)
+    * Fixed page metadata being double-escaped [#3121](https://github.com/getgrav/grav/issues/3121)
+
+# v1.7.0
+## 01/19/2021
+
+1. [](#new)
+    * Requires **PHP 7.3.6**
+    * Read about this release in the [Grav 1.7 Released](https://getgrav.org/blog/grav-1.7-released) blog post
+    * Read the full list of all changes in the [Changelog on GitHub](https://github.com/getgrav/grav/blob/1.7.0/CHANGELOG.md)
+    * Please read [Grav 1.7 Upgrade Guide](https://learn.getgrav.org/17/advanced/grav-development/grav-17-upgrade-guide) before upgrading!
+    * Added support for overriding configuration by using environment variables
+    * Use PHP 7.4 serialization (the old `Serializable` methods are now final and cannot be overridden)
+    * Enabled `ETag` setting by default for 304 responses
+    * Added `FlexCollection::getDistinctValues()` to get all the assigned values from the field
+    * `Flex Pages` method `$page->header()` returns `\Grav\Common\Page\Header` object, old `Page` class still returns `stdClass`
+1. [](#improved)
+    * Make it possible to use an absolute path when loading a blueprint
+    * Make serialize methods final in `ContentBlock`, `AbstractFile`, `FormTrait`, `ObjectCollectionTrait` and `ObjectTrait`
+    * Added support for relative paths in `PageObject::getLevelListing()` [#3110](https://github.com/getgrav/grav/issues/3110)
+    * Better `--env` and `--lang` support for `bin/grav`, `bin/gpm` and `bin/plugin` console commands
+      * **BC BREAK** Shorthand for `--env`: `-e` will not work anymore as it conflicts with some plugins
+    * Added support for locking the `start` and `limit` in a Page Collection
+1. [](#bugfix)
+    * Fixed port issue with `system.custom_base_url`
+    * Hide errors with `exif_read_data` in `ImageFile`
+    * Fixed unserialize in `MarkdownFormatter` and `Framework\File` classes
+    * Fixed pages with session messages should never be cached [#3108](https://github.com/getgrav/grav/issues/3108)
+    * Fixed `Filesystem::normalize()` with dot-dot paths
+    * Fixed Flex sorting issues [grav-plugin-flex-objects#92](https://github.com/trilbymedia/grav-plugin-flex-objects/issues/92)
+    * Fixed Clockwork missing dumped arrays and objects
+    * Fixed fatal error in PHP 8 when trying to access root page
+    * Fixed Array->String conversion error when `languages:translations: false` [admin#1896](https://github.com/getgrav/grav-plugin-admin/issues/1896)
+    * Fixed `Inflector` methods when translation is missing `GRAV.INFLECTOR_*` translations
+    * Fixed exception when changing parent of new page [grav-plugin-admin#2018](https://github.com/getgrav/grav-plugin-admin/issues/2018)
+    * Fixed ordering issue with moving pages [grav-plugin-admin#2015](https://github.com/getgrav/grav-plugin-admin/issues/2015)
+    * Fixed Flex Pages cache not invalidating if saving an old `Page` object [#3152](https://github.com/getgrav/grav/issues/3152)
+    * Fixed multiple issues with `system.language.translations: false`
+    * Fixed page collections containing dummy items for untranslated default language [#2985](https://github.com/getgrav/grav/issues/2985)
+    * Fixed streams in `setup.php` being overridden by `system/streams.yaml` [#2450](https://github.com/getgrav/grav/issues/2450)
+    * Fixed `ERR_TOO_MANY_REDIRECTS` with HTTPS = 'On' [#3155](https://github.com/getgrav/grav/issues/3155)
+    * Fixed page collection pagination not behaving as it did in Grav 1.6
+
+# v1.7.0-rc.20
+## 12/15/2020
+
+1. [](#new)
+    * Update phpstan to version 0.12
+    * Auto-Escape enabled by default. Manually enable **Twig Compatibility** and disable **Auto-Escape** to use the old setting.
+    * Updated unit tests to use codeception 4.1
+    * Added support for setting `GRAV_ENVIRONMENT` by using environment variable or a constant
+    * Added support for setting `GRAV_SETUP_PATH` by using environment variable (constant already worked)
+    * Added support for setting `GRAV_ENVIRONMENTS_PATH` by using environment variable or a constant
+    * Added support for setting `GRAV_ENVIRONMENT_PATH` by using environment variable or a constant
+1. [](#improved)
+    * Improved `bin/grav install` command
+1. [](#bugfix)
+    * Fixed potential error when upgrading Grav
+    * Fixed broken list in `bin/gpm index` [#3092](https://github.com/getgrav/grav/issues/3092)
+    * Fixed CLI/GPM command failures returning 0 (success) value [#3017](https://github.com/getgrav/grav/issues/3017)
+    * Fixed unimplemented `PageObject::getOriginal()` call [#3098](https://github.com/getgrav/grav/issues/3098)
+    * Fixed `Argument 1 passed to Grav\Common\User\DataUser\User::filterUsername() must be of the type string` [#3101](https://github.com/getgrav/grav/issues/3101)
+    * Fixed broken check if php exif module is enabled in `ImageFile::fixOrientation()`
+    * Fixed `StaticResizeTrait::resize()` bad image height/width attributes if `null` values are passed to the method
+    * Fixed twig script/style tag `{% script 'file.js' at 'bottom' %}`, replaces broken `in` operator [#3084](https://github.com/getgrav/grav/issues/3084)
+    * Fixed dropped query params when `?` is preceded with `/` [#2964](https://github.com/getgrav/grav/issues/2964)
+
+# v1.7.0-rc.19
+## 12/02/2020
+
+1. [](#bugfix)
+    * Updated composer libraries with latest Toolbox v1.5.6 that contains critical fixes
+
+# v1.7.0-rc.18
+## 12/02/2020
+
+1. [](#new)
+    * Set minimum requirements to **PHP 7.3.6**
+    * Updated Clockwork to v5.0
+    * Added `FlexDirectoryInterface` interface
+    * Renamed `PageCollectionInterface::nonModular()` into `PageCollectionInterface::pages()` and deprecated the old method
+    * Renamed `PageCollectionInterface::modular()` into `PageCollectionInterface::modules()` and deprecated the old method'
+    * Upgraded `bin/composer.phar` to `2.0.2` which is all new and much faster
+    * Added search option `same_as` to Flex Objects
+    * Added PHP 8 compatible `function_exists()`: `Utils::functionExists()`
+    * New sites have `compatibility` features turned off by default, upgrading from older versions will keep the settings on
+1. [](#improved)
+    * Updated bundled JQuery to latest version `3.5.1`
+    * Forward a `sid` to GPM when downloading a premium package via CLI
+    * Allow `JsonFormatter` options to be passed as a string
+    * Hide Flex Pages frontend configuration (not ready for production use)
+    * Improve Flex configuration: gather views together in blueprint
+    * Added XSS detection to all forms. See [documentation](https://learn.getgrav.org/17/forms/forms/form-options#xss-checks)
+    * Better handling of missing repository index [grav-plugin-admin#1916](https://github.com/getgrav/grav-plugin-admin/issues/1916)
+    * Added support for having all sites / environments under `user/env` folder [#3072](https://github.com/getgrav/grav/issues/3072)
+    * Added `FlexObject::refresh()` method to make sure object is up to date
+1. [](#bugfix)
+    * *Menu Visibility Requires Access* Security option setting wrong frontmatter [login#265](https://github.com/getgrav/grav-plugin-login/issues/265)
+    * Accessing page with unsupported file extension (jpg, pdf, xsl) will use wrong mime type [#3031](https://github.com/getgrav/grav/issues/3031)
+    * Fixed media crashing on a bad image
+    * Fixed bug in collections where filter `type: false` did not work
+    * Fixed `print_r()` in twig
+    * Fixed sorting by groups in `Flex Users`
+    * Changing `Flex Page` template causes the other language versions of that page to lose their content [admin#1958](https://github.com/getgrav/grav-plugin-admin/issues/1958)
+    * Fixed plugins getting initialized multiple times (by CLI commands for example)
+    * Fixed `header.admin.children_display_order` in Flex Pages to work just like with regular pages
+    * Fixed `Utils::isFunctionDisabled()` method if there are spaces in `disable_functions` [#3023](https://github.com/getgrav/grav/issues/3023)
+    * Fixed potential fatal error when creating flex index using cache [#3062](https://github.com/getgrav/grav/issues/3062)
+    * Fixed fatal error in `CompiledFile` if the cached version is broken
+    * Fixed updated media missing from media when editing Flex Object after page reload
+    * Fixed issue with `config-default@` breaking on set [#1972](https://github.com/getgrav/grav-plugin-admin/issues/1971)
+    * Escape titles in Flex pages list [flex-objects#84](https://github.com/trilbymedia/grav-plugin-flex-objects/issues/84)
+    * Fixed Purge successful message only working in Scheduler but broken in CLI and Admin [#1935](https://github.com/getgrav/grav-plugin-admin/issues/1935)
+    * Fixed `system://` stream is causing issues in Admin, making Media tab to disappear and possibly causing other issues [#3072](https://github.com/getgrav/grav/issues/3072)
+    * Fixed CLI self-upgrade from Grav 1.6 [#3079](https://github.com/getgrav/grav/issues/3079)
+    * Fixed `bin/grav yamllinter -a` and `-f` not following symlinks [#3080](https://github.com/getgrav/grav/issues/3080)
+    * Fixed `|safe_email` filter to return safe and escaped UTF-8 HTML [#3072](https://github.com/getgrav/grav/issues/3072)
+    * Fixed exception in CLI GPM and backup commands when `php-zip` is not enabled [#3075](https://github.com/getgrav/grav/issues/3075)
+    * Fix for XSS advisory [GHSA-cvmr-6428-87w9](https://github.com/getgrav/grav/security/advisories/GHSA-cvmr-6428-87w9)
+    * Fixed Flex and Page ordering to be natural and case insensitive [flex-objects#87](https://github.com/trilbymedia/grav-plugin-flex-objects/issues/87)
+    * Fixed plugin/theme priority ordering to be numeric
+
+# v1.7.0-rc.17
+## 10/07/2020
+
+1. [](#new)
+    * Added a `Uri::getAllHeaders()` compatibility function
+1. [](#improved)
+    * Fall back through various templates scenarios if they don't exist in theme to avoid unhelpful error.
+    * Added default templates for `external.html.twig`, `default.html.twig`, and `modular.html.twig`
+    * Improve Media classes
+    * _POTENTIAL BREAKING CHANGE:_ Added reload argument to `FlexStorageInterface::getMetaData()`
+1. [](#bugfix)
+    * Fixed `Security::sanitizeSVG()` creating an empty file if SVG file cannot be parsed
+    * Fixed infinite loop in blueprints with `extend@` to a parent stream
+    * Added missing `Stream::create()` method
+    * Added missing `onBlueprintCreated` event for Flex Pages
+    * Fixed `onBlueprintCreated` firing multiple times recursively
+    * Fixed media upload failing with custom folders
+    * Fixed `unset()` in `ObjectProperty` class
+    * Fixed `FlexObject::freeMedia()` method causing media to become null
+    * Fixed bug in `Flex Form` making it impossible to set nested values
+    * Fixed `Flex User` avatar when using folder storage, also allow multiple images
+    * Fixed Referer reference during GPM calls.
+    * Fixed fatal error with toggled lists
+
+# v1.7.0-rc.16
+## 09/01/2020
+
+1. [](#new)
+    * Added a new `svg_image()` twig function to make it easier to 'include' SVG source in Twig
+    * Added a helper `Utils::fullPath()` to get the full path to a file be it stream, relative, etc.
+1. [](#improved)
+    * Added `themes` to cached blueprints and configuration
+1. [](#bugfix)
+    * Fixed `Flex Pages` issue with `getRoute()` returning path with language prefix for default language if set not to do that
+    * Fixed `Flex Pages` bug where reordering pages causes page content to disappear if default language uses wrong extension (`.md` vs `.en.md`)
+    * Fixed `Flex Pages` bug where `onAdminSave` passes page as `$event['page']` instead of `$event['object']` [#2995](https://github.com/getgrav/grav/issues/2995)
+    * Fixed `Flex Pages` bug where changing a modular page template added duplicate file [admin#1899](https://github.com/getgrav/grav-plugin-admin/issues/1899)
+    * Fixed `Flex Pages` bug where renaming slug causes bad ordering range after save [#2997](https://github.com/getgrav/grav/issues/2997)
+
+# v1.7.0-rc.15
+## 07/22/2020
+
+1. [](#bugfix)
+    * Fixed Flex index file caching [#2962](https://github.com/getgrav/grav/issues/2962)
+    * Fixed various issues with Exif data reading and images being incorrectly rotated [#1923](https://github.com/getgrav/grav-plugin-admin/issues/1923)
+
+# v1.7.0-rc.14
+## 07/09/2020
+
+1. [](#improved)
+    * Added ability to `noprocess` specific items only in Link/Image Excerpts, e.g. `http://foo.com/page?id=foo&target=_blank&noprocess=id` [#2954](https://github.com/getgrav/grav/pull/2954)
+1. [](#bugfix)
+    * Regression: Default language fix broke `Language::getLanguageURLPrefix()` and `Language::isIncludeDefaultLanguage()` methods when not using multi-language
+    * Reverted `Language::getDefault()` and `Language::getLanguage()` to return false again because of plugin compatibility (updated docblocks)
+    * Fixed UTF-8 issue in `Excerpts::getExcerptsFromHtml`
+    * Fixed some compatibility issues with recent Changes to `Assets` handling
+    * Fixed issue with `CSS_IMPORTS_REGEX` breaking with complex URLs [#2958](https://github.com/getgrav/grav/issues/2958)
+    * Moved duplicated `CSS_IMPORT_REGEX` to local variable in `AssetUtilsTrait::moveImports()`
+    * Fixed page media only accepting images [#2943](https://github.com/getgrav/grav/issues/2943)
+
+# v1.7.0-rc.13
+## 07/01/2020
+
+1. [](#new)
+    * Added support for uploading and deleting images directly in `Media`
+    * Added new `onAfterCacheClear` event
+1. [](#improved)
+    * Improved `CvsFormatter` to attempt to encode non-scalar variables into JSON before giving up
+    * Moved image loading into its own trait to be used by images+static images
+    * Adjusted asset types to enable extension of assets in class [#2937](https://github.com/getgrav/grav/pull/2937)
+    * Composer update for vendor library updates
+    * Updated bundled `composer.phar` to `2.0.0-dev`
+1. [](#bugfix)
+    * Fixed `MediaUploadTrait::copyUploadedFile()` not adding uploaded media to the collection
+    * Fixed regression in saving media to a new Flex Object [admin#1867](https://github.com/getgrav/grav-plugin-admin/issues/1867)
+    * Fixed `Trying to get property 'username' of non-object` error in Flex [flex-objects#62](https://github.com/trilbymedia/grav-plugin-flex-objects/issues/62)
+    * Fixed retina images not working in Flex [flex-objects#64](https://github.com/trilbymedia/grav-plugin-flex-objects/issues/64)
+    * Fixed plugin initialization in CLI
+    * Fixed broken logic in `Page::topParent()` when dealing with first-level pages
+    * Fixed broken `Flex Page` authorization for groups
+    * Fixed missing `onAdminSave` and `onAdminAfterSave` events when using `Flex Pages` and `Flex Users` [flex-objects#58](https://github.com/trilbymedia/grav-plugin-flex-objects/issues/58)
+    * Fixed new `User Group` allowing bad group name to be saved [admin#1917](https://github.com/getgrav/grav-plugin-admin/issues/1917)
+    * Fixed `Language::getDefault()` returning false and not 'en'
+    * Fixed non-text links in `Excerpts::getExcerptFromHtml`
+    * Fixed CLI commands not properly intializing Plugins so events can fire
+
+# v1.7.0-rc.12
+## 06/08/2020
+
+1. [](#improved)
+    * Changed `Folder::hasChildren` to `Folder::countChildren`
+    * Added `Content Editor` option to user account blueprint
+1. [](#bugfix)
+    * Fixed new `Flex Page` not having correct form fields for the page type
+    * Fixed new `Flex User` erroring out on save (thanks @mikebi42)
+    * Fixed `Flex Object` request cache clear when saving object
+    * Fixed blueprint value filtering in lists [#2923](https://github.com/getgrav/grav/issues/2923)
+    * Fixed blueprint for `system.pages.hide_empty_folders` [#1925](https://github.com/getgrav/grav/issues/2925)
+    * Fixed file field in `Flex Objects` (use `Grav\Common\Flex\Types\GenericObject` instead of `FlexObject`) [flex-objects#37](https://github.com/trilbymedia/grav-plugin-flex-objects/issues/37)
+    * Fixed saving nested file fields in `Flex Objects` [flex-objects#34](https://github.com/trilbymedia/grav-plugin-flex-objects/issues/34)
+    * JSON Route of homepage with no ‘route’ set is valid [form#425](https://github.com/getgrav/grav-plugin-form/issues/425)
+
+# v1.7.0-rc.11
+## 05/14/2020
+
+1. [](#new)
+    * Added support for native `loading=lazy` attributes on images.  Can be set in `system.images.defaults` or per md image with `?loading=lazy` [#2910](https://github.com/getgrav/grav/issues/2910)
+1. [](#improved)
+    * Added `PageCollection::all()` to mimic Pages class
+    * Added system configuration support for `HTTP_X_Forwarded` headers (host disabled by default)
+    * Updated `PHPUserAgentParser` to 1.0.0
+    * Improved docblocks
+    * Fixed some phpstan issues
+    * Tighten vendor requirements
+1. [](#bugfix)
+    * Fix for uppercase image extensions
+    * Fix for `&` errors in HTML when passed to `Excerpts.php`
+
+# v1.7.0-rc.10
+## 04/30/2020
+
+1. [](#new)
+    * Changed `Response::get()` used by **GPM/Admin** to use [Symfony HttpClient v4.4](https://symfony.com/doc/current/components/http_client.html) (`composer install --nodev` required for Git installations)
+    * Added new `Excerpts::processLinkHtml()` method
+1. [](#bugfix)
+    * Fixed `Flex Pages` admin with PHP `intl` extension enabled when using custom page order
+    * Fixed saving non-numeric-prefix `Flex Page` changing to numeric-prefix [flex-objects#56](https://github.com/trilbymedia/grav-plugin-flex-objects/issues/56)
+    * Copying `Flex Page` in admin does nothing [flex-objects#55](https://github.com/trilbymedia/grav-plugin-flex-objects/issues/55)
+    * Force GPM progress to be between 0-100%
+
+# v1.7.0-rc.9
+## 04/27/2020
+
+1. [](#new)
+    * Support for `webp` image format in Page Media [#1168](https://github.com/getgrav/grav/issues/1168)
+    * Added `Route::getBase()` method
+1. [](#improved)
+    * Support symlinks when saving `File`
+1. [](#bugfix)
+    * Fixed flex objects with integer keys not working [#2863](https://github.com/getgrav/grav/issues/2863)
+    * Fixed `Pages::instances()` returning null values when using `Flex Pages` [#2889](https://github.com/getgrav/grav/issues/2889)
+    * Fixed Flex Page parent `header.admin.children_display_order` setting being ignored in Admin [#2881](https://github.com/getgrav/grav/issues/2881)
+    * Implemented missing Flex `$pageCollection->batch()` and `$pageCollection->order()` methods
+    * Fixed user avatar creation for new `Flex Users` when using folder storage
+    * Fixed `Trying to access array offset on value of type null` PHP 7.4 error in `Plugin.php`
+    * Fixed Gregwar Image library using `.jpeg` for cached images, rather use `.jpg`
+    * Fixed `Flex Pages` with `00.home` page not having ordering set
+    * Fixed `Flex Pages` not updating empty content on save [#2890](https://github.com/getgrav/grav/issues/2890)
+    * Fixed creating new Flex User with file storage
+    * Fixed saving new `Flex Object` with custom key
+    * Fixed broken `Plugin::config()` method
+
+# v1.7.0-rc.8
+## 03/19/2020
+
+1. [](#new)
+    * Added `MediaTrait::freeMedia()` method to free media (and memory)
+    * Added `Folder::hasChildren()` method to determine if a folder has child folders
+1. [](#improved)
+    * Save memory when updating large flex indexes
+    * Better `Content-Encoding` handling in Apache when content compression is disabled [#2619](https://github.com/getgrav/grav/issues/2619)
+1. [](#bugfix)
+    * Fixed creating new `Flex User` when folder storage has been selected
+    * Fixed some bugs in Flex root page methods
+    * Fixed bad default redirect code in `ControllerResponseTrait::createRedirectResponse()`
+    * Fixed issue with PHP `HTTP_X_HTTP_METHOD_OVERRIDE` [#2847](https://github.com/getgrav/grav/issues/2847)
+    * Fixed numeric usernames not working in `Flex Users`
+    * Implemented missing Flex `$page->move()` method
+
+# v1.7.0-rc.7
+## 03/05/2020
+
+1. [](#new)
+    * Added `Session::regenerateId()` method to properly prevent session fixation issues
+    * Added configuration option `system.strict_mode.blueprint_compat` to maintain old `validation: strict` behavior [#1273](https://github.com/getgrav/grav/issues/1273)
+1. [](#improved)
+    * Improved Flex events
+    * Updated CLI commands to use the new methods to initialize Grav
+1. [](#bugfix)
+    * Fixed Flex Pages having broken `isFirst()`, `isLast()`, `prevSibling()`, `nextSibling()` and `adjacentSibling()`
+    * Fixed broken ordering sometimes when saving/moving visible `Flex Page` [#2837](https://github.com/getgrav/grav/issues/2837)
+    * Fixed ordering being lost when saving modular `Flex Page`
+    * Fixed `validation: strict` not working in blueprints (see `system.strict_mode.blueprint_compat` setting) [#1273](https://github.com/getgrav/grav/issues/1273)
+    * Fixed `Blueprint::extend()` and `Blueprint::embed()` not initializing dynamic properties
+    * Fixed fatal error on storing flex flash using new object without a key
+    * Regression: Fixed unchecking toggleable having no effect in Flex forms
+    * Fixed changing page template in Flex Pages [#2828](https://github.com/getgrav/grav/issues/2828)
+
+# v1.7.0-rc.6
+## 02/11/2020
+
+1. [](#new)
+    * Plugins & Themes: Call `$plugin->autoload()` and `$theme->autoload()` automatically when object gets initialized
+    * CLI: Added `$grav->initializeCli()` method
+    * Flex Directory: Implemented customizable configuration
+    * Flex Storages: Added support for renaming directory entries
+1. [](#improved)
+    * Vendor updates to latest
+1. [](#bugfix)
+    * Regression: Fixed fatal error in blueprints [#2811](https://github.com/getgrav/grav/issues/2811)
+    * Regression: Fixed bad method call in FlexDirectory::getAuthorizeRule()
+    * Regression: Fixed fatal error in admin if the site has custom permissions in `onAdminRegisterPermissions`
+    * Regression: Fixed flex user index with folder storage
+    * Regression: Fixed fatal error in `bin/plugin` command
+    * Fixed `FlexObject::triggerEvent()` not emitting events [#2816](https://github.com/getgrav/grav/issues/2816)
+    * Grav 1.7: Fixed saving Flex configuration with ignored values becoming null
+    * Grav 1.7: Fixed `bin/plugin` initialization
+    * Grav 1.7: Fixed Flex Page cache key not taking account active language
+
+# v1.7.0-rc.5
+## 02/03/2020
+
+1. [](#bugfix)
+    * Regression: Flex not working in PHP 7.2 or older
+    * Fixed creating first user from admin not clearing Flex User directory cache [#2809](https://github.com/getgrav/grav/issues/2809)
+    * Fixed Flex Pages allowing root page to be deleted
+
+# v1.7.0-rc.4
+## 02/03/2020
+
+1. [](#new)
+    * _POTENTIAL BREAKING CHANGE:_ Upgraded Parsedown to 1.7 for Parsedown-Extra 0.8. Plugins that extend Parsedown may need a fix to render as HTML
+    * Added `$grav['flex']` to access all registered Flex Directories
+    * Added `$grav->dispatchEvent()` method for PSR-14 events
+    * Added `FlexRegisterEvent` which triggers when `$grav['flex']` is being accessed the first time
+    * Added Flex cache configuration options
+    * Added `PluginsLoadedEvent` which triggers after plugins have been loaded but not yet initialized
+    * Added `SessionStartEvent` which triggers when session is started
+    * Added `PermissionsRegisterEvent` which triggers when `$grav['permissions']` is being accessed the first time
+    * Added support for Flex Directory specific configuration
+    * Added support for more advanced ACL
+    * Added `flatten_array` filter to form field validation
+    * Added support for `security@: or: [admin.super, admin.pages]` in blueprints (nested AND/OR mode support)
+1. [](#improved)
+    * Blueprint validation: Added `validate: value_type: bool|int|float|string|trim` to `array` to filter all the values inside the array
+    * Twig `url()` takes now third parameter (`true`) to return URL on non-existing file instead of returning false
+1. [](#bugfix)
+    * Grav 1.7: Fixed blueprint loading issues [#2782](https://github.com/getgrav/grav/issues/2782)
+    * Fixed PHP 7.4 compatibility issue with `Stream`
+    * Fixed new `Flex Users` being stored with wrong filename, login issues [#2785](https://github.com/getgrav/grav/issues/2785)
+    * Fixed `ignore_empty: true` not removing empty values in blueprint filtering
+    * Fixed `{{ false|string }}` twig to return '0' instead of ''
+    * Fixed twig `url()` failing if stream has extra slash in it (e.g. `user:///data`)
+    * Fixed `Blueprint::filter()` returning null instead of array if there is nothing to return
+    * Fixed `Cannot use a scalar value as an array` error in `Utils::arrayUnflattenDotNotation()`, ignore nested structure instead
+    * Fixed `Route` instance in multi-site setups
+    * Fixed `system.translations: false` breaking `Inflector` methods
+    * Fixed filtering ignored (eg. `security@: admin.super`) fields causing `Flex Objects` to lose data on save
+    * Grav 1.7: Fixed `Flex Pages` unserialize issues if Flex-Objects Plugin has not been installed
+    * Grav 1.7: Require Flex-Objects Plugin to edit Flex Accounts
+    * Grav 1.7: Fixed bad result on testing `isPage()` when using Flex Pages
+
+# v1.7.0-rc.3
+## 01/02/2020
+
+1. [](#new)
+    * Added root page support for `Flex Pages`
+1. [](#improved)
+    * Twig filter `|yaml_serialize`: added support for `JsonSerializable` objects and other array-like objects
+    * Added support for returning Flex Page specific permissions for admin and testing
+    * Updated copyright dates to `2020`
+    * Various vendor updates
+1. [](#bugfix)
+    * Grav 1.7: Fixed error on page initialization [#2753](https://github.com/getgrav/grav/issues/2753)
+    * Fixed checking ACL for another user (who is not currently logged in) in a Flex Object or Directory
+    * Fixed bug in Windows where `Filesystem::dirname()` returns backslashes
+    * Fixed Flex object issues in Windows [#2773](https://github.com/getgrav/grav/issues/2773)
+
+# v1.7.0-rc.2
+## 12/04/2019
+
+1. [](#new)
+    * Updated Symfony Components to 4.4
+    * Added support for page specific CRUD permissions (`Flex Pages` only)
+    * Added new `-r <job-id>` option for Scheduler CLI command to force-run a job [#2720](https://github.com/getgrav/grav/issues/2720)
+    * Added `Utils::isAssoc()` and `Utils::isNegative()` helper methods
+    * Changed `UserInterface::authorize()` to return `null` having the same meaning as `false` if access is denied because of no matching rule
+    * Changed `FlexAuthorizeInterface::isAuthorized()` to return `null` having the same meaning as `false` if access is denied because of no matching rule
+    * Moved all Flex type classes under `Grav\Common\Flex`
+    * DEPRECATED `Grav\Common\User\Group` in favor of `$grav['user_groups']`, which contains Flex UserGroup collection
+    * DEPRECATED `$page->modular()` in favor of `$page->isModule()` for better readability
+    * Fixed phpstan issues in all code up to level 3
+1. [](#improved)
+    * Improved twig `|array` filter to work with iterators and objects with `toArray()` method
+    * Updated Flex `SimpleStorage` code to feature match the other storages
+    * Improved user and group ACL to support deny permissions (`Flex Users` only)
+    * Improved twig `authorize()` function to work better with nested rule parameters
+    * Output the current username that Scheduler is using if crontab not setup
+    * Translations: rename MODULAR to MODULE everywhere
+    * Optimized `Flex Pages` collection filtering
+    * Frontend optimizations for `Flex Pages`
+1. [](#bugfix)
+    * Regression: Fixed Grav update bug [#2722](https://github.com/getgrav/grav/issues/2722)
+    * Fixed fatal error when calling `{{ grav.undefined }}`
+    * Grav 1.7: Reverted `$object->getStorageKey()` interface as it was not a good idea, added `getMasterKey()` for pages
+    * Grav 1.7: Fixed logged in user being able to delete his own account from admin account manager
+
+# v1.7.0-rc.1
+## 11/06/2019
+
+1. [](#new)
+    * Added `Flex Pages` to Grav core and removed Flex Objects plugin dependency
+    * Added `Utils::simpleTemplate()` method for very simple variable templating
+    * Added `array_diff()` twig function
+    * Added `template_from_string()` twig function
+    * Updated Symfony Components to 4.3
+1. [](#improved)
+    * Improved `Scheduler` cron command check and more useful CLI information
+    * Improved `Flex Users`: obey blueprints and allow Flex to be used in admin only
+    * Improved `Flex` to support custom site template paths
+    * Changed Twig `{% cache %}` tag to not need unique key, and `lifetime` is now optional
+    * Added mime support for file formatters
+    * Updated built-in `composer.phar` to latest `1.9.0`
+    * Updated vendor libraries
+    * Use `Symfony EventDispatcher` directly and not rockettheme/toolbox wrapper
+1. [](#bugfix)
+    * Fixed exception caused by missing template type based on `Accept:` header [#2705](https://github.com/getgrav/grav/issues/2705)
+    * Fixed `Page::untranslatedLanguages()` not being symmetrical to `Page::translatedLanguages()`
+    * Fixed `Flex Pages` not calling `onPageProcessed` event when cached
+    * Fixed phpstan issues in Framework up to level 7
+    * Fixed issue with duplicate configuration settings in Flex Directory
+    * Fixed fatal error if there are numeric folders in `Flex Pages`
+    * Fixed error on missing `Flex` templates in if `Flex Objects` plugin isn't installed
+    * Fixed `PageTranslateTrait::getAllLanguages()` and `getAllLanguages()` to include default language
+    * Fixed multi-language saving issues with default language in `Flex Pages`
+    * Selfupgrade CLI: Fixed broken selfupgrade assets reference [#2681](https://github.com/getgrav/grav/issues/2681)
+    * Grav 1.7: Fixed PHP 7.1 compatibility issues
+    * Grav 1.7: Fixed fatal error in multi-site setups
+    * Grav 1.7: Fixed `Flex Pages` routing if using translated slugs or `system.hide_in_urls` setting
+    * Grav 1.7: Fixed bug where Flex index file couldn't be disabled
+
+# v1.7.0-beta.10
+## 10/03/2019
+
+1. [](#improved)
+    * Flex: Removed extra exists check when creating object (messes up "non-existing" pages)
+    * Support customizable null character replacement in `CSVFormatter::decode()`
+1. [](#bugfix)
+    * Fixed wrong Grav param separator when using `Route` class
+    * Fixed Flex User Avatar not fully backwards compatible with old user
+    * Grav 1.7: Fixed prev/next page missing pages if pagination was turned on in page header
+    * Grav 1.7: Reverted setting language for every page during initialization
+    * Grav 1.7: Fixed numeric language inconsistencies
+
+# v1.7.0-beta.9
+## 09/26/2019
+
+1. [](#new)
+    * Added a new `{% cache %}` Twig tag eliminating need for `twigcache` extension.
+1. [](#improved)
+    * Improved blueprint initialization in Flex Objects (fixes content aware fields)
+    * Improved Flex FolderStorage class to better hide storage specific logic
+    * Exception will output a badly formatted line in `CsvFormatter::decode()`
+1. [](#bugfix)
+    * Fixed error when activating Flex Accounts in GRAV system configuration (PHP 7.1)
+    * Fixed Grav parameter handling in `RouteFactory::createFromString()`
+
+# v1.7.0-beta.8
+## 09/19/2019
+
+1. [](#new)
+    * Added new `Security::sanitizeSVG()` function
+    * Backwards compatibility break: `FlexStorageInterface::getStoragePath()` and `getMediaPath()` can now return null
+1. [](#improved)
+    * Several FlexObject loading improvements
+    * Added `bin/grav page-system-validator [-r|--record] [-c|--check]` to test Flex Pages
+    * Improved language support for `Route` class
+1. [](#bugfix)
+    * Regression: Fixed language fallback
+    * Regression: Fixed translations when language code is used for non-language purposes
+    * Regression: Allow SVG avatar images for users
+    * Fixed error in `Session::getFlashObject()` if Flex Form is being used
+    * Fixed broken Twig `dump()`
+    * Fixed `Page::modular()` and `Page::modularTwig()` returning `null` for folders and other non-initialized pages
+    * Fixed 404 error when you click to non-routable menu item with children: redirect to the first child instead
+    * Fixed wrong `Pages::dispatch()` calls (with redirect) when we really meant to call `Pages::find()`
+    * Fixed avatars not being displayed with flex users [#2431](https://github.com/getgrav/grav/issues/2431)
+    * Fixed initial Flex Object state when creating a new objects in a form
+
 # v1.7.0-beta.7
 ## 08/30/2019
 
@@ -29,7 +705,7 @@
     * Added a new `bin/grav server` CLI command to easily run Symfony or PHP built-in webservers
     * Added `hasFlexFeature()` method to test if `FlexObject` or `FlexCollection` implements a given feature
     * Added `getFlexFeatures()` method to return all features that `FlexObject` or `FlexCollection` implements
-    * Deprecated `FlexDirectory::update()` and `FlexDirectory::remove()`
+    * DEPRECATED `FlexDirectory::update()` and `FlexDirectory::remove()`
     * Added `FlexStorage::getMetaData()` to get updated object meta information for listed keys
     * Added `Language::getPageExtensions()` to get full list of supported page language extensions
     * Added `$grav->close()` method to properly terminate the request with a response
@@ -77,7 +753,7 @@
     * Updated with Grav 1.6.11 fixes
 1. [](#improved)
     * Updated the Clockwork text
-    
+
 # v1.7.0-beta.1
 ## 06/14/2019
 
@@ -85,11 +761,199 @@
     * Added support for [Clockwork](https://underground.works/clockwork) developer tools (now default debugger)
     * Added support for [Tideways XHProf](https://github.com/tideways/php-xhprof-extension) PHP Extension for profiling method calls
     * Added Twig profiling for Clockwork debugger
-    * Updated Symfony Components to 4.3
     * Added support for Twig 2.11 (compatible with Twig 1.40+)
     * Optimization: Initialize debugbar only after the configuration has been loaded
     * Optimization: Combine some early Grav processors into a single one
 
+# v1.6.31
+## 12/14/2020
+
+1. [](#improved)
+    * Allow all CSS and JS via `robots.txt` [#2006](https://github.com/getgrav/grav/issues/2006) [#3067](https://github.com/getgrav/grav/issues/3067)
+1. [](#bugfix)
+    * Fixed `pages` field escaping issues, needs admin update, too [admin#1990](https://github.com/getgrav/grav-plugin-admin/issues/1990)
+    * Fix `svg-image` issue with classes applied to all elements [#3068](https://github.com/getgrav/grav/issues/3068)
+
+# v1.6.30
+## 12/03/2020
+
+1. [](#bugfix)
+    * Rollback `samesite` cookie logic as it causes issues with PHP < 7.3 [#309](https://github.com/getgrav/grav/issues/3089)
+    * Fixed issue with `.travis.yml` due to GitHub API deprecated functionality
+
+# v1.6.29
+## 12/02/2020
+
+1. [](#new)
+    * Added basic support for `user/config/versions.yaml`
+1. [](#improved)
+    * Updated bundled JQuery to latest version `3.5.1`
+    * Forward a `sid` to GPM when downloading a premium package via CLI
+    * Better handling of missing repository index [grav-plugin-admin#1916](https://github.com/getgrav/grav-plugin-admin/issues/1916)
+    * Set `grav_cli` as referrer when using `Response` from CLI
+    * Add option for timeout in `self-upgrade` command [#3013](https://github.com/getgrav/grav/pull/3013)
+    * Allow to set SameSite from system.yaml [#3063](https://github.com/getgrav/grav/pull/3063)
+    * Update media.yaml with some MS Office mimetypes [#3070](https://github.com/getgrav/grav/pull/3070)
+1. [](#bugfix)
+    * Fixed hardcoded system folder in blueprints, config and language streams
+    * Added `.htaccess` rule to block attempts to use Twig in the request URL
+    * Fix compatibility with Symfony 4.2 and up. [#3048](https://github.com/getgrav/grav/pull/3048)
+    * Fix failing example custom shceduled job. [#3050](https://github.com/getgrav/grav/pull/3050)
+    * Fix for XSS advisory [GHSA-cvmr-6428-87w9](https://github.com/getgrav/grav/security/advisories/GHSA-cvmr-6428-87w9)
+    * Fix uploads_dangerous_extensions checking [#3060](https://github.com/getgrav/grav/pull/3060)
+    * Remove redundant prefixing of `.` to extension [#3060](https://github.com/getgrav/grav/pull/3060)
+    * Check exact extension in checkFilename utility [#3061](https://github.com/getgrav/grav/pull/3061)
+
+# v1.6.28
+## 10/07/2020
+
+1. [](#new)
+    * Back-ported twig `{% cache %}` tag from Grav 1.7
+    * Back-ported `Utils::fullPath()` helper function from Grav 1.7
+    * Back-ported `{{ svg_image() }}` Twig function from Grav 1.7
+    * Back-ported `Folder::countChildren()` function from Grav 1.7
+1. [](#improved)
+    * Use new `{{ theme_var() }}` enhanced logic from Grav 1.7
+    * Improved `Excerpts` class with fixes and functionality from Grav 1.7
+    * Ensure `onBlueprintCreated()` is initialized first
+    * Do not cache default `404` error page
+    * Composer update of vendor libraries
+    * Switched `Caddyfile` to use new Caddy2 syntax + improved usability
+1. [](#bugfix)
+    * Fixed Referer reference during GPM calls.
+    * Fixed fatal error with toggled lists
+
+# v1.6.27
+## 09/01/2020
+
+1. [](#improved)
+    * Right trim route for safety
+    * Use the proper ellipsis for summary [#2939](https://github.com/getgrav/grav/pull/2939)
+    * Left pad schedule times with zeros [#2921](https://github.com/getgrav/grav/pull/2921)
+
+# v1.6.26
+## 06/08/2020
+
+1. [](#improved)
+    * Added new configuration option to control the supported attributes in markdown links [#2882](https://github.com/getgrav/grav/issues/2882)
+1. [](#bugfix)
+    * Fixed blueprint for `system.pages.hide_empty_folders` [#1925](https://github.com/getgrav/grav/issues/2925)
+    * JSON Route of homepage with no ‘route’ set is valid
+    * Fix case-insensitive search of location header [form#425](https://github.com/getgrav/grav-plugin-form/issues/425)
+
+# v1.6.25
+## 05/14/2020
+
+1. [](#improved)
+    * Added system configuration support for `HTTP_X_Forwarded` headers (host disabled by default)
+    * Updated `PHPUserAgentParser` to 1.0.0
+    * Bump `Go` to version 1.13 in `travis.yaml`
+
+# v1.6.24
+## 04/27/2020
+
+1. [](#improved)
+    * Added support for `X-Forwarded-Host` [#2891](https://github.com/getgrav/grav/pull/2891)
+    * Disable XDebug in Travis builds
+
+# v1.6.23
+## 03/19/2020
+
+1. [](#new)
+    * Moved `Parsedown` 1.6 and `ParsedownExtra` 0.7 into `Grav\Framework\Parsedown` to allow fixes
+    * Added `aliases.php` with references to direct `\Parsedown` and `\ParsedownExtra` references
+1. [](#improved)
+    * Upgraded `jQuery` to latest 3.4.1 version [#2859](https://github.com/getgrav/grav/issues/2859)
+1. [](#bugfix)
+    * Fixed PHP 7.4 issue in ParsedownExtra [#2832](https://github.com/getgrav/grav/issues/2832)
+    * Fix for [user reported](https://twitter.com/OriginalSicksec) CVE path-based open redirect
+    * Fix for `stream_set_option` error with PHP 7.4 via Toolbox#28 [#2850](https://github.com/getgrav/grav/issues/2850)
+
+# v1.6.22
+## 03/05/2020
+
+1. [](#new)
+    * Added `Pages::reset()` method
+1. [](#improved)
+    * Updated Negotiation library to address issues [#2513](https://github.com/getgrav/grav/issues/2513)
+1. [](#bugfix)
+    * Fixed issue with search plugins not being able to switch between page translations
+    * Fixed issues with `Pages::baseRoute()` not picking up active language reliably
+    * Reverted `validation: strict` fix as it breaks sites, see [#1273](https://github.com/getgrav/grav/issues/1273)
+
+# v1.6.21
+## 02/11/2020
+
+1. [](#new)
+    * Added `ConsoleCommand::setLanguage()` method to set language to be used from CLI
+    * Added `ConsoleCommand::initializeGrav()` method to properly set up Grav instance to be used from CLI
+    * Added `ConsoleCommand::initializePlugins()`method to properly set up all plugins to be used from CLI
+    * Added `ConsoleCommand::initializeThemes()`method to properly set up current theme to be used from CLI
+    * Added `ConsoleCommand::initializePages()` method to properly set up pages to be used from CLI
+1. [](#improved)
+    * Vendor updates
+1. [](#bugfix)
+    * Fixed `bin/plugin` CLI calling `$themes->init()` way too early (removed it, use above methods instead)
+    * Fixed call to `$grav['page']` crashing CLI
+    * Fixed encoding problems when PHP INI setting `default_charset` is not `utf-8` [#2154](https://github.com/getgrav/grav/issues/2154)
+
+# v1.6.20
+## 02/03/2020
+
+1. [](#bugfix)
+    * Fixed incorrect routing caused by `str_replace()` in `Uri::init()` [#2754](https://github.com/getgrav/grav/issues/2754)
+    * Fixed session cookie is being set twice in the HTTP header [#2745](https://github.com/getgrav/grav/issues/2745)
+    * Fixed session not restarting if user was invalid (downgrading from Grav 1.7)
+    * Fixed filesystem iterator calls with non-existing folders
+    * Fixed `checkbox` field not being saved, requires also Form v4.0.2 [#1225](https://github.com/getgrav/grav/issues/1225)
+    * Fixed `validation: strict` not working in blueprints [#1273](https://github.com/getgrav/grav/issues/1273)
+    * Fixed `Data::filter()` removing empty fields (such as empty list) by default [#2805](https://github.com/getgrav/grav/issues/2805)
+    * Fixed fatal error with non-integer page param value [#2803](https://github.com/getgrav/grav/issues/2803)
+    * Fixed `Assets::addInlineJs()` parameter type mismatch between v1.5 and v1.6 [#2659](https://github.com/getgrav/grav/issues/2659)
+    * Fixed `site.metadata` saving issues [#2615](https://github.com/getgrav/grav/issues/2615)
+
+# v1.6.19
+## 12/04/2019
+
+1. [](#new)
+    * Catch PHP 7.4 deprecation messages and report them in debugbar instead of throwing fatal error
+1. [](#bugfix)
+    * Fixed fatal error when calling `{{ grav.undefined }}`
+    * Fixed multiple issues when there are no pages in the site
+    * PHP 7.4 fix for [#2750](https://github.com/getgrav/grav/issues/2750)
+
+# v1.6.18
+## 12/02/2019
+
+1. [](#bugfix)
+    * PHP 7.4 fix in `Pages::buildSort()`
+    * Updated vendor libraries for PHP 7.4 fixes in Twig and other libraries
+    * Fixed fatal error when `$page->id()` is null [#2731](https://github.com/getgrav/grav/pull/2731)
+    * Fixed cache conflicts on pages with no set id
+    * Fix rewrite rule for for `lighttpd` default config [#721](https://github.com/getgrav/grav/pull/2721)
+
+# v1.6.17
+## 11/06/2019
+
+1. [](#new)
+    * Added working ETag (304 Not Modified) support based on the final rendered HTML
+1. [](#improved)
+    * Safer file handling + customizable null char replacement in `CsvFormatter::decode()`
+    * Change of Behavior: `Inflector::hyphenize` will now automatically trim dashes at beginning and end of a string.
+    * Change in Behavior for `Folder::all()` so no longer fails if trying to copy non-existent dot file [#2581](https://github.com/getgrav/grav/pull/2581)
+    * renamed composer `test-plugins` script to `phpstan-plugins` to be more explicit [#2637](https://github.com/getgrav/grav/pull/2637)
+1. [](#bugfix)
+    * Fixed PHP 7.1 bug in FlexMedia
+    * Fix cache image generation when using cropResize [#2639](https://github.com/getgrav/grav/pull/2639)
+    * Fix `array_merge()` exception with non-array page header metadata [#2701](https://github.com/getgrav/grav/pull/2701)
+
+# v1.6.16
+## 09/19/2019
+
+1. [](#bugfix)
+    * Fixed Flex user creation if file storage is being used [#2444](https://github.com/getgrav/grav/issues/2444)
+    * Fixed `Badly encoded JSON data` warning when uploading files [#2663](https://github.com/getgrav/grav/issues/2663)
+
 # v1.6.15
 ## 08/20/2019
 
@@ -120,7 +984,7 @@
     * Support new GRAV_BASEDIR environment variable [#2541](https://github.com/getgrav/grav/pull/2541)
     * Allow users to override plugin handler priorities [#2165](https://github.com/getgrav/grav/pull/2165)
 1. [](#improved)
-    * Use new `Utils::getSupportedPageTypes()` to enforce `html,htm` at the front of the list [#2531](https://github.com/getgrav/grav/issues/2531)  
+    * Use new `Utils::getSupportedPageTypes()` to enforce `html,htm` at the front of the list [#2531](https://github.com/getgrav/grav/issues/2531)
     * Updated vendor libraries
     * Markdown filter is now page-aware so that it works with modular references [admin#1731](https://github.com/getgrav/grav-plugin-admin/issues/1731)
     * Check of `GRAV_USER_INSTANCE` constant is already defined [#2621](https://github.com/getgrav/grav/pull/2621)
@@ -139,7 +1003,7 @@
     * Fixed `FlexObject::exists()` failing sometimes just after the object has been saved
     * Fixed CSV formatter not encoding strings with `"` and `,` properly
     * Fixed var order in `Validation.php` [#2610](https://github.com/getgrav/grav/issues/2610)
-    
+
 # v1.6.11
 ## 06/21/2019
 
@@ -170,7 +1034,7 @@
     * Fixed regression with `bin/plugin` not listing the plugins available (1c725c0)
     * Fixed bitwise operator in `TwigExtension::exifFunc()` [#2518](https://github.com/getgrav/grav/issues/2518)
     * Fixed issue with lang prefix incorrectly identifying as admin [#2511](https://github.com/getgrav/grav/issues/2511)
-    * Fixed issue with `U0ils::pathPrefixedBYLanguageCode()` and trailing slash [#2510](https://github.com/getgrav/grav/issues/2511) 
+    * Fixed issue with `U0ils::pathPrefixedBYLanguageCode()` and trailing slash [#2510](https://github.com/getgrav/grav/issues/2511)
     * Fixed regresssion issue of `Utils::Url()` not returning `false` on failure. Added new optional `fail_gracefully` 3rd attribute to return string that caused failure [#2524](https://github.com/getgrav/grav/issues/2524)
 
 # v1.6.9

CODE_OF_CONDUCT.md

@@ -1,46 +1,133 @@
+
 # Contributor Covenant Code of Conduct
 
 ## Our Pledge
 
-In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.
+We as members, contributors, and leaders pledge to make participation in our
+community a harassment-free experience for everyone, regardless of age, body
+size, visible or invisible disability, ethnicity, sex characteristics, gender
+identity and expression, level of experience, education, socio-economic status,
+nationality, personal appearance, race, religion, or sexual identity
+and orientation.
+
+We pledge to act and interact in ways that contribute to an open, welcoming,
+diverse, inclusive, and healthy community.
 
 ## Our Standards
 
-Examples of behavior that contributes to creating a positive environment include:
+Examples of behavior that contributes to a positive environment for our
+community include:
 
-* Using welcoming and inclusive language
-* Being respectful of differing viewpoints and experiences
-* Gracefully accepting constructive criticism
-* Focusing on what is best for the community
-* Showing empathy towards other community members
+* Demonstrating empathy and kindness toward other people
+* Being respectful of differing opinions, viewpoints, and experiences
+* Giving and gracefully accepting constructive feedback
+* Accepting responsibility and apologizing to those affected by our mistakes,
+  and learning from the experience
+* Focusing on what is best not just for us as individuals, but for the
+  overall community
 
-Examples of unacceptable behavior by participants include:
+Examples of unacceptable behavior include:
 
-* The use of sexualized language or imagery and unwelcome sexual attention or advances
-* Trolling, insulting/derogatory comments, and personal or political attacks
+* The use of sexualized language or imagery, and sexual attention or
+  advances of any kind
+* Trolling, insulting or derogatory comments, and personal or political attacks
 * Public or private harassment
-* Publishing others' private information, such as a physical or electronic address, without explicit permission
-* Other conduct which could reasonably be considered inappropriate in a professional setting
+* Publishing others' private information, such as a physical or email
+  address, without their explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
 
-## Our Responsibilities
+## Enforcement Responsibilities
 
-Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.
+Community leaders are responsible for clarifying and enforcing our standards of
+acceptable behavior and will take appropriate and fair corrective action in
+response to any behavior that they deem inappropriate, threatening, offensive,
+or harmful.
 
-Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
+Community leaders have the right and responsibility to remove, edit, or reject
+comments, commits, code, wiki edits, issues, and other contributions that are
+not aligned to this Code of Conduct, and will communicate reasons for moderation
+decisions when appropriate.
 
 ## Scope
 
-This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.
+This Code of Conduct applies within all community spaces, and also applies when
+an individual is officially representing the community in public spaces.
+Examples of representing our community include using an official e-mail address,
+posting via an official social media account, or acting as an appointed
+representative at an online or offline event.
 
 ## Enforcement
 
-Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at contact@getgrav.org. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported to the community leaders responsible for enforcement at
+[INSERT CONTACT METHOD].
+All complaints will be reviewed and investigated promptly and fairly.
 
-Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
+All community leaders are obligated to respect the privacy and security of the
+reporter of any incident.
+
+## Enforcement Guidelines
+
+Community leaders will follow these Community Impact Guidelines in determining
+the consequences for any action they deem in violation of this Code of Conduct:
+
+### 1. Correction
+
+**Community Impact**: Use of inappropriate language or other behavior deemed
+unprofessional or unwelcome in the community.
+
+**Consequence**: A private, written warning from community leaders, providing
+clarity around the nature of the violation and an explanation of why the
+behavior was inappropriate. A public apology may be requested.
+
+### 2. Warning
+
+**Community Impact**: A violation through a single incident or series
+of actions.
+
+**Consequence**: A warning with consequences for continued behavior. No
+interaction with the people involved, including unsolicited interaction with
+those enforcing the Code of Conduct, for a specified period of time. This
+includes avoiding interactions in community spaces as well as external channels
+like social media. Violating these terms may lead to a temporary or
+permanent ban.
+
+### 3. Temporary Ban
+
+**Community Impact**: A serious violation of community standards, including
+sustained inappropriate behavior.
+
+**Consequence**: A temporary ban from any sort of interaction or public
+communication with the community for a specified period of time. No public or
+private interaction with the people involved, including unsolicited interaction
+with those enforcing the Code of Conduct, is allowed during this period.
+Violating these terms may lead to a permanent ban.
+
+### 4. Permanent Ban
+
+**Community Impact**: Demonstrating a pattern of violation of community
+standards, including sustained inappropriate behavior,  harassment of an
+individual, or aggression toward or disparagement of classes of individuals.
+
+**Consequence**: A permanent ban from any sort of public interaction within
+the community.
 
 ## Attribution
 
-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version]
+This Code of Conduct is adapted from the [Contributor Covenant][homepage],
+version 2.0, available at
+[https://www.contributor-covenant.org/version/2/0/code_of_conduct.html][v2.0].
 
-[homepage]: http://contributor-covenant.org
-[version]: http://contributor-covenant.org/version/1/4/
+Community Impact Guidelines were inspired by
+[Mozilla's code of conduct enforcement ladder][Mozilla CoC].
+
+For answers to common questions about this code of conduct, see the FAQ at
+[https://www.contributor-covenant.org/faq][FAQ]. Translations are available
+at [https://www.contributor-covenant.org/translations][translations].
+
+[homepage]: https://www.contributor-covenant.org
+[v2.0]: https://www.contributor-covenant.org/version/2/0/code_of_conduct.html
+[Mozilla CoC]: https://github.com/mozilla/diversity
+[FAQ]: https://www.contributor-covenant.org/faq
+[translations]: https://www.contributor-covenant.org/translations

LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2018 Grav
+Copyright (c) 2021 Grav
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -3,7 +3,7 @@
 [![PHPStan](https://img.shields.io/badge/PHPStan-enabled-brightgreen.svg?style=flat)](https://github.com/phpstan/phpstan)
 [![SensioLabsInsight](https://insight.sensiolabs.com/projects/cfd20465-d0f8-4a0a-8444-467f5b5f16ad/mini.png)](https://insight.sensiolabs.com/projects/cfd20465-d0f8-4a0a-8444-467f5b5f16ad)
 [![Discord](https://img.shields.io/discord/501836936584101899.svg?logo=discord&colorB=728ADA&label=Discord%20Chat)](https://chat.getgrav.org)
- [![Build Status](https://travis-ci.org/getgrav/grav.svg?branch=develop)](https://travis-ci.org/getgrav/grav) [![OpenCollective](https://opencollective.com/grav/backers/badge.svg)](#backers) [![OpenCollective](https://opencollective.com/grav/sponsors/badge.svg)](#sponsors)
+ [![PHP Tests](https://github.com/getgrav/grav/workflows/PHP%20Tests/badge.svg?branch=develop)](https://github.com/getgrav/grav/actions?query=workflow%3A%22PHP+Tests%22) [![OpenCollective](https://opencollective.com/grav/backers/badge.svg)](#backers) [![OpenCollective](https://opencollective.com/grav/sponsors/badge.svg)](#sponsors)
 
 Grav is a **Fast**, **Simple**, and **Flexible**, file-based Web-platform.  There is **Zero** installation required.  Just extract the ZIP archive, and you are already up and running.  It follows similar principles to other flat-file CMS platforms, but has a different design philosophy than most. Grav comes with a powerful **Package Management System** to allow for simple installation and upgrading of plugins and themes, as well as simple updating of Grav itself.
 
@@ -21,9 +21,13 @@ The underlying architecture of Grav is designed to use well-established and _bes
 
 # Requirements
 
-- PHP 7.1.3 or higher. Check the [required modules list](https://learn.getgrav.org/basics/requirements#php-requirements)
+- PHP 7.3.6 or higher. Check the [required modules list](https://learn.getgrav.org/basics/requirements#php-requirements)
 - Check the [Apache](https://learn.getgrav.org/basics/requirements#apache-requirements) or [IIS](https://learn.getgrav.org/basics/requirements#iis-requirements) requirements
 
+# Documentation
+
+The full documentation can be found from [learn.getgrav.org](https://learn.getgrav.org).
+
 # QuickStart
 
 These are the options to get Grav:
@@ -84,6 +88,11 @@ To update plugins and themes:
 $ bin/gpm update
 ```
 
+## Upgrading from older version
+
+* [Upgrading to Grav 1.7](https://learn.getgrav.org/16/advanced/grav-development/grav-17-upgrade-guide)
+* [Upgrading to Grav 1.6](https://learn.getgrav.org/16/advanced/grav-development/grav-16-upgrade-guide)
+* [Upgrading from Grav <1.6](https://learn.getgrav.org/16/advanced/grav-development/grav-15-upgrade-guide)
 
 # Contributing
 We appreciate any contribution to Grav, whether it is related to bugs, grammar, or simply a suggestion or improvement! Please refer to the [Contributing guide](CONTRIBUTING.md) for more guidance on this topic.
@@ -128,7 +137,14 @@ See [LICENSE](LICENSE.txt)
 
 # Running Tests
 
-First install the dev dependencies by running `composer update` from the Grav root.
+First install the dev dependencies by running `composer install` from the Grav root.
+
 Then `composer test` will run the Unit Tests, which should be always executed successfully on any site.
 Windows users should use the `composer test-windows` command.
 You can also run a single unit test file, e.g. `composer test tests/unit/Grav/Common/AssetsTest.php`
+
+To run phpstan tests, you should run:
+
+* `composer phpstan` for global tests
+* `composer phpstan-framework` for more strict tests
+* `composer phpstan-plugins` to test all installed plugins

SECURITY.md

@@ -0,0 +1,21 @@
+# Security Policy
+
+## Supported Versions
+
+We are focusing our security updates on the following versions
+
+| Version | Supported          |
+| ------- | ------------------ |
+| 1.7.x   | :white_check_mark: |
+| 1.6.x   | :warning:          |
+| < 1.6   | :x:                |
+
+## :warning: Versions
+
+Versions with :warning: will be supported for security issues, however you won't be able to update to them, you will need to manually update through the [`direct-install` command](https://learn.getgrav.org/17/admin-panel/tools).
+
+If you cannot update to the latest stable version available because, for example, your server does not meet the minimum PHP requirements, you can manually install a previous version by downloading the package from our Releases directory (https://github.com/getgrav/grav/releases).
+
+## Reporting a Vulnerability
+
+Please contact security@getgrav.org with a detailed explaination of the security issue found and we will work with you to get it resolved as fast as possible.

assets/.gitkeep

@@ -0,0 +1 @@
+/* @copyright  Copyright (c) 2015 - 2021 Trilby Media, LLC. All rights reserved. */

backup/.gitkeep

@@ -0,0 +1 @@
+/* @copyright  Copyright (c) 2015 - 2021 Trilby Media, LLC. All rights reserved. */

bin/gpm

@@ -1,9 +1,14 @@
 #!/usr/bin/env php
 <?php
 
+/**
+ * @copyright  Copyright (c) 2015 - 2021 Trilby Media, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 use Grav\Common\Composer;
-use Symfony\Component\Console\Application;
 use Grav\Common\Grav;
+use Grav\Console\Application\GpmApplication;
 
 \define('GRAV_CLI', true);
 \define('GRAV_REQUEST_TIME', microtime(true));
@@ -28,6 +33,13 @@ if (!ini_get('date.timezone')) {
     date_default_timezone_set('UTC');
 }
 
+// Set internal encoding.
+if (!\extension_loaded('mbstring')) {
+    die("'mbstring' extension is not loaded.  This is required for Grav to run correctly");
+}
+@ini_set('default_charset', 'UTF-8');
+mb_internal_encoding('UTF-8');
+
 if (!file_exists(GRAV_ROOT . '/index.php')) {
     exit('FATAL: Must be run from ROOT directory of Grav!');
 }
@@ -36,37 +48,7 @@ if (!function_exists('curl_version')) {
     exit('FATAL: GPM requires PHP Curl module to be installed');
 }
 
-$climate = new League\CLImate\CLImate;
-$climate->arguments->add([
-    'environment' => [
-        'prefix'        => 'e',
-        'longPrefix'    => 'env',
-        'description'   => 'Configuration Environment',
-        'defaultValue'  => 'localhost'
-    ]
-]);
-$climate->arguments->parse();
-
-// Set up environment based on params.
-$environment = $climate->arguments->get('environment');
-
 $grav = Grav::instance(array('loader' => $autoload));
-$grav->setup($environment);
-
-$grav['config']->init();
-$grav['uri']->init();
-$grav['users'];
-
-$app = new Application('Grav Package Manager', GRAV_VERSION);
-$app->addCommands(array(
-    new \Grav\Console\Gpm\IndexCommand(),
-    new \Grav\Console\Gpm\VersionCommand(),
-    new \Grav\Console\Gpm\InfoCommand(),
-    new \Grav\Console\Gpm\InstallCommand(),
-    new \Grav\Console\Gpm\UninstallCommand(),
-    new \Grav\Console\Gpm\UpdateCommand(),
-    new \Grav\Console\Gpm\SelfupgradeCommand(),
-    new \Grav\Console\Gpm\DirectInstallCommand(),
-));
 
+$app = new GpmApplication('Grav Package Manager', GRAV_VERSION);
 $app->run();

bin/grav

@@ -1,10 +1,14 @@
 #!/usr/bin/env php
 <?php
 
+/**
+ * @copyright  Copyright (c) 2015 - 2021 Trilby Media, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 use Grav\Common\Composer;
 use Grav\Common\Grav;
-use League\CLImate\CLImate;
-use Symfony\Component\Console\Application;
+use Grav\Console\Application\GravApplication;
 
 \define('GRAV_CLI', true);
 \define('GRAV_REQUEST_TIME', microtime(true));
@@ -25,44 +29,22 @@ if (version_compare($ver = PHP_VERSION, $req = GRAV_PHP_MIN, '<')) {
     exit(sprintf("You are running PHP %s, but Grav needs at least PHP %s to run.\n", $ver, $req));
 }
 
-$climate = new League\CLImate\CLImate;
-$climate->arguments->add([
-    'environment' => [
-        'prefix'        => 'e',
-        'longPrefix'    => 'env',
-        'description'   => 'Configuration Environment',
-        'defaultValue'  => 'localhost'
-    ]
-]);
-$climate->arguments->parse();
-
-// Set up environment based on params.
-$environment = $climate->arguments->get('environment');
-
-$grav = Grav::instance(array('loader' => $autoload));
-$grav->setup($environment);
-
 if (!ini_get('date.timezone')) {
     date_default_timezone_set('UTC');
 }
 
+// Set internal encoding.
+if (!\extension_loaded('mbstring')) {
+    die("'mbstring' extension is not loaded.  This is required for Grav to run correctly");
+}
+@ini_set('default_charset', 'UTF-8');
+mb_internal_encoding('UTF-8');
+
+$grav = Grav::instance(array('loader' => $autoload));
+
 if (!file_exists(GRAV_ROOT . '/index.php')) {
     exit('FATAL: Must be run from ROOT directory of Grav!');
 }
 
-$app = new Application('Grav CLI Application', GRAV_VERSION);
-$app->addCommands(array(
-    new \Grav\Console\Cli\InstallCommand(),
-    new \Grav\Console\Cli\ComposerCommand(),
-    new \Grav\Console\Cli\SandboxCommand(),
-    new \Grav\Console\Cli\CleanCommand(),
-    new \Grav\Console\Cli\ClearCacheCommand(),
-    new \Grav\Console\Cli\BackupCommand(),
-    new \Grav\Console\Cli\NewProjectCommand(),
-    new \Grav\Console\Cli\SchedulerCommand(),
-    new \Grav\Console\Cli\SecurityCommand(),
-    new \Grav\Console\Cli\LogViewerCommand(),
-    new \Grav\Console\Cli\YamlLinterCommand(),
-    new \Grav\Console\Cli\ServerCommand(),
-));
+$app = new GravApplication('Grav CLI Application', GRAV_VERSION);
 $app->run();

bin/plugin

@@ -1,13 +1,14 @@
 #!/usr/bin/env php
 <?php
 
+/**
+ * @copyright  Copyright (c) 2015 - 2021 Trilby Media, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 use Grav\Common\Composer;
-use Symfony\Component\Console\Application;
-use Symfony\Component\Console\Input\ArgvInput;
-use Symfony\Component\Console\Output\ConsoleOutput;
-use Symfony\Component\Console\Formatter\OutputFormatterStyle;
 use Grav\Common\Grav;
-use Grav\Common\Filesystem\Folder;
+use Grav\Console\Application\PluginApplication;
 
 \define('GRAV_CLI', true);
 \define('GRAV_REQUEST_TIME', microtime(true));
@@ -32,119 +33,19 @@ if (!ini_get('date.timezone')) {
     date_default_timezone_set('UTC');
 }
 
+// Set internal encoding.
+if (!\extension_loaded('mbstring')) {
+    die("'mbstring' extension is not loaded.  This is required for Grav to run correctly");
+}
+@ini_set('default_charset', 'UTF-8');
+mb_internal_encoding('UTF-8');
+
 if (!file_exists(GRAV_ROOT . '/index.php')) {
     exit('FATAL: Must be run from ROOT directory of Grav!');
 }
 
-$climate = new League\CLImate\CLImate;
-$climate->arguments->add([
-    'environment' => [
-        'prefix'        => 'e',
-        'longPrefix'    => 'env',
-        'description'   => 'Configuration Environment',
-        'defaultValue'  => 'localhost'
-    ]
-]);
-$climate->arguments->parse();
-
-$environment = $climate->arguments->get('environment');
-
+// Bootstrap Grav container.
 $grav = Grav::instance(array('loader' => $autoload));
-$grav->setup($environment);
 
-$grav['config']->init();
-$grav['uri']->init();
-$grav['users'];
-$grav['plugins']->init();
-$grav['themes']->init();
-
-$app     = new Application('Grav Plugins Commands', GRAV_VERSION);
-$pattern = '([A-Z]\w+Command\.php)';
-
-// get arguments and  strip the application name
-if (null === $argv) {
-    $argv = $_SERVER['argv'];
-}
-
-$bin  = array_shift($argv);
-$name = array_shift($argv);
-$argv = array_merge([$bin], $argv);
-
-$input = new ArgvInput($argv);
-
-/** @var \Grav\Common\Data\Data $plugin */
-$plugin = $grav['plugins']->get($name);
-
-$output = new ConsoleOutput();
-$output->getFormatter()->setStyle('red', new OutputFormatterStyle('red', null, array('bold')));
-$output->getFormatter()->setStyle('white', new OutputFormatterStyle('white', null, array('bold')));
-
-if (!$name) {
-    $output->writeln('');
-    $output->writeln('<red>Usage:</red>');
-    $output->writeln("  {$bin} [slug] [command] [arguments]");
-    $output->writeln('');
-    $output->writeln('<red>Example:</red>');
-    $output->writeln("  {$bin} error log -l 1 --trace");
-    $list = Folder::all('plugins://', ['compare' => 'Pathname', 'pattern' => '/\/cli\/' . $pattern . '$/usm', 'levels' => 2]);
-
-    $total = 0;
-    if (count($list)) {
-        $available = [];
-        $output->writeln('');
-        $output->writeln('<red>Plugins with CLI available:</red>');
-        foreach ($list as $index => $entry) {
-            $split = explode('/', $entry);
-            $entry = array_shift($split);
-            $index = str_pad($index++ + 1, 2, '0', STR_PAD_LEFT);
-            $total = str_pad($total++ + 1, 2, '0', STR_PAD_LEFT);
-            if (\in_array($entry, $available, true)) {
-                $total--;
-                continue;
-            }
-
-            $available[] = $entry;
-            $commands_count = $index - $total + 1;
-            $output->writeln('  ' . $total . '. <red>' . str_pad($entry, 15) . "</red> <white>{$bin} {$entry} list</white>");
-        }
-    }
-
-    exit;
-} else {
-    if (is_null($plugin)) {
-        $output->writeln('');
-        $output->writeln("<red>$name plugin not found</red>");
-        die;
-    }
-
-    if (!$plugin->enabled) {
-        $output->writeln('');
-        $output->writeln("<red>$name not enabled</red>");
-        die;
-    }
-}
-
-if ($plugin === null) {
-    $output->writeln("<red>Grav Plugin <white>'{$name}'</white> is not installed</red>");
-    exit;
-}
-
-$path = 'plugins://' . $name . '/cli';
-
-try {
-    $commands = Folder::all($path, ['compare' => 'Filename', 'pattern' => '/' . $pattern . '$/usm', 'levels' => 1]);
-} catch (\RuntimeException $e) {
-    $output->writeln("<red>No Console Commands for <white>'{$name}'</white> where found in <white>'{$path}'</white></red>");
-    exit;
-}
-
-foreach ($commands as $command_path) {
-    $full_path = $grav['locator']->findResource("plugins://{$name}/cli/{$command_path}");
-    require_once $full_path;
-
-    $command_class = 'Grav\Plugin\Console\\' . preg_replace('/.php$/', '', $command_path);
-    $command = new $command_class();
-    $app->add($command);
-}
-
-$app->run($input);
+$app = new PluginApplication('Grav Plugins Commands', GRAV_VERSION);
+$app->run();

cache/.gitkeep

@@ -0,0 +1 @@
+/* @copyright  Copyright (c) 2015 - 2021 Trilby Media, LLC. All rights reserved. */

codeception.yml

@@ -1,4 +1,5 @@
 actor: Tester
+bootstrap: _bootstrap.php
 paths:
     tests: tests
     log: tests/_output
@@ -6,7 +7,6 @@ paths:
     support: tests/_support
     envs: tests/_envs
 settings:
-    bootstrap: _bootstrap.php
     colors: true
     memory_limit: 1024M
 extensions:

composer.json

@@ -2,66 +2,83 @@
     "name": "getgrav/grav",
     "type": "project",
     "description": "Modern, Crazy Fast, Ridiculously Easy and Amazingly Powerful Flat-File CMS",
-    "keywords": ["cms","flat-file cms","flat cms","flatfile cms","php"],
+    "keywords": [
+        "cms",
+        "flat-file cms",
+        "flat cms",
+        "flatfile cms",
+        "php"
+    ],
     "homepage": "https://getgrav.org",
     "license": "MIT",
     "require": {
-        "php": ">=7.1.3",
+        "php": "^7.3.6 || ^8.0",
         "ext-json": "*",
-        "ext-mbstring": "*",
         "ext-openssl": "*",
         "ext-curl": "*",
         "ext-zip": "*",
         "ext-dom": "*",
-        "symfony/polyfill-iconv": "^1.9",
-        "symfony/polyfill-php72": "^1.9",
-        "symfony/polyfill-php73": "^1.9",
-
+        "ext-libxml": "*",
+        "symfony/polyfill-mbstring": "~1.20",
+        "symfony/polyfill-iconv": "^1.20",
+        "symfony/polyfill-php74": "^1.20",
+        "symfony/polyfill-php80": "^1.20",
         "psr/simple-cache": "^1.0",
         "psr/http-message": "^1.0",
         "psr/http-server-middleware": "^1.0",
-
-        "kodus/psr7-server": "*",
-        "nyholm/psr7": "^1.0",
-
-        "twig/twig": "~1.0",
-        "erusev/parsedown": "1.6.4",
-        "erusev/parsedown-extra": "~0.7",
-        "symfony/yaml": "~4.2",
-        "symfony/console": "~4.2.0",
-        "symfony/event-dispatcher": "~4.2.0",
-        "symfony/var-dumper": "~4.2.0",
-        "symfony/process": "~4.2.0",
-        "doctrine/cache": "^1.8",
-        "doctrine/collections": "^1.5",
-        "guzzlehttp/psr7": "^1.4",
-        "filp/whoops": "~2.2",
-
+        "psr/container": "~1.0.0",
+        "nyholm/psr7-server": "^1.0",
+        "nyholm/psr7": "^1.3",
+        "twig/twig": "~1.44",
+        "erusev/parsedown": "^1.7",
+        "erusev/parsedown-extra": "~0.8",
+        "symfony/contracts": "~1.1",
+        "symfony/yaml": "~4.4",
+        "symfony/console": "~4.4",
+        "symfony/event-dispatcher": "~4.4",
+        "symfony/var-dumper": "~4.4",
+        "symfony/process": "~4.4",
+        "doctrine/cache": "^1.10",
+        "doctrine/collections": "^1.6",
+        "guzzlehttp/psr7": "^1.7",
+        "filp/whoops": "~2.9",
         "matthiasmullie/minify": "^1.3",
-        "monolog/monolog": "~1.0",
-        "gregwar/image": "2.*",
-        "donatj/phpuseragentparser": "~0.10",
-        "pimple/pimple": "~3.2",
-        "rockettheme/toolbox": "~1.4",
-        "maximebf/debugbar": "~1.15",
-        "league/climate": "^3.4",
+        "monolog/monolog": "~1.25",
+        "gregwar/image": "dev-php8",
+        "gregwar/cache": "dev-php8",
+        "donatj/phpuseragentparser": "~1.1",
+        "pimple/pimple": "~3.3.0",
+        "rockettheme/toolbox": "~1.5",
+        "maximebf/debugbar": "~1.16",
+        "league/climate": "^3.6",
         "antoligy/dom-string-iterators": "^1.0",
-        "miljar/php-exif": "^0.6.4",
-        "composer/ca-bundle": "^1.0",
+        "miljar/php-exif": "^0.6",
+        "composer/ca-bundle": "^1.2",
         "dragonmantank/cron-expression": "^1.2",
         "phive/twig-extensions-deferred": "^1.0",
-        "willdurand/negotiation": "^2.3",
-        "itsgoingd/clockwork": "~4.0"
+        "willdurand/negotiation": "^3.0",
+        "itsgoingd/clockwork": "^5.0",
+        "enshrined/svg-sanitize": "~0.13",
+        "symfony/http-client": "^4.4",
+        "composer/semver": "^1.4"
     },
     "require-dev": {
-        "codeception/codeception": "^2.4",
-        "phpstan/phpstan": "^0.11",
-        "phpstan/phpstan-deprecation-rules": "^0.11.0",
-        "phpunit/php-code-coverage": "~6.0",
-        "fzaninotto/faker": "^1.8",
-        "victorjonsson/markdowndocs": "dev-master"
+        "codeception/codeception": "^4.1",
+        "phpstan/phpstan": "^0.12",
+        "phpstan/phpstan-deprecation-rules": "^0.12",
+        "phpunit/php-code-coverage": "~9.2",
+        "victorjonsson/markdowndocs": "dev-master",
+        "codeception/module-asserts": "^1.3",
+        "codeception/module-phpbrowser": "^1.0",
+        "symfony/service-contracts": "*"
+    },
+    "replace": {
+        "symfony/polyfill-php72": "*",
+        "symfony/polyfill-php73": "*"
     },
     "suggest": {
+        "ext-mbstring": "Recommended for better performance",
+        "ext-iconv": "Recommended for better performance",
         "ext-zend-opcache": "Recommended for better performance",
         "ext-intl": "Recommended for multi-language sites",
         "ext-memcache": "Needed to support Memcache servers",
@@ -71,7 +88,7 @@
     "config": {
         "apcu-autoloader": true,
         "platform": {
-            "php": "7.1.3"
+            "php": "7.3.6"
         }
     },
     "repositories": [
@@ -81,25 +98,32 @@
         },
         {
             "type": "vcs",
-            "url": "https://github.com/itsgoingd/clockwork"
+            "url": "https://github.com/getgrav/Cache"
+        },
+        {
+            "type": "vcs",
+            "url": "https://github.com/getgrav/Image"
         }
     ],
     "autoload": {
         "psr-4": {
             "Grav\\": "system/src/Grav"
         },
-        "files": ["system/defines.php"]
+        "files": [
+            "system/defines.php"
+        ]
     },
     "archive": {
-        "exclude": ["VERSION"]
+        "exclude": [
+            "VERSION"
+        ]
     },
     "scripts": {
-        "api-16": "vendor/bin/phpdoc-md generate system/src > user/pages/14.api/default.16.md",
-        "api-15": "vendor/bin/phpdoc-md generate system/src > user/pages/14.api/default.md",
+        "api-17": "vendor/bin/phpdoc-md generate system/src > user/pages/14.api/default.17.md",
         "post-create-project-cmd": "bin/grav install",
-        "phpstan": "vendor/bin/phpstan analyse -l 2 -c ./tests/phpstan/phpstan.neon system/src --memory-limit=256M",
-        "phpstan-framework": "vendor/bin/phpstan analyse -l 5 -c ./tests/phpstan/phpstan.neon system/src/Grav/Framework --memory-limit=256M",
-        "test-plugins": "vendor/bin/phpstan analyse -l 0 -c ./tests/phpstan/plugins.neon user/plugins --memory-limit=256M",
+        "phpstan": "vendor/bin/phpstan analyse -l 1 -c ./tests/phpstan/phpstan.neon --memory-limit=480M system/src",
+        "phpstan-framework": "vendor/bin/phpstan analyse -l 1 -c ./tests/phpstan/phpstan.neon --memory-limit=480M system/src/Grav/Framework system/src/Grav/Events system/src/Grav/Installer",
+        "phpstan-plugins": "vendor/bin/phpstan analyse -l 1 -c ./tests/phpstan/plugins.neon --memory-limit=400M user/plugins",
         "test": "vendor/bin/codecept run unit",
         "test-windows": "vendor\\bin\\codecept run unit"
     },

images/.gitkeep

@@ -0,0 +1 @@
+/* @copyright  Copyright (c) 2015 - 2021 Trilby Media, LLC. All rights reserved. */

index.php

@@ -3,26 +3,37 @@
 /**
  * @package    Grav.Core
  *
- * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2021 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav;
 
 \define('GRAV_REQUEST_TIME', microtime(true));
-\define('GRAV_PHP_MIN', '7.1.3');
+\define('GRAV_PHP_MIN', '7.3.6');
 
 if (version_compare($ver = PHP_VERSION, $req = GRAV_PHP_MIN, '<')) {
     die(sprintf('You are running PHP %s, but Grav needs at least <strong>PHP %s</strong> to run.', $ver, $req));
 }
 
 if (PHP_SAPI === 'cli-server') {
-    $symfony_server = strpos(getenv('_'), 'symfony') !== false;
+    $symfony_server = stripos(getenv('_'), 'symfony') !== false || stripos($_SERVER['SERVER_SOFTWARE'], 'symfony
+') !== false;
     if (!isset($_SERVER['PHP_CLI_ROUTER']) && !$symfony_server) {
         die("PHP webserver requires a router to run Grav, please use: <pre>php -S {$_SERVER['SERVER_NAME']}:{$_SERVER['SERVER_PORT']} system/router.php</pre>");
     }
 }
 
+// Set timezone to default, falls back to system if php.ini not set
+date_default_timezone_set(@date_default_timezone_get());
+
+// Set internal encoding.
+if (!\extension_loaded('mbstring')) {
+    die("'mbstring' extension is not loaded.  This is required for Grav to run correctly");
+}
+@ini_set('default_charset', 'UTF-8');
+mb_internal_encoding('UTF-8');
+
 // Ensure vendor libraries exist
 $autoload = __DIR__ . '/vendor/autoload.php';
 if (!is_file($autoload)) {
@@ -35,15 +46,6 @@ $loader = require $autoload;
 use Grav\Common\Grav;
 use RocketTheme\Toolbox\Event\Event;
 
-// Set timezone to default, falls back to system if php.ini not set
-date_default_timezone_set(@date_default_timezone_get());
-
-// Set internal encoding if mbstring loaded
-if (!\extension_loaded('mbstring')) {
-    die("'mbstring' extension is not loaded.  This is required for Grav to run correctly");
-}
-mb_internal_encoding('UTF-8');
-
 // Get the Grav instance
 $grav = Grav::instance(
     array(

logs/.gitkeep

@@ -0,0 +1 @@
+/* @copyright  Copyright (c) 2015 - 2021 Trilby Media, LLC. All rights reserved. */

now.json

@@ -1,4 +1,4 @@
-    {
+{
   "version": 2,
   "builds": [{ "src": "*.php", "use": "@now/php" }]
 }

robots.txt

@@ -11,3 +11,6 @@ Allow: /user/pages/
 Allow: /user/themes/
 Allow: /user/images/
 Allow: /
+Allow: *.css$
+Allow: *.js$
+Allow: /system/*.js$

system/assets/debugger/clockwork.js

@@ -1,2 +1,3 @@
 /** Clockwork Debugger JS **/
-document.addEventListener("DOMContentLoaded",function(){var e=document.createElement("div");e.appendChild(document.createElement("i")),e.className="clockwork-badge",document.body.appendChild(e)});
+document.addEventListener("DOMContentLoaded",function () {
+    var e=document.createElement("div");e.appendChild(document.createElement("i")),e.className="clockwork-badge",document.body.appendChild(e)});

system/blueprints/config/scheduler.yaml

@@ -39,12 +39,13 @@ form:
             .command:
               type: text
               label: PLUGIN_ADMIN.COMMAND
-              placeholder: 'cd ~;ls -lah;'
+              placeholder: 'ls'
               validate:
                   required: true
             .args:
               type: text
               label: PLUGIN_ADMIN.EXTRA_ARGUMENTS
+              placeholder: '-lah'
             .at:
               type: cron
               label: PLUGIN_ADMIN.SCHEDULER_RUNAT

system/blueprints/config/security.yaml

@@ -105,3 +105,15 @@ form:
             validate:
                 type: commalist
 
+
+        sanitize_svg:
+            type: toggle
+            label: PLUGIN_ADMIN.SANITIZE_SVG
+            help: PLUGIN_ADMIN.SANITIZE_SVG_HELP
+            highlight: 1
+            options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+            default: true
+            validate:
+                type: bool

system/blueprints/config/system.yaml

@@ -177,39 +177,47 @@ form:
               label: PLUGIN_ADMIN.APPEND_URL_EXT
               help: PLUGIN_ADMIN.APPEND_URL_EXT_HELP
 
-            pages.redirect_default_route:
-              type: toggle
-              label: PLUGIN_ADMIN.REDIRECT_DEFAULT_ROUTE
-              help: PLUGIN_ADMIN.REDIRECT_DEFAULT_ROUTE_HELP
-              highlight: 0
-              options:
-                1: PLUGIN_ADMIN.YES
-                0: PLUGIN_ADMIN.NO
-              validate:
-                type: bool
-
             pages.redirect_default_code:
               type: select
               size: medium
               classes: fancy
               label: PLUGIN_ADMIN.REDIRECT_DEFAULT_CODE
               help: PLUGIN_ADMIN.REDIRECT_DEFAULT_CODE_HELP
+              default: 302
               options:
-                301: 301 - Permanent
-                302: 302 - Found
-                303: 303 - Other
-                304: 304 - Not Modified
+                301: PLUGIN_ADMIN.REDIRECT_OPTION_301
+                302: PLUGIN_ADMIN.REDIRECT_OPTION_302
+                303: PLUGIN_ADMIN.REDIRECT_OPTION_303
+
+            pages.redirect_default_route:
+              type: select
+              size: medium
+              classes: fancy
+              label: PLUGIN_ADMIN.REDIRECT_DEFAULT_ROUTE
+              help: PLUGIN_ADMIN.REDIRECT_DEFAULT_ROUTE_HELP
+              default: 0
+              options:
+                0: PLUGIN_ADMIN.REDIRECT_OPTION_NO_REDIRECT
+                1: PLUGIN_ADMIN.REDIRECT_OPTION_DEFAULT_REDIRECT
+                301: PLUGIN_ADMIN.REDIRECT_OPTION_301
+                302: PLUGIN_ADMIN.REDIRECT_OPTION_302
+              validate:
+                type: int
 
             pages.redirect_trailing_slash:
-              type: toggle
+              type: select
+              size: medium
+              classes: fancy
               label: PLUGIN_ADMIN.REDIRECT_TRAILING_SLASH
               help: PLUGIN_ADMIN.REDIRECT_TRAILING_SLASH_HELP
-              highlight: 1
+              default: 1
               options:
-                1: PLUGIN_ADMIN.YES
-                0: PLUGIN_ADMIN.NO
+                0: PLUGIN_ADMIN.REDIRECT_OPTION_NO_REDIRECT
+                1: PLUGIN_ADMIN.REDIRECT_OPTION_DEFAULT_REDIRECT
+                301: PLUGIN_ADMIN.REDIRECT_OPTION_301
+                302: PLUGIN_ADMIN.REDIRECT_OPTION_302
               validate:
-                type: bool
+                type: int
 
             pages.ignore_hidden:
               type: toggle
@@ -241,13 +249,15 @@ form:
                 type: commalist
 
             pages.hide_empty_folders:
-              type: selectize
-              size: large
+              type: toggle
               label: PLUGIN_ADMIN.HIDE_EMPTY_FOLDERS
               help: PLUGIN_ADMIN.HIDE_EMPTY_FOLDERS_HELP
-              classes: fancy
+              highlight: 0
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
               validate:
-                type: commalist
+                type: bool
 
             pages.url_taxonomy_filters:
               type: toggle
@@ -385,8 +395,8 @@ form:
 
             languages.translations:
               type: toggle
-              label: PLUGIN_ADMIN.TRANSLATIONS_ENABLED
-              help: PLUGIN_ADMIN.TRANSLATIONS_ENABLED_HELP
+              label: PLUGIN_ADMIN.LANGUAGE_TRANSLATIONS
+              help: PLUGIN_ADMIN.LANGUAGE_TRANSLATIONS_HELP
               highlight: 1
               options:
                 1: PLUGIN_ADMIN.YES
@@ -544,6 +554,15 @@ form:
                 0: PLUGIN_ADMIN.NO
               validate:
                 type: bool
+            pages.markdown.valid_link_attributes:
+              type: selectize
+              size: large
+              label: PLUGIN_ADMIN.VALID_LINK_ATTRIBUTES
+              help: PLUGIN_ADMIN.VALID_LINK_ATTRIBUTES_HELP
+              placeholder: "rel, target, id, class, classes"
+              classes: fancy
+              validate:
+                type: commalist
 
         caching:
           type: tab
@@ -730,6 +749,74 @@ form:
               size: small
               label: PLUGIN_ADMIN.REDIS_PASSWORD
 
+            cache.redis.database:
+              type: text
+              size: medium
+              label: PLUGIN_ADMIN.REDIS_DATABASE
+              help: PLUGIN_ADMIN.REDIS_DATABASE_HELP
+              placeholder: "0"
+              validate:
+                type: number
+                min: 0
+
+            flex_caching:
+              type: section
+              title: PLUGIN_ADMIN.FLEX_CACHING
+
+            flex.cache.index.enabled:
+              type: toggle
+              label: PLUGIN_ADMIN.FLEX_INDEX_CACHE_ENABLED
+              highlight: 1
+              default: 1
+              options:
+                1: PLUGIN_ADMIN.ENABLED
+                0: PLUGIN_ADMIN.DISABLED
+              validate:
+                type: bool
+
+            flex.cache.index.lifetime:
+              type: text
+              label: PLUGIN_ADMIN.FLEX_INDEX_CACHE_LIFETIME
+              default: 60
+              validate:
+                type: int
+
+            flex.cache.object.enabled:
+              type: toggle
+              label: PLUGIN_ADMIN.FLEX_OBJECT_CACHE_ENABLED
+              highlight: 1
+              default: 1
+              options:
+                1: PLUGIN_ADMIN.ENABLED
+                0: PLUGIN_ADMIN.DISABLED
+              validate:
+                type: bool
+
+            flex.cache.object.lifetime:
+              type: text
+              label: PLUGIN_ADMIN.FLEX_OBJECT_CACHE_LIFETIME
+              default: 600
+              validate:
+                type: int
+
+            flex.cache.render.enabled:
+              type: toggle
+              label: PLUGIN_ADMIN.FLEX_RENDER_CACHE_ENABLED
+              highlight: 1
+              default: 1
+              options:
+                1: PLUGIN_ADMIN.ENABLED
+                0: PLUGIN_ADMIN.DISABLED
+              validate:
+                type: bool
+
+            flex.cache.render.lifetime:
+              type: text
+              label: PLUGIN_ADMIN.FLEX_RENDER_CACHE_LIFETIME
+              default: 600
+              validate:
+                type: int
+
         twig:
           type: tab
           title: PLUGIN_ADMIN.TWIG_TEMPLATING
@@ -777,7 +864,8 @@ form:
               type: toggle
               label: PLUGIN_ADMIN.AUTOESCAPE_VARIABLES
               help: PLUGIN_ADMIN.AUTOESCAPE_VARIABLES_HELP
-              highlight: 0
+              highlight: 1
+              default: 1
               options:
                 1: PLUGIN_ADMIN.YES
                 0: PLUGIN_ADMIN.NO
@@ -926,6 +1014,17 @@ form:
               validate:
                 type: bool
 
+            assets.enable_asset_sri:
+              type: toggle
+              label: PLUGIN_ADMIN.ENABLED_SRI_ON_ASSETS
+              help: PLUGIN_ADMIN.ENABLED_SRI_ON_ASSETS_HELP
+              highlight: 0
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+
             assets.collections:
               type: multilevel
               label: PLUGIN_ADMIN.COLLECTIONS
@@ -1039,8 +1138,8 @@ form:
 
             debugger.censored:
               type: toggle
-              label: PLUGIN_ADMIN.SHOW_SENSITIVE
-              help: PLUGIN_ADMIN.SHOW_SENSITIVE_HELP
+              label: PLUGIN_ADMIN.DEBUGGER_CENSORED
+              help: PLUGIN_ADMIN.DEBUGGER_CENSORED_HELP
               highlight: 0
               options:
                 1: PLUGIN_ADMIN.YES
@@ -1114,13 +1213,24 @@ form:
               type: toggle
               label: PLUGIN_ADMIN.IMAGES_AUTO_FIX_ORIENTATION
               help: PLUGIN_ADMIN.IMAGES_AUTO_FIX_ORIENTATION_HELP
-              highlight: 0
+              highlight: 1
               options:
                 1: PLUGIN_ADMIN.YES
                 0: PLUGIN_ADMIN.NO
               validate:
                 type: bool
 
+            images.defaults.loading:
+              type: select
+              size: small
+              label: PLUGIN_ADMIN.IMAGES_LOADING
+              help: PLUGIN_ADMIN.IMAGES_LOADING_HELP
+              highlight: auto
+              options:
+                auto: Auto
+                lazy: Lazy
+                eager: Eager
+
             images.seofriendly:
               type: toggle
               label: PLUGIN_ADMIN.IMAGES_SEOFRIENDLY
@@ -1154,7 +1264,6 @@ form:
               validate:
                 type: bool
 
-
             media.allowed_fallback_types:
               type: selectize
               size: large
@@ -1173,6 +1282,45 @@ form:
               validate:
                 type: commalist
 
+            section_images_cls:
+              type: section
+              title: PLUGIN_ADMIN.IMAGES_CLS_TITLE
+              underline: true
+
+            images.cls.auto_sizes:
+              type: toggle
+              label: PLUGIN_ADMIN.IMAGES_CLS_AUTO_SIZES
+              help: PLUGIN_ADMIN.IMAGES_CLS_AUTO_SIZES_HELP
+              highlight: 0
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+
+            images.cls.aspect_ratio:
+              type: toggle
+              label: PLUGIN_ADMIN.IMAGES_CLS_ASPECT_RATIO
+              help: PLUGIN_ADMIN.IMAGES_CLS_ASPECT_RATIO_HELP
+              highlight: 0
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+
+            images.cls.retina_scale:
+              type: select
+              label: PLUGIN_ADMIN.IMAGES_CLS_RETINA_SCALE
+              help: PLUGIN_ADMIN.IMAGES_CLS_RETINA_SCALE_HELP
+              size: small
+              highlight: 1
+              options:
+                1: 1X
+                2: 2X
+                3: 3X
+                4: 4X
+
         session:
           type: tab
           title: PLUGIN_ADMIN.SESSION
@@ -1258,12 +1406,24 @@ form:
               validate:
                 type: bool
 
+            session.domain:
+              type: text
+              size: small
+              label: PLUGIN_ADMIN.SESSION_DOMAIN
+              help: PLUGIN_ADMIN.SESSION_DOMAIN_HELP
+
             session.path:
               type: text
               size: small
               label: PLUGIN_ADMIN.SESSION_PATH
               help: PLUGIN_ADMIN.SESSION_PATH_HELP
 
+            session.samesite:
+              type: text
+              size: small
+              label: PLUGIN_ADMIN.SESSION_SAMESITE
+              help: PLUGIN_ADMIN.SESSION_SAMESITE_HELP
+
             session.split:
               type: toggle
               label: PLUGIN_ADMIN.SESSION_SPLIT
@@ -1432,17 +1592,68 @@ form:
               label: PLUGIN_ADMIN.CUSTOM_BASE_URL
               help: PLUGIN_ADMIN.CUSTOM_BASE_URL_HELP
 
-            accounts.type:
-              type: hidden
+            http_x_forwarded.protocol:
+              type: toggle
+              label: HTTP_X_FORWARDED_PROTO Enabled
+              highlight: 1
+              default: 1
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
 
-            accounts.storage:
-              type: hidden
+            http_x_forwarded.host:
+              type: toggle
+              label: HTTP_X_FORWARDED_HOST Enabled
+              highlight: 0
+              default: 0
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+
+            http_x_forwarded.port:
+              type: toggle
+              label: HTTP_X_FORWARDED_PORT Enabled
+              highlight: 1
+              default: 1
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+
+            http_x_forwarded.ip:
+              type: toggle
+              label: HTTP_X_FORWARDED IP Enabled
+              highlight: 1
+              default: 1
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+
+
+            strict_mode.blueprint_compat:
+              type: toggle
+              label: PLUGIN_ADMIN.STRICT_BLUEPRINT_COMPAT
+              highlight: 0
+              default: 0
+              help: PLUGIN_ADMIN.STRICT_BLUEPRINT_COMPAT_HELP
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
 
             strict_mode.yaml_compat:
               type: toggle
               label: PLUGIN_ADMIN.STRICT_YAML_COMPAT
-              highlight: 1
-              default: 1
+              highlight: 0
+              default: 0
               help: PLUGIN_ADMIN.STRICT_YAML_COMPAT_HELP
               options:
                 1: PLUGIN_ADMIN.YES
@@ -1453,8 +1664,8 @@ form:
             strict_mode.twig_compat:
               type: toggle
               label: PLUGIN_ADMIN.STRICT_TWIG_COMPAT
-              highlight: 1
-              default: 1
+              highlight: 0
+              default: 0
               help: PLUGIN_ADMIN.STRICT_TWIG_COMPAT_HELP
               options:
                 1: PLUGIN_ADMIN.YES
@@ -1472,14 +1683,25 @@ form:
               title: PLUGIN_ADMIN.EXPERIMENTAL
               underline: true
 
+#            flex_pages:
+#              type: section
+#              title: Flex Pages
+#
+#            pages.type:
+#              type: select
+#              label: PLUGIN_ADMIN.PAGES_TYPE
+#              highlight: regular
+#              help: PLUGIN_ADMIN.PAGES_TYPE_HELP
+#              options:
+#                regular: PLUGIN_ADMIN.REGULAR
+#                flex: PLUGIN_ADMIN.FLEX
+
             pages.type:
-              type: select
-              label: PLUGIN_ADMIN.PAGES_TYPE
-              highlight: stable
-              help: PLUGIN_ADMIN.PAGES_TYPE_HELP
-              options:
-                page: PLUGIN_ADMIN.REGULAR
-                flex: PLUGIN_ADMIN.FLEX
+              type: hidden
+
+            flex_accounts:
+              type: section
+              title: Flex Accounts
 
             accounts.type:
               type: select
@@ -1487,7 +1709,7 @@ form:
               highlight: stable
               help: PLUGIN_ADMIN.ACCOUNTS_TYPE_HELP
               options:
-                data: PLUGIN_ADMIN.REGULAR
+                regular: PLUGIN_ADMIN.REGULAR
                 flex: PLUGIN_ADMIN.FLEX
 
             accounts.storage:

system/blueprints/flex/accounts.yaml

@@ -0,0 +1,8 @@
+title: Flex User Accounts
+description: Manage your User Accounts in Flex.
+type: flex-objects
+
+# Deprecated in Grav 1.7.0-rc.4: file was renamed to user-accounts.yaml
+extends@:
+  type: user-accounts
+  context: blueprints://flex

system/blueprints/flex/configure/compat.yaml

@@ -0,0 +1,17 @@
+form:
+  compatibility:
+    type: tab
+    title: Compatibility
+    fields:
+      object.compat.events:
+        type: toggle
+        toggleable: true
+        label: Admin event compatibility
+        help: Enables onAdminSave and onAdminAfterSave events for plugins
+        highlight: 1
+        default: 1
+        options:
+          1: PLUGIN_ADMIN.ENABLED
+          0: PLUGIN_ADMIN.DISABLED
+        validate:
+          type: bool

system/blueprints/flex/pages.yaml

@@ -0,0 +1,212 @@
+title: Pages
+description: Manage your Grav Pages in Flex.
+type: flex-objects
+
+# Extends a page (blueprint gets overridden inside the object)
+extends@:
+  type: default
+  context: blueprints://pages
+
+#
+# HIGHLY SPECIALIZED FLEX TYPE, AVOID USING PAGES AS BASE FOR YOUR OWN TYPE.
+#
+
+# Flex configuration
+config:
+  # Administration Configuration (needs Flex Objects plugin)
+  admin:
+    # Admin router
+    router:
+      path: '/pages'
+
+    # Permissions
+    permissions:
+      # Primary permissions
+      admin.pages:
+        type: crudl
+        label: Pages
+      admin.configuration.pages:
+        type: default
+        label: Pages Configuration
+
+    # Admin menu
+    menu:
+      list:
+        route: '/pages'
+        title: PLUGIN_ADMIN.PAGES
+        icon: fa-file-text
+        authorize: ['admin.pages.list', 'admin.super']
+        priority: 5
+
+    # Admin template type (folder)
+    template: pages
+
+    # Allowed admin actions
+    actions:
+      list: true
+      create: true
+      read: true
+      update: true
+      delete: true
+
+    # List view
+    list:
+      # Fields shown in the list view
+      fields:
+        published:
+          width: 8
+          alias: header.published
+        visible:
+          width: 8
+          field:
+            label: Visible
+            type: toggle
+        menu:
+          link: edit
+          alias: header.menu
+        full_route:
+          field:
+            label: Route
+            type: text
+          link: edit
+          sort:
+            field: key
+        name:
+          width: 8
+          field:
+            label: Type
+            type: text
+        translations:
+          width: 8
+          field:
+            label: Translations
+            type: text
+#        updated_date:
+#          alias: header.update_date
+
+      # Extra options
+      options:
+        # Default number of records for pagination
+        per_page: 20
+        # Default ordering
+        order:
+          by: key
+          dir: asc
+
+      # TODO: not used yet
+      buttons:
+        back:
+          icon: reply
+          title: PLUGIN_ADMIN.BACK
+        add:
+          icon: plus
+          label: PLUGIN_ADMIN.ADD
+
+    edit:
+      title:
+        template: "{% if object.root %}Root <small>( &lt;root&gt; ){% else %}{{ (form.value('header.title') ?? form.value('folder'))|e }} <small>( {{ (object.getRoute().toString(false) ?: '/')|e }} )</small>{% endif %}"
+
+      # TODO: not used yet
+      buttons:
+        back:
+          icon: reply
+          title: PLUGIN_ADMIN.BACK
+        preview:
+          icon: eye
+          title: PLUGIN_ADMIN.PREVIEW
+        add:
+          icon: plus
+          label: PLUGIN_ADMIN.ADD
+        copy:
+          icon: copy
+          label: PLUGIN_ADMIN.COPY
+        move:
+          icon: arrows
+          label: PLUGIN_ADMIN.MOVE
+        delete:
+          icon: close
+          label: PLUGIN_ADMIN.DELETE
+        save:
+          icon: check
+          label: PLUGIN_ADMIN.SAVE
+
+    # Preview View
+    preview:
+      enabled: true
+
+    # Configure view
+    configure:
+      authorize: 'admin.configuration.pages'
+
+  # Site Configuration
+  site:
+    # Hide from flex types
+    hidden: true
+    templates:
+      collection:
+        # Lookup for the template layout files for collections of objects
+        paths:
+          - 'flex/{TYPE}/collection/{LAYOUT}{EXT}'
+      object:
+        # Lookup for the template layout files for objects
+        paths:
+          - 'flex/{TYPE}/object/{LAYOUT}{EXT}'
+      defaults:
+        # Default template {TYPE}; overridden by filename of this blueprint if template folder exists
+        type: pages
+        # Default template {LAYOUT}; can be overridden in render calls (usually Twig in templates)
+        layout: default
+
+    # Default filters for frontend.
+    filter:
+      - withPublished
+
+  # Data Configuration
+  data:
+    object: 'Grav\Common\Flex\Types\Pages\PageObject'
+    collection: 'Grav\Common\Flex\Types\Pages\PageCollection'
+    index: 'Grav\Common\Flex\Types\Pages\PageIndex'
+    storage:
+      class: 'Grav\Common\Flex\Types\Pages\Storage\PageStorage'
+      options:
+        formatter:
+          class: 'Grav\Framework\File\Formatter\MarkdownFormatter'
+        folder: 'page://'
+        # Keep index file in filesystem to speed up lookups
+        indexed: true
+    # Set default ordering of the pages
+    ordering:
+      storage_key: ASC
+    search:
+       # Search options
+      options:
+        contains: 1
+      # Fields to be searched
+      fields:
+        - key
+        - menu
+        - title
+        - name
+
+blueprints:
+  configure:
+    fields:
+      import@:
+        type: configure/compat
+        context: blueprints://flex
+
+# Regular form definition
+form:
+  fields:
+    lang:
+      type: hidden
+      value: ''
+
+    tabs:
+      fields:
+        security:
+          type: tab
+          title: PLUGIN_ADMIN.SECURITY
+          import@:
+            type: partials/security
+            context: blueprints://pages

system/blueprints/flex/shared/configure.yaml

@@ -0,0 +1,70 @@
+form:
+  validation: loose
+
+  fields:
+    tabs:
+      type: tabs
+      fields:
+        cache:
+          type: tab
+          title: Caching
+          fields:
+            object.cache.index.enabled:
+              type: toggle
+              toggleable: true
+              label: PLUGIN_ADMIN.FLEX_INDEX_CACHE_ENABLED
+              highlight: 1
+              config-default@: system.flex.cache.index.enabled
+              options:
+                1: PLUGIN_ADMIN.ENABLED
+                0: PLUGIN_ADMIN.DISABLED
+              validate:
+                type: bool
+
+            object.cache.index.lifetime:
+              type: text
+              toggleable: true
+              label: PLUGIN_ADMIN.FLEX_INDEX_CACHE_LIFETIME
+              config-default@: system.flex.cache.index.lifetime
+              validate:
+                type: int
+
+            object.cache.object.enabled:
+              type: toggle
+              toggleable: true
+              label: PLUGIN_ADMIN.FLEX_OBJECT_CACHE_ENABLED
+              highlight: 1
+              config-default@: system.flex.cache.object.enabled
+              options:
+                1: PLUGIN_ADMIN.ENABLED
+                0: PLUGIN_ADMIN.DISABLED
+              validate:
+                type: bool
+
+            object.cache.object.lifetime:
+              type: text
+              toggleable: true
+              label: PLUGIN_ADMIN.FLEX_OBJECT_CACHE_LIFETIME
+              config-default@: system.flex.cache.object.lifetime
+              validate:
+                type: int
+
+            object.cache.render.enabled:
+              type: toggle
+              toggleable: true
+              label: PLUGIN_ADMIN.FLEX_RENDER_CACHE_ENABLED
+              highlight: 1
+              config-default@: system.flex.cache.render.enabled
+              options:
+                1: PLUGIN_ADMIN.ENABLED
+                0: PLUGIN_ADMIN.DISABLED
+              validate:
+                type: bool
+
+            object.cache.render.lifetime:
+              type: text
+              toggleable: true
+              label: PLUGIN_ADMIN.FLEX_RENDER_CACHE_LIFETIME
+              config-default@: system.flex.cache.render.lifetime
+              validate:
+                type: int

system/blueprints/flex/user-accounts.yaml

@@ -0,0 +1,142 @@
+title: User Accounts
+description: Manage your User Accounts in Flex.
+type: flex-objects
+
+# Extends user account
+extends@:
+  type: account
+  context: blueprints://user
+
+#
+# HIGHLY SPECIALIZED FLEX TYPE, AVOID USING USER ACCOUNTS AS BASE FOR YOUR OWN TYPE.
+#
+
+# Flex configuration
+config:
+  # Administration Configuration (needs Flex Objects plugin)
+  admin:
+    # Admin router
+    router:
+      path: '/accounts/users'
+      actions:
+        configure:
+          path: '/accounts/configure'
+      redirects:
+        '/user': '/accounts/users'
+        '/accounts': '/accounts/users'
+
+    # Permissions
+    permissions:
+      # Primary permissions
+      admin.users:
+        type: crudl
+        label: User Accounts
+      admin.configuration.users:
+        type: default
+        label: Accounts Configuration
+
+    # Admin menu
+    menu:
+      base:
+        location: '/accounts'
+        route: '/accounts/users'
+        index: 0
+        title: PLUGIN_ADMIN.ACCOUNTS
+        icon: fa-users
+        authorize: ['admin.users.list', 'admin.super']
+        priority: 6
+
+    # Admin template type (folder)
+    template: user-accounts
+
+    # List view
+    list:
+      # Fields shown in the list view
+      fields:
+        username:
+          link: edit
+          search: true
+          field:
+            label: PLUGIN_ADMIN.USERNAME
+        email:
+          search: true
+        fullname:
+          search: true
+      # Extra options
+      options:
+        per_page: 20
+        order:
+          by: username
+          dir: asc
+
+    # Edit view
+    edit:
+      title:
+        template: "{{ form.value('fullname') ?? form.value('username') }} <{{ form.value('email') }}>"
+
+    # Configure view
+    configure:
+      hidden: true
+      authorize: 'admin.configuration.users'
+      form: 'accounts'
+      title:
+        template: "{{ 'PLUGIN_ADMIN.ACCOUNTS'|tu }} {{ 'PLUGIN_ADMIN.CONFIGURATION'|tu }}"
+
+  # Site Configuration
+  site:
+    # Hide from flex types
+    hidden: true
+    templates:
+      collection:
+        # Lookup for the template layout files for collections of objects
+        paths:
+          - 'flex/{TYPE}/collection/{LAYOUT}{EXT}'
+      object:
+        # Lookup for the template layout files for objects
+        paths:
+          - 'flex/{TYPE}/object/{LAYOUT}{EXT}'
+      defaults:
+        # Default template {TYPE}; overridden by filename of this blueprint if template folder exists
+        type: user-accounts
+        # Default template {LAYOUT}; can be overridden in render calls (usually Twig in templates)
+        layout: default
+
+  # Data Configuration
+  data:
+    object: 'Grav\Common\Flex\Types\Users\UserObject'
+    collection: 'Grav\Common\Flex\Types\Users\UserCollection'
+    index: 'Grav\Common\Flex\Types\Users\UserIndex'
+    storage:
+      class: 'Grav\Common\Flex\Types\Users\Storage\UserFileStorage'
+      options:
+        formatter:
+          class: 'Grav\Framework\File\Formatter\YamlFormatter'
+        folder: 'account://'
+        pattern: '{FOLDER}/{KEY}{EXT}'
+        indexed: true
+        key: username
+        case_sensitive: false
+    search:
+      options:
+        contains: 1
+      fields:
+        - key
+        - email
+
+blueprints:
+  configure:
+    fields:
+      import@:
+        type: configure/compat
+        context: blueprints://flex
+
+# Regular form definition
+form:
+  fields:
+    username:
+      flex-disabled@: exists
+      disabled: false
+      flex-readonly@: exists
+      readonly: false
+      validate:
+        required: true

system/blueprints/flex/user-groups.yaml

@@ -0,0 +1,122 @@
+title: User Groups
+description: Manage your User Groups in Flex.
+type: flex-objects
+
+# Extends user group
+extends@:
+  type: group
+  context: blueprints://user
+
+# Flex configuration
+config:
+  # Administration Configuration (needs Flex Objects plugin)
+  admin:
+    # Admin router
+    router:
+      path: '/accounts/groups'
+      actions:
+        configure:
+          path: '/accounts/configure'
+      redirects:
+        '/accounts': '/accounts/groups'
+
+    # Permissions
+    permissions:
+      # Primary permissions
+      admin.users:
+        type: crudl
+        label: User Accounts
+      admin.configuration.users:
+        type: default
+        label: Accounts Configuration
+
+    # Admin menu
+    menu:
+      base:
+        location: '/accounts'
+        route: '/accounts/groups'
+        index: 1
+        title: PLUGIN_ADMIN.ACCOUNTS
+        icon: fa-users
+        authorize: ['admin.users.list', 'admin.super']
+        priority: 6
+
+    # Admin template type (folder)
+    template: user-groups
+
+    # List view
+    list:
+      # Fields shown in the list view
+      fields:
+        groupname:
+          link: edit
+          search: true
+        readableName:
+          search: true
+        description:
+          search: true
+      # Extra options
+      options:
+        per_page: 20
+        order:
+          by: groupname
+          dir: asc
+
+    # Edit view
+    edit:
+      title:
+        template: "{{ form.value('readableName') ?? form.value('groupname') }}"
+
+    # Configure view
+    configure:
+      hidden: true
+      authorize: 'admin.configuration.users'
+      form: 'accounts'
+      title:
+        template: "{{ 'PLUGIN_ADMIN.ACCOUNTS'|tu }} {{ 'PLUGIN_ADMIN.CONFIGURATION'|tu }}"
+
+  # Site Configuration
+  site:
+    # Hide from flex types
+    hidden: true
+    templates:
+      collection:
+        # Lookup for the template layout files for collections of objects
+        paths:
+          - 'flex/{TYPE}/collection/{LAYOUT}{EXT}'
+      object:
+        # Lookup for the template layout files for objects
+        paths:
+          - 'flex/{TYPE}/object/{LAYOUT}{EXT}'
+      defaults:
+        # Default template {TYPE}; overridden by filename of this blueprint if template folder exists
+        type: user-groups
+        # Default template {LAYOUT}; can be overridden in render calls (usually Twig in templates)
+        layout: default
+
+  # Data Configuration
+  data:
+    object: 'Grav\Common\Flex\Types\UserGroups\UserGroupObject'
+    collection: 'Grav\Common\Flex\Types\UserGroups\UserGroupCollection'
+    index: 'Grav\Common\Flex\Types\UserGroups\UserGroupIndex'
+    storage:
+      class: 'Grav\Framework\Flex\Storage\SimpleStorage'
+      options:
+        formatter:
+          class: 'Grav\Framework\File\Formatter\YamlFormatter'
+        folder: 'user://config/groups.yaml'
+        key: groupname
+    search:
+      options:
+        contains: 1
+      fields:
+        - key
+        - groupname
+        - description
+
+blueprints:
+  configure:
+    fields:
+      import@:
+        type: configure/compat
+        context: blueprints://flex

system/blueprints/pages/modular.yaml

@@ -1,4 +1,4 @@
-title: PLUGIN_ADMIN.MODULAR
+title: PLUGIN_ADMIN.MODULE
 extends@: default
 
 form:
@@ -13,7 +13,7 @@ form:
 
             modular_title:
               type: spacer
-              title: PLUGIN_ADMIN.MODULAR_SETUP
+              title: PLUGIN_ADMIN.MODULE_SETUP
 
             header.content.items:
               type: text
@@ -34,5 +34,3 @@ form:
               help: '"desc" or "asc" are valid values'
               placeholder: desc
               size: small
-
-

system/blueprints/pages/partials/security.yaml

@@ -0,0 +1,71 @@
+form:
+  fields:
+    _site:
+      type: section
+      title: PLUGIN_ADMIN.PAGE_ACCESS
+      underline: true
+
+      fields:
+
+        header.login.visibility_requires_access:
+          type: toggle
+          toggleable: true
+          label: PLUGIN_ADMIN.PAGE_VISIBILITY_REQUIRES_ACCESS
+          help: PLUGIN_ADMIN.PAGE_VISIBILITY_REQUIRES_ACCESS_HELP
+          highlight: 0
+          options:
+            1: PLUGIN_ADMIN.YES
+            0: PLUGIN_ADMIN.NO
+          validate:
+            type: bool
+
+
+        header.access:
+          type: acl_picker
+          label: PLUGIN_ADMIN.PAGE_ACCESS
+          help: PLUGIN_ADMIN.PAGE_ACCESS_HELP
+          ignore_empty: true
+          data_type: access
+          validate:
+            type: array
+            value_type: bool
+
+    _admin:
+      security@: {or: [admin.super, admin.configuration.pages]}
+      type: section
+      title: PLUGIN_ADMIN.PAGE PERMISSIONS
+      underline: true
+
+      fields:
+
+        header.permissions.inherit:
+          type: toggle
+          toggleable: true
+          label: PLUGIN_ADMIN.PAGE_INHERIT_PERMISSIONS
+          help: PLUGIN_ADMIN.PAGE_INHERIT_PERMISSIONS_HELP
+          highlight: 1
+          options:
+            1: PLUGIN_ADMIN.YES
+            0: PLUGIN_ADMIN.NO
+          validate:
+            type: bool
+
+        header.permissions.authors:
+          type: list
+          toggleable: true
+          label: PLUGIN_ADMIN.PAGE_AUTHORS
+          help: PLUGIN_ADMIN.PAGE_AUTHORS_HELP
+
+          fields:
+            value:
+              type: text
+              placeholder: PLUGIN_ADMIN.USERNAME
+              style: vertical
+
+        header.permissions.groups:
+          ignore@: true
+          type: acl_picker
+          label: PLUGIN_ADMIN.PAGE_GROUPS
+          help: PLUGIN_ADMIN.PAGE_GROUPS_HELP
+          ignore_empty: true
+          data_type: permissions

system/blueprints/pages/root.yaml

@@ -0,0 +1,16 @@
+title: PLUGIN_ADMIN.ROOT
+
+rules:
+  slug:
+    pattern: '[a-zA-Zа-яA-Я0-9_\-]+'
+    min: 1
+    max: 200
+
+form:
+  validation: loose
+
+  fields:
+
+    tabs:
+      type: tabs
+      active: 1

system/blueprints/user/account.yaml

@@ -67,6 +67,15 @@ form:
             default: 'en'
             help: PLUGIN_ADMIN.LANGUAGE_HELP
 
+        content_editor:
+            type: select
+            label: PLUGIN_ADMIN.CONTENT_EDITOR
+            size: medium
+            classes: fancy
+            data-options@: 'Grav\Plugin\Admin\Admin::contentEditor'
+            default: 'default'
+            help: PLUGIN_ADMIN.CONTENT_EDITOR_HELP
+
         twofa_check:
             type: conditional
             condition: config.plugins.admin.twofa_enabled
@@ -99,6 +108,8 @@ form:
                     sublabel: PLUGIN_ADMIN.2FA_SECRET_HELP
 
 
+
+
         security:
             security@: admin.super
             title: PLUGIN_ADMIN.ACCESS_LEVELS
@@ -121,7 +132,9 @@ form:
                 access:
                     security@: admin.super
                     type: permissions
+                    check_authorize: true
                     label: PLUGIN_ADMIN.PERMISSIONS
                     ignore_empty: true
                     validate:
                         type: array
+                        value_type: bool

system/blueprints/user/account_new.yaml

@@ -13,6 +13,6 @@ form:
       label: PLUGIN_ADMIN.USERNAME
       help: PLUGIN_ADMIN.USERNAME_HELP
       unset-disabled@: true
-      unset-readonly@: true
+      unset-readonly@: true
       validate:
         required: true

system/blueprints/user/accounts.yaml

@@ -1,40 +0,0 @@
-title: User Accounts
-description: User Accounts
-type: flex-objects
-
-extends@: 'user/account'
-
-config:
-  admin:
-    list:
-      fields:
-        username:
-          link: edit
-          search: true
-        email:
-          search: true
-        fullname:
-          search: true
-      options:
-        per_page: 20
-        order:
-          by: username
-          dir: asc
-
-    menu:
-      list:
-        route: '/accounts'
-        title: Accounts
-        icon: fa-users
-        authorize: ['admin.users', 'admin.accounts', 'admin.super']
-        priority: 6
-
-form:
-  fields:
-    username:
-      flex-disabled@: exists
-      disabled: false
-      flex-readonly@: exists
-      readonly: false
-      validate:
-        required: true

system/blueprints/user/group.yaml

@@ -1,37 +1,55 @@
 title: Group
+rules:
+  slug:
+    pattern: '[a-zA-Zа-яA-Я0-9_\-]+'
+    min: 1
+    max: 200
+
 form:
-    validation: loose
+  validation: loose
 
-    fields:
-        spacer:
-            type: spacer
-            text: '<br>'
+  fields:
+    groupname:
+      type: text
+      size: large
+      label: PLUGIN_ADMIN.GROUP_NAME
+      flex-disabled@: exists
+      flex-readonly@: exists
+      validate:
+        required: true
+        rule: slug
 
-        groupname:
-            type: text
-            size: large
-            label: PLUGIN_ADMIN.NAME
-            disabled: true
-            readonly: true
+    readableName:
+      type: text
+      size: large
+      label: PLUGIN_ADMIN.DISPLAY_NAME
 
-        readableName:
-            type: text
-            size: large
-            label: PLUGIN_ADMIN_PRO.READABLE_NAME
+    description:
+      type: text
+      size: large
+      label: PLUGIN_ADMIN.DESCRIPTION
 
-        description:
-            type: text
-            size: large
-            label: PLUGIN_ADMIN.DESCRIPTION
+    icon:
+      type: text
+      size: small
+      label: PLUGIN_ADMIN.ICON
 
-        icon:
-            type: text
-            size: small
-            label: PLUGIN_ADMIN_PRO.ICON
+    enabled:
+      type: toggle
+      label: PLUGIN_ADMIN.ENABLED
+      highlight: 1
+      default: 1
+      options:
+        1: PLUGIN_ADMIN.YES
+        0: PLUGIN_ADMIN.NO
+      validate:
+        type: bool
 
-        access:
-            type: permissions
-            label: PLUGIN_ADMIN.PERMISSIONS
-            ignore_empty: true
-            validate:
-                type: array
+    access:
+      type: permissions
+      check_authorize: false
+      label: PLUGIN_ADMIN.PERMISSIONS
+      ignore_empty: true
+      validate:
+        type: array
+        value_type: bool

system/blueprints/user/group_new.yaml

@@ -1,5 +1,11 @@
 title: PLUGIN_ADMIN_PRO.ADD_GROUP
 
+rules:
+  slug:
+    pattern: '[a-zA-Zа-яA-Я0-9_\-]+'
+    min: 1
+    max: 200
+
 form:
   validation: loose
   fields:
@@ -14,3 +20,4 @@ form:
       help: PLUGIN_ADMIN_PRO.GROUP_NAME_HELP
       validate:
         required: true
+        rule: slug

system/config/media.yaml

@@ -24,6 +24,10 @@ types:
     type: image
     thumb: media/thumb-png.png
     mime: image/png
+  webp:
+    type: image
+    thumb: media/thumb-webp.png
+    mime: image/webp
   gif:
     type: animated
     thumb: media/thumb-gif.png
@@ -103,7 +107,7 @@ types:
   docx:
     type: file
     thumb: media/thumb-docx.png
-    mime: application/msword
+    mime: application/vnd.openxmlformats-officedocument.wordprocessingml.document
   xls:
     type: file
     thumb: media/thumb-xls.png
@@ -111,7 +115,7 @@ types:
   xlsx:
     type: file
     thumb: media/thumb-xlsx.png
-    mime: application/vnd.ms-excel
+    mime: application/vnd.openxmlformats-officedocument.spreadsheetml.sheet
   ppt:
     type: file
     thumb: media/thumb-ppt.png
@@ -119,7 +123,7 @@ types:
   pptx:
     type: file
     thumb: media/thumb-pptx.png
-    mime: application/vnd.ms-powerpoint
+    mime: application/vnd.openxmlformats-officedocument.presentationml.presentation
   pps:
     type: file
     thumb: media/thumb-pps.png

system/config/permissions.yaml

@@ -0,0 +1,53 @@
+actions:
+  site:
+    type: access
+    label: Site
+  admin:
+    type: access
+    label: Admin
+  admin.pages:
+    type: access
+    label: Pages
+  admin.users:
+    type: access
+    label: User Accounts
+
+types:
+  default:
+    type: access
+
+  crud:
+    type: compact
+    letters:
+      c:
+        action: create
+        label: PLUGIN_ADMIN.CREATE
+      r:
+        action: read
+        label: PLUGIN_ADMIN.READ
+      u:
+        action: update
+        label: PLUGIN_ADMIN.UPDATE
+      d:
+        action: delete
+        label: PLUGIN_ADMIN.DELETE
+
+  crudp:
+    type: crud
+    letters:
+      p:
+        action: publish
+        label: PLUGIN_ADMIN.PUBLISH
+
+  crudl:
+    type: crud
+    letters:
+      l:
+        action: list
+        label: PLUGIN_ADMIN.LIST
+
+  crudpl:
+    type: crud
+    use:
+      - crudp
+      - crudl

system/config/security.yaml

@@ -36,3 +36,4 @@ uploads_dangerous_extensions:
     - htm
     - js
     - exe
+sanitize_svg: true

system/config/streams.yaml

@@ -1,16 +0,0 @@
-schemes:
-  image:
-    type: Stream
-    paths:
-      - user://images
-      - system://images
-
-  page:
-    type: ReadOnlyStream
-    paths:
-      - user://pages
-
-  account:
-    type: ReadOnlyStream
-    paths:
-      - user://accounts

system/config/system.yaml

@@ -10,24 +10,31 @@ custom_base_url: ''                              # Set the base_url manually, e.
 username_regex: '^[a-z0-9_-]{3,16}$'             # Only lowercase chars, digits, dashes, underscores. 3 - 16 chars
 pwd_regex: '(?=.*\d)(?=.*[a-z])(?=.*[A-Z]).{8,}' # At least one number, one uppercase and lowercase letter, and be at least 8+ chars
 intl_enabled: true                               # Special logic for PHP International Extension (mod_intl)
+http_x_forwarded:                                # Configuration options for the various HTTP_X_FORWARD headers
+  protocol: true
+  host: false
+  port: true
+  ip: true
 
 languages:
   supported: []                                  # List of languages supported. eg: [en, fr, de]
   default_lang:                                  # Default is the first supported language. Must be one of the supported languages
   include_default_lang: true                     # Include the default lang prefix in all URLs
-  pages_fallback_only: false                     # Only fallback to find page content through supported languages
-  translations: true                             # Enable translations by default
+  include_default_lang_file_extension: true      # If true, include language code for the default language in file extension: default.en.md
+  translations: true                             # If false, translation keys are used instead of translated strings
   translations_fallback: true                    # Fallback through supported translations if active lang doesn't exist
   session_store_active: false                    # Store active language in session
   http_accept_language: false                    # Attempt to set the language based on http_accept_language header in the browser
   override_locale: false                         # Override the default or system locale with language specific one
+  content_fallback: {}                           # Custom language fallbacks. eg: {fr: ['fr', 'en']}
+  pages_fallback_only: false                     # DEPRECATED: Use `content_fallback` instead
 
 home:
   alias: '/home'                                 # Default path for home, ie /
   hide_in_urls: false                            # Hide the home route in URLs
 
 pages:
-  type: page                                     # EXPERIMENTAL: Page type: page or flex
+  type: regular                                  # EXPERIMENTAL: Page type: regular or flex
   theme: quark                                   # Default theme (defaults to "quark" theme)
   order:
     by: default                                  # Order pages by "default", "alpha" or "date"
@@ -55,16 +62,22 @@ pages:
     special_chars:                               # List of special characters to automatically convert to entities
       '>': 'gt'
       '<': 'lt'
+    valid_link_attributes:                       # Valid attributes to pass through via markdown links
+      - rel
+      - target
+      - id
+      - class
+      - classes
   types: [html,htm,xml,txt,json,rss,atom]        # list of valid page types
   append_url_extension: ''                       # Append page's extension in Page urls (e.g. '.html' results in /path/page.html)
   expires: 604800                                # Page expires time in seconds (604800 seconds = 7 days)
   cache_control:                                 # Can be blank for no setting, or a valid `cache-control` text value
   last_modified: false                           # Set the last modified date header based on file modification timestamp
-  etag: false                                    # Set the etag header tag
+  etag: true                                     # Set the etag header tag
   vary_accept_encoding: false                    # Add `Vary: Accept-Encoding` header
-  redirect_default_route: false                  # Automatically redirect to a page's default route
-  redirect_default_code: 302                     # Default code to use for redirects
-  redirect_trailing_slash: true                  # Handle automatically or 302 redirect a trailing / URL
+  redirect_default_code: 302                     # Default code to use for redirects: 301|302|303
+  redirect_trailing_slash: 1                     # Always redirect trailing slash with redirect code 0|1|301|302 (0: no redirect, 1: use default code)
+  redirect_default_route: 0                      # Always redirect to page's default route using code 0|1|301|302, also removes .htm and .html extensions
   ignore_files: [.DS_Store]                      # Files to ignore in Pages
   ignore_folders: [.git, .idea]                  # Folders to ignore in Pages
   ignore_hidden: true                            # Ignore all Hidden files and folders
@@ -90,12 +103,14 @@ cache:
   allow_webserver_gzip: false                    # If true, `content-encoding: identity` but connection isn't closed before `onShutDown()` event
   redis:
     socket: false                                # Path to redis unix socket (e.g. /var/run/redis/redis.sock), false = use server and port to connect
+    password:                                    # Optional password
+    database:                                    # Optional database ID
 
 twig:
   cache: true                                    # Set to true to enable Twig caching
   debug: true                                    # Enable Twig debug
   auto_reload: true                              # Refresh cache on changes
-  autoescape: false                              # Autoescape Twig vars (DEPRECATED, always enabled in strict mode)
+  autoescape: true                               # Autoescape Twig vars (DEPRECATED, always enabled in strict mode)
   undefined_functions: true                      # Allow undefined functions
   undefined_filters: true                        # Allow undefined filters
   umask_fix: false                               # By default Twig creates cached files as 755, fix switches this to 775
@@ -112,6 +127,7 @@ assets:                                          # Configuration for Assets Mana
   js_pipeline_before_excludes: true              # Render the pipeline before any excluded files
   js_minify: true                                # Minify the JS during pipelining
   enable_asset_timestamp: false                  # Enable asset timestamps
+  enable_asset_sri: false                        # Enable asset SRI
   collections:
     jquery: system://assets/jquery/jquery-2.x.min.js
 
@@ -136,8 +152,14 @@ images:
   cache_all: false                               # Cache all image by default
   cache_perms: '0755'                            # MUST BE IN QUOTES!! Default cache folder perms. Usually '0755' or '0775'
   debug: false                                   # Show an overlay over images indicating the pixel depth of the image when working with retina for example
-  auto_fix_orientation: false                    # Automatically fix the image orientation based on the Exif data
+  auto_fix_orientation: true                     # Automatically fix the image orientation based on the Exif data
   seofriendly: false                             # SEO-friendly processed image names
+  cls:                                           # Cumulative Layout Shift: See https://web.dev/optimize-cls/
+    auto_sizes: false                            # Automatically add height/width to image
+    aspect_ratio: false                          # Reserve space with aspect ratio style
+    retina_scale: 1                              # scale to adjust auto-sizes for better handling of HiDPI resolutions
+  defaults:
+    loading: auto                                # Let browser pick [auto|lazy|eager]
 
 media:
   enable_media_timestamp: false                  # Enable media timestamps
@@ -153,20 +175,35 @@ session:
   uniqueness: path                               # Should sessions be `path` based or `security.salt` based
   secure: false                                  # Set session secure. If true, indicates that communication for this cookie must be over an encrypted transmission. Enable this only on sites that run exclusively on HTTPS
   httponly: true                                 # Set session HTTP only. If true, indicates that cookies should be used only over HTTP, and JavaScript modification is not allowed.
+  samesite: Lax                                  # Set session SameSite. Possible values are Lax, Strict and None. See https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Set-Cookie/SameSite
   split: true                                    # Sessions should be independent between site and plugins (such as admin)
-  path:
+  domain:                                        # Domain used by sessions.
+  path:                                          # Path used by sessions.
 
 gpm:
-  releases: testing                              # Set to either 'stable' or 'testing'
+  releases: stable                               # Set to either 'stable' or 'testing'
   proxy_url:                                     # Configure a manual proxy URL for GPM (eg 127.0.0.1:3128)
   method: 'auto'                                 # Either 'curl', 'fopen' or 'auto'. 'auto' will try fopen first and if not available cURL
   verify_peer: true                              # Sometimes on some systems (Windows most commonly) GPM is unable to connect because the SSL certificate cannot be verified. Disabling this setting might help.
   official_gpm_only: true                        # By default GPM direct-install will only allow URLs via the official GPM proxy to ensure security
 
 accounts:
-  type: data                                     # EXPERIMENTAL: Account type: data or flex
+  type: regular                                  # EXPERIMENTAL: Account type: regular or flex
   storage: file                                  # EXPERIMENTAL: Flex storage type: file or folder
 
+flex:
+  cache:
+    index:
+      enabled: true                             # Set to true to enable Flex index caching. Is used to cache timestamps in files
+      lifetime: 60                              # Lifetime of cached index in seconds (0 = infinite)
+    object:
+      enabled: true                             # Set to true to enable Flex object caching. Is used to cache object data
+      lifetime: 600                             # Lifetime of cached objects in seconds (0 = infinite)
+    render:
+      enabled: true                             # Set to true to enable Flex render caching. Is used to cache rendered output
+      lifetime: 600                             # Lifetime of cached HTML in seconds (0 = infinite)
+
 strict_mode:
-  yaml_compat: true                              # Grav 1.5+: Enables YAML backwards compatibility
-  twig_compat: true                              # Grav 1.5+: Enables deprecated Twig autoescape setting (autoescape: false)
+  yaml_compat: false                            # Set to true to enable YAML backwards compatibility
+  twig_compat: false                            # Set to true to enable deprecated Twig settings (autoescape: false)
+  blueprint_compat: false                       # Set to true to enable backward compatible strict support for blueprints

system/defines.php

@@ -2,41 +2,78 @@
 /**
  * @package    Grav\Core
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2021 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 // Some standard defines
 define('GRAV', true);
-define('GRAV_VERSION', '1.7.0-beta.7');
-define('GRAV_TESTING', true);
-define('DS', '/');
+define('GRAV_VERSION', '1.7.10');
+define('GRAV_SCHEMA', '1.7.0_2020-11-20_1');
+define('GRAV_TESTING', false);
 
+// PHP minimum requirement
 if (!defined('GRAV_PHP_MIN')) {
-    define('GRAV_PHP_MIN', '7.1.3');
+    define('GRAV_PHP_MIN', '7.3.6');
+}
+
+// Directory separator
+if (!defined('DS')) {
+    define('DS', '/');
 }
 
 // Directories and Paths
 if (!defined('GRAV_ROOT')) {
-    define('GRAV_ROOT', str_replace(DIRECTORY_SEPARATOR, DS, getcwd()));
+    $path = rtrim(str_replace(DIRECTORY_SEPARATOR, DS, getenv('GRAV_ROOT') ?: getcwd()), DS);
+    define('GRAV_ROOT', $path);
 }
-define('ROOT_DIR', GRAV_ROOT . '/');
-define('USER_PATH', 'user/');
-define('USER_DIR', ROOT_DIR . USER_PATH);
-define('CACHE_DIR', ROOT_DIR . 'cache/');
+if (!defined('GRAV_WEBROOT')) {
+    define('GRAV_WEBROOT', GRAV_ROOT);
+}
+if (!defined('GRAV_USER_PATH')) {
+    $path = rtrim(getenv('GRAV_USER_PATH') ?: 'user', DS);
+    define('GRAV_USER_PATH', $path);
+}
+if (!defined('GRAV_SYSTEM_PATH')) {
+    $path = rtrim(getenv('GRAV_SYSTEM_PATH') ?: 'system', DS);
+    define('GRAV_SYSTEM_PATH', $path);
+}
+if (!defined('GRAV_CACHE_PATH')) {
+    $path = rtrim(getenv('GRAV_CACHE_PATH') ?: 'cache', DS);
+    define('GRAV_CACHE_PATH', $path);
+}
+if (!defined('GRAV_LOG_PATH')) {
+    $path = rtrim(getenv('GRAV_LOG_PATH') ?: 'logs', DS);
+    define('GRAV_LOG_PATH', $path);
+}
+if (!defined('GRAV_TMP_PATH')) {
+    $path = rtrim(getenv('GRAV_TMP_PATH') ?: 'tmp', DS);
+    define('GRAV_TMP_PATH', $path);
+}
+if (!defined('GRAV_BACKUP_PATH')) {
+    $path = rtrim(getenv('GRAV_BACKUP_PATH') ?: 'backup', DS);
+    define('GRAV_BACKUP_PATH', $path);
+}
+unset($path);
+
+define('USER_PATH', GRAV_USER_PATH . DS);
+define('CACHE_PATH', GRAV_CACHE_PATH . DS);
+define('ROOT_DIR', GRAV_ROOT . DS);
+define('USER_DIR', (!str_starts_with(USER_PATH, '/') ? GRAV_WEBROOT . '/' : '') . USER_PATH);
+define('CACHE_DIR', (!str_starts_with(CACHE_PATH, '/') ? ROOT_DIR : '') . CACHE_PATH);
 
 // DEPRECATED: Do not use!
-define('ASSETS_DIR', ROOT_DIR . 'assets/');
-define('IMAGES_DIR', ROOT_DIR . 'images/');
+define('ASSETS_DIR', GRAV_WEBROOT . '/assets/');
+define('IMAGES_DIR', GRAV_WEBROOT . '/images/');
 define('ACCOUNTS_DIR', USER_DIR .'accounts/');
 define('PAGES_DIR', USER_DIR .'pages/');
 define('DATA_DIR', USER_DIR .'data/');
-define('SYSTEM_DIR', ROOT_DIR .'system/');
-define('LIB_DIR', SYSTEM_DIR .'src/');
 define('PLUGINS_DIR', USER_DIR .'plugins/');
 define('THEMES_DIR', USER_DIR .'themes/');
+define('SYSTEM_DIR', (!str_starts_with(GRAV_SYSTEM_PATH, '/') ? ROOT_DIR : '') . GRAV_SYSTEM_PATH);
+define('LIB_DIR', SYSTEM_DIR .'src/');
 define('VENDOR_DIR', ROOT_DIR .'vendor/');
-define('LOG_DIR', ROOT_DIR .'logs/');
+define('LOG_DIR', (!str_starts_with(GRAV_LOG_PATH, '/') ? ROOT_DIR : '') . GRAV_LOG_PATH . DS);
 // END DEPRECATED
 
 // Some extensions

system/install.php

@@ -2,7 +2,7 @@
 /**
  * @package    Grav\Core
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2021 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -10,8 +10,6 @@ if (!defined('GRAV_ROOT')) {
     die();
 }
 
-use Grav\Installer\Install;
-
 require_once __DIR__ . '/src/Grav/Installer/Install.php';
 
-return Install::instance();
+return Grav\Installer\Install::instance();

system/languages/ar.yaml

@@ -1,6 +1,17 @@
 ---
 GRAV:
   FRONTMATTER_ERROR_PAGE: "---\nالعنوان: %1$s\n---\n# خطأ: مادة أمامية غير صحيحة\n\nمسار: '%2$s'\n\n**%3$s**\n\n, , ,\n\n%4$s\n, , ,"
+  INFLECTOR_UNCOUNTABLE:
+    - 'معدّات'
+    - 'معلومات'
+    - 'أرز'
+    - 'مال'
+    - 'نوع'
+    - 'سلسلة'
+    - 'سمك'
+    - 'خروف'
+  INFLECTOR_IRREGULAR:
+    'person': 'أشخاص'
   NICETIME:
     NO_DATE_PROVIDED: لم يتم تقديم التاريخ
     BAD_DATE: تاريخ خاطئ
@@ -37,8 +48,8 @@ GRAV:
     YR_PLURAL: سنوات
     DEC_PLURAL: عقود
   FORM:
-    VALIDATION_FAIL: <b>فشل التحقق من صحة:</b>
-    INVALID_INPUT: إدخال غير صحيح في
+    VALIDATION_FAIL: '<b>فشل التحقق من صحة:</b>'
+    INVALID_INPUT: 'إدخال غير صحيح في'
     MISSING_REQUIRED_FIELD: 'حقل مطلوب مفقود:'
   MONTHS_OF_THE_YEAR:
     - 'كانون الثاني'
@@ -61,3 +72,11 @@ GRAV:
     - 'الجمعة'
     - 'السبت'
     - 'الأحد'
+  CRON:
+    EVERY: كل
+    EVERY_HOUR: كل ساعة
+    EVERY_MINUTE: كل دقيقة
+    EVERY_DAY_OF_WEEK: كل يوم في الأسبوع
+    EVERY_DAY_OF_MONTH: كل يوم في الشهر
+    EVERY_MONTH: ' كل شهر'
+    TEXT_PERIOD: كل <b />

system/languages/bg.yaml

@@ -36,8 +36,8 @@ GRAV:
     YR_PLURAL: г
     DEC_PLURAL: дстлт
   FORM:
-    VALIDATION_FAIL: <b>Неуспешна проверка:</b>
-    INVALID_INPUT: Невалидно въвеждане в
+    VALIDATION_FAIL: '<b>Неуспешна проверка:</b>'
+    INVALID_INPUT: 'Невалидно въвеждане в'
     MISSING_REQUIRED_FIELD: 'Липсва задължително поле:'
   MONTHS_OF_THE_YEAR:
     - 'януари'

system/languages/ca.yaml

@@ -1,6 +1,15 @@
 ---
 GRAV:
   FRONTMATTER_ERROR_PAGE: "---\ntitle: %1$s\n---\n\n# S'ha produït un error: Frontmatter invàlid\n\nRuta: `%2$s`\n\n**%3$s**\n\n```\n%4$s\n```"
+  INFLECTOR_UNCOUNTABLE:
+    - 'equipment'
+    - 'informació'
+    - 'rice'
+    - 'money'
+    - 'species'
+    - 'series'
+    - 'fish'
+    - 'sheep'
   NICETIME:
     NO_DATE_PROVIDED: No s'ha proporcionat data
     BAD_DATE: Data invàlida
@@ -36,8 +45,8 @@ GRAV:
     YR_PLURAL: anys
     DEC_PLURAL: dèc.
   FORM:
-    VALIDATION_FAIL: <b>Ha fallat la validació:</b>
-    INVALID_INPUT: Entrada no vàlida a
+    VALIDATION_FAIL: '<b>Ha fallat la validació:</b>'
+    INVALID_INPUT: 'Entrada no vàlida a'
     MISSING_REQUIRED_FIELD: 'Falta camp obligatori:'
   MONTHS_OF_THE_YEAR:
     - 'Gener'

system/languages/cs.yaml

@@ -101,9 +101,10 @@ GRAV:
     YR_PLURAL: r
     DEC_PLURAL: dek
   FORM:
-    VALIDATION_FAIL: <b>Ověření se nezdařilo:</b>
-    INVALID_INPUT: Neplatný vstup v
+    VALIDATION_FAIL: '<b>Ověření se nezdařilo:</b>'
+    INVALID_INPUT: 'Neplatný vstup v'
     MISSING_REQUIRED_FIELD: 'Chybí požadované pole:'
+    XSS_ISSUES: "Byly zjištěny možné problémy XSS v poli '%s'"
   MONTHS_OF_THE_YEAR:
     - 'leden'
     - 'únor'
@@ -125,6 +126,8 @@ GRAV:
     - 'pátek'
     - 'sobota'
     - 'neděle'
+  YES: "Ano"
+  NO: "Ne"
   CRON:
     EVERY: každý
     EVERY_HOUR: každou hodinu

system/languages/da.yaml

@@ -1,11 +1,27 @@
 ---
 GRAV:
   FRONTMATTER_ERROR_PAGE: "---\nTitel: %1$s\n---\n\n# Fejl: Ugyldigt frontmatter\n\nSti: `%2$s`\n\n**%3$s**\n\n```\n%4$s\n```"
+  INFLECTOR_UNCOUNTABLE:
+    - 'udstyr'
+    - 'information'
+    - 'ris'
+    - 'penge'
+    - 'arter'
+    - 'Serier'
+    - 'fisk'
+    - 'får'
+  INFLECTOR_IRREGULAR:
+    'person': 'personer'
+    'man': 'mænd'
+    'child': 'børn'
+    'sex': 'køn'
+    'move': 'flyt'
   NICETIME:
     NO_DATE_PROVIDED: Ingen dato angivet
     BAD_DATE: Ugyldig dato
     AGO: siden
     FROM_NOW: fra nu
+    JUST_NOW: lige nu
     SECOND: sekund
     MINUTE: minut
     HOUR: time
@@ -15,6 +31,7 @@ GRAV:
     YEAR: år
     DECADE: årti
     SEC: sek
+    MIN: min.
     HR: t
     WK: u
     MO: md
@@ -36,8 +53,8 @@ GRAV:
     YR_PLURAL: år
     DEC_PLURAL: årtier
   FORM:
-    VALIDATION_FAIL: <b>Validering mislykkedes:</b>
-    INVALID_INPUT: Ugyldigt input i
+    VALIDATION_FAIL: '<b>Validering mislykkedes:</b>'
+    INVALID_INPUT: 'Ugyldigt input i'
     MISSING_REQUIRED_FIELD: 'Mangler obligatorisk felt:'
   MONTHS_OF_THE_YEAR:
     - 'januar'
@@ -60,3 +77,14 @@ GRAV:
     - 'fredag'
     - 'lørdag'
     - 'søndag'
+  CRON:
+    EVERY: hver
+    EVERY_HOUR: hver time
+    EVERY_MINUTE: hvert minut
+    EVERY_DAY_OF_WEEK: alle ugens dage
+    EVERY_DAY_OF_MONTH: alle dage i måneden
+    EVERY_MONTH: hver måned
+    TEXT_PERIOD: Hver <b />
+    TEXT_MINS: ' ved <b /> minut(ter) over timen'
+    ERROR1: Tagget %s understøttes ikke!
+    ERROR2: Ugyldigt antal elementer

system/languages/de.yaml

@@ -101,9 +101,10 @@ GRAV:
     YR_PLURAL: Jahre
     DEC_PLURAL: Jahrzehnten
   FORM:
-    VALIDATION_FAIL: <b>Überprüfung fehlgeschlagen:</b>
-    INVALID_INPUT: Ungültige Eingabe in
+    VALIDATION_FAIL: '<b>Überprüfung fehlgeschlagen:</b>'
+    INVALID_INPUT: 'Ungültige Eingabe in'
     MISSING_REQUIRED_FIELD: 'Erforderliches Feld fehlt:'
+    XSS_ISSUES: "Potenzielle XSS-Probleme im Feld '%s' erkannt"
   MONTHS_OF_THE_YEAR:
     - 'Januar'
     - 'Februar'
@@ -125,6 +126,8 @@ GRAV:
     - 'Freitag'
     - 'Samstag'
     - 'Sonntag'
+  YES: "Ja"
+  NO: "Nein"
   CRON:
     EVERY: jede
     EVERY_HOUR: jede Stunde

system/languages/el.yaml

@@ -1,11 +1,75 @@
 ---
 GRAV:
   FRONTMATTER_ERROR_PAGE: "---\nΤίτλος: %1$s\n---\n\n# Σφάλμα: Μη έγκυρη διαδρομή Frontmatter\n\nΔιαδρομή: `%2$s`\n\n**%3$s**\n\n```\n%4$s\n```"
+  INFLECTOR_PLURALS:
+    '/(quiz)$/i': '\1zes'
+    '/^(ox)$/i': '\1en'
+    '/([m|l])ouse$/i': '\1ice'
+    '/(matr|vert|ind)ix|ex$/i': '\1ices'
+    '/(x|ch|ss|sh)$/i': '\1es'
+    '/([^aeiouy]|qu)ies$/i': '\1y'
+    '/([^aeiouy]|qu)y$/i': '\1ies'
+    '/(hive)$/i': '\1s'
+    '/(?:([^f])fe|([lr])f)$/i': '\1\2ves'
+    '/sis$/i': 'ses'
+    '/([ti])um$/i': '\1a'
+    '/(buffal|tomat)o$/i': '\1oes'
+    '/(bu)s$/i': '\1ses'
+    '/(alias|status)/i': '\1es'
+    '/(octop|vir)us$/i': '\1i'
+    '/(ax|test)is$/i': '\1es'
+    '/s$/i': 's'
+    '/$/': 's'
+  INFLECTOR_SINGULAR:
+    '/(quiz)zes$/i': '\1'
+    '/(matr)ices$/i': '\1ix'
+    '/(vert|ind)ices$/i': '\1ex'
+    '/^(ox)en/i': '\1'
+    '/(alias|status)es$/i': '\1'
+    '/([octop|vir])i$/i': '\1us'
+    '/(cris|ax|test)es$/i': '\1is'
+    '/(shoe)s$/i': '\1'
+    '/(o)es$/i': '\1'
+    '/(bus)es$/i': '\1'
+    '/([m|l])ice$/i': '\1ouse'
+    '/(x|ch|ss|sh)es$/i': '\1'
+    '/(m)ovies$/i': '\1ovie'
+    '/(s)eries$/i': '\1eries'
+    '/([^aeiouy]|qu)ies$/i': '\1y'
+    '/([lr])ves$/i': '\1f'
+    '/(tive)s$/i': '\1'
+    '/(hive)s$/i': '\1'
+    '/([^f])ves$/i': '\1fe'
+    '/(^analy)ses$/i': '\1sis'
+    '/((a)naly|(b)a|(d)iagno|(p)arenthe|(p)rogno|(s)ynop|(t)he)ses$/i': '\1\2sis'
+    '/([ti])a$/i': '\1um'
+    '/(n)ews$/i': '\1ews'
+  INFLECTOR_UNCOUNTABLE:
+    - 'εξοπλισμός'
+    - 'πληροφοριες'
+    - 'rice'
+    - 'χρήματα'
+    - 'είδη'
+    - 'σειρές'
+    - 'ψάρι'
+    - 'πρόβατο'
+  INFLECTOR_IRREGULAR:
+    'person': 'άνθρωποι'
+    'man': 'άνδρες'
+    'child': 'παιδιά'
+    'sex': 'φύλο'
+    'move': 'κινήσεις'
+  INFLECTOR_ORDINALS:
+    'default': 'th'
+    'first': 'st'
+    'second': 'nd'
+    'third': 'rd'
   NICETIME:
     NO_DATE_PROVIDED: Δεν δόθηκε καμία ημερομηνία
     BAD_DATE: Εσφαλμένη ημερομηνία
     AGO: πρίν
     FROM_NOW: από τώρα
+    JUST_NOW: μόλις τώρα
     SECOND: δευτερόλεπτο
     MINUTE: λεπτό
     HOUR: ώρα
@@ -37,8 +101,8 @@ GRAV:
     YR_PLURAL: έτη
     DEC_PLURAL: δεκαετίες
   FORM:
-    VALIDATION_FAIL: <b>Η επικύρωση απέτυχε:</b>
-    INVALID_INPUT: Μη έγκυρα δεδομένα σε
+    VALIDATION_FAIL: '<b>Η επικύρωση απέτυχε:</b>'
+    INVALID_INPUT: 'Μη έγκυρα δεδομένα σε'
     MISSING_REQUIRED_FIELD: 'Λείπει το απαιτούμενο πεδίο:'
   MONTHS_OF_THE_YEAR:
     - 'Ιανουάριος'
@@ -61,3 +125,20 @@ GRAV:
     - 'Παρασκευή'
     - 'Σάββατο'
     - 'Κυριακή'
+  CRON:
+    EVERY: κάθε
+    EVERY_HOUR: κάθε ώρα
+    EVERY_MINUTE: κάθε λεπτό
+    EVERY_DAY_OF_WEEK: κάθε μέρα της εβδομάδος
+    EVERY_DAY_OF_MONTH: κάθε μέρα του μήνα
+    EVERY_MONTH: κάθε μήνα
+    TEXT_PERIOD: Κάθε <b />
+    TEXT_MINS: ' κατά <b /> λεπτό(ά) μετά την ώρα'
+    TEXT_TIME: ' στο <b />:<b />'
+    TEXT_DOW: ' στις <b />'
+    TEXT_MONTH: ' από <b />'
+    TEXT_DOM: ' στις <b />'
+    ERROR1: Η ετικέτα %s δεν υποστηρίζεται!
+    ERROR2: Μη έγκυρος αριθμός στοιχείων
+    ERROR3: Το jquery_element θα έπρεπε να οριστεί στις ρυθμίσεις του jqCron
+    ERROR4: Μη αναγνωρισμένη έκφραση

system/languages/en.yaml

@@ -94,9 +94,10 @@ GRAV:
         YR_PLURAL: yrs
         DEC_PLURAL: decs
     FORM:
-        VALIDATION_FAIL: <b>Validation failed:</b>
-        INVALID_INPUT: Invalid input in
-        MISSING_REQUIRED_FIELD: Missing required field:
+        VALIDATION_FAIL: '<b>Validation failed:</b>'
+        INVALID_INPUT: 'Invalid input in'
+        MISSING_REQUIRED_FIELD: 'Missing required field:'
+        XSS_ISSUES: "Potential XSS issues detected in '%s' field"
     MONTHS_OF_THE_YEAR: ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December']
     DAYS_OF_THE_WEEK: ['Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday', 'Sunday']
     YES: "Yes"

system/languages/es.yaml

@@ -1,19 +1,25 @@
 ---
 GRAV:
-  FRONTMATTER_ERROR_PAGE: "---\ntítulo: %1$s\n---\n\n# Error: Frontmatter no válido\n\nRuta: `%2$s`\n\n**%3$s**\n\n```\n%4$s\n```"
+  FRONTMATTER_ERROR_PAGE: "---\ntítulo: %1$s\n---\n\n# Error: Prefacio no válido\n\nRuta: `%2$s`\n\n**%3$s**\n\n```\n%4$s\n```"
+  INFLECTOR_PLURALS:
+    '/(quiz)$/i': '\1ios'
+    '/s$/i': 's'
+    '/$/': 's'
   INFLECTOR_UNCOUNTABLE:
-    - 'equipo'
+    - 'equipamiento'
     - 'información'
-    - 'rice'
+    - 'arroz'
     - 'dinero'
-    - 'species'
+    - 'especies'
     - 'series'
     - 'pescado'
     - 'oveja'
   INFLECTOR_IRREGULAR:
+    'person': 'personas'
     'man': 'hombres'
     'child': 'niños'
     'sex': 'sexos'
+    'move': 'movido'
   INFLECTOR_ORDINALS:
     'first': 'ro'
     'second': 'do'
@@ -33,10 +39,12 @@ GRAV:
     YEAR: año
     DECADE: década
     SEC: seg
+    MIN: min
     HR: h
     WK: sem
     MO: mes
     YR: año
+    DEC: dic
     SECOND_PLURAL: segundos
     MINUTE_PLURAL: minutos
     HOUR_PLURAL: horas
@@ -46,6 +54,7 @@ GRAV:
     YEAR_PLURAL: años
     DECADE_PLURAL: décadas
     SEC_PLURAL: segs
+    MIN_PLURAL: mins
     HR_PLURAL: hs
     WK_PLURAL: sem
     MO_PLURAL: mes
@@ -55,6 +64,7 @@ GRAV:
     VALIDATION_FAIL: '<b>Falló la validación: </b>'
     INVALID_INPUT: 'Dato inválido en: '
     MISSING_REQUIRED_FIELD: 'Falta el campo requerido: '
+    XSS_ISSUES: "Se detectaron problemas XSS potenciales en el campo '%s'"
   MONTHS_OF_THE_YEAR:
     - 'Enero'
     - 'Febrero'
@@ -76,6 +86,8 @@ GRAV:
     - 'Viernes'
     - 'Sábado'
     - 'Domingo'
+  YES: "Si"
+  NO: "No"
   CRON:
     EVERY: cada
     EVERY_HOUR: cada hora

system/languages/et.yaml

@@ -1,11 +1,22 @@
 ---
 GRAV:
   FRONTMATTER_ERROR_PAGE: "---\npealkiri: %1$s\n---\n\n# Viga: vigane Frontmatter'i\n\nasukoht: `%2$s`\n\n**%3$s**\n\n```\n%4$s\n```"
+  INFLECTOR_PLURALS:
+    '/(octop|vir)us$/i': '\1i'
+  INFLECTOR_SINGULAR:
+    '/^(ox)en/i': '\1'
+    '/(alias|status)es$/i': '\1'
+    '/(shoe)s$/i': '\1'
+    '/(o)es$/i': '\1'
+    '/(bus)es$/i': '\1'
+    '/(x|ch|ss|sh)es$/i': '\1'
+    '/(tive)s$/i': '\1'
+    '/(hive)s$/i': '\1'
   INFLECTOR_UNCOUNTABLE:
     - 'equipment'
     - 'informatsioon'
-    - 'rice'
-    - 'money'
+    - 'riis'
+    - 'raha'
     - 'species'
     - 'series'
     - 'kala'
@@ -34,6 +45,7 @@ GRAV:
     YEAR: aasta
     DECADE: 10 aastat
     SEC: sek
+    MIN: min
     HR: t
     WK: näd
     MO: k.
@@ -55,7 +67,7 @@ GRAV:
     YR_PLURAL: aastat
     DEC_PLURAL: dek.
   FORM:
-    VALIDATION_FAIL: <b>Kinnitamine nurjus:</b>
+    VALIDATION_FAIL: '<b>Kinnitamine nurjus:</b>'
     INVALID_INPUT: 'Vigane sisend:'
     MISSING_REQUIRED_FIELD: 'Nõutud väli puudub:'
   MONTHS_OF_THE_YEAR:
@@ -81,5 +93,12 @@ GRAV:
     - 'pühapäev'
   CRON:
     EVERY: iga
+    EVERY_HOUR: iga tund
+    EVERY_MINUTE: iga minut
+    EVERY_DAY_OF_WEEK: iga nädala päev
     EVERY_MONTH: iga kuu
     TEXT_PERIOD: Iga <b />
+    ERROR1: Silt %s pole toetatud!
+    ERROR2: Vale elementide arv
+    ERROR3: jqCron seadetes peaks olema määratud jquery_element
+    ERROR4: Tundmatu väljend

system/languages/eu.yaml

@@ -36,8 +36,8 @@ GRAV:
     YR_PLURAL: urt
     DEC_PLURAL: ham
   FORM:
-    VALIDATION_FAIL: <b>Balidazioak huts egin du</b>
-    INVALID_INPUT: Baliogabeko sarrera
+    VALIDATION_FAIL: '<b>Balidazioak huts egin du</b>'
+    INVALID_INPUT: 'Baliogabeko sarrera'
     MISSING_REQUIRED_FIELD: 'Derrigorrezko eremua bete gabe:'
   MONTHS_OF_THE_YEAR:
     - 'Urtarrila'

system/languages/fa.yaml

@@ -36,8 +36,8 @@ GRAV:
     YR_PLURAL: سال
     DEC_PLURAL: دهه
   FORM:
-    VALIDATION_FAIL: <b>سنجش اعتبار ناموفق بود</b>
-    INVALID_INPUT: ورودی نامعتبر در
+    VALIDATION_FAIL: '<b>سنجش اعتبار ناموفق بود</b>'
+    INVALID_INPUT: 'ورودی نامعتبر در'
     MISSING_REQUIRED_FIELD: 'قسمت ضروری جا افتاده:'
   MONTHS_OF_THE_YEAR:
     - 'ژانویه'

system/languages/fi.yaml

@@ -100,8 +100,8 @@ GRAV:
     YR_PLURAL: v
     DEC_PLURAL: vuosikymmentä
   FORM:
-    VALIDATION_FAIL: <b>Vahvistus epäonnistui:</b>
-    INVALID_INPUT: Syöte ei kelpaa
+    VALIDATION_FAIL: '<b>Vahvistus epäonnistui:</b>'
+    INVALID_INPUT: 'Syöte ei kelpaa'
     MISSING_REQUIRED_FIELD: 'Puuttuva pakollinen kenttä:'
   MONTHS_OF_THE_YEAR:
     - 'Tammikuu'

system/languages/fr.yaml

@@ -16,6 +16,7 @@ GRAV:
     '/(buffal|tomat)o$/i': '\1es'
     '/(bu)s$/i': 'Bus'
     '/(alias|status)/i': 'alias|status'
+    '/(octop|vir)us$/i': 'virus'
     '/(ax|test)is$/i': '\1s'
     '/s$/i': 's'
     '/$/': 's'
@@ -80,30 +81,30 @@ GRAV:
     YR_PLURAL: a
     DEC_PLURAL: décs
   FORM:
-    VALIDATION_FAIL: <b>La validation a échoué :</b>
-    INVALID_INPUT: Saisie non valide
+    VALIDATION_FAIL: '<b>La validation a échoué :</b>'
+    INVALID_INPUT: 'Saisie non valide'
     MISSING_REQUIRED_FIELD: 'Champ obligatoire manquant :'
   MONTHS_OF_THE_YEAR:
-    - 'Janvier'
-    - 'Février'
-    - 'Mars'
-    - 'Avril'
-    - 'Mai'
-    - 'Juin'
-    - 'Juillet'
-    - 'Août'
-    - 'Septembre'
-    - 'Octobre'
-    - 'Novembre'
-    - 'Décembre'
+    - 'janvier'
+    - 'février'
+    - 'mars'
+    - 'avril'
+    - 'mai'
+    - 'juin'
+    - 'juillet'
+    - 'août'
+    - 'septembre'
+    - 'octobre'
+    - 'novembre'
+    - 'décembre'
   DAYS_OF_THE_WEEK:
-    - 'Lundi'
-    - 'Mardi'
-    - 'Mercredi'
-    - 'Jeudi'
-    - 'Vendredi'
-    - 'Samedi'
-    - 'Dimanche'
+    - 'lundi'
+    - 'mardi'
+    - 'mercredi'
+    - 'jeudi'
+    - 'vendredi'
+    - 'samedi'
+    - 'dimanche'
   CRON:
     EVERY: chaque
     EVERY_HOUR: toutes les heures

system/languages/gl.yaml

@@ -0,0 +1,144 @@
+---
+GRAV:
+  FRONTMATTER_ERROR_PAGE: "---\ntítulo: %1$s\n---\n\n# Erro: Limiar incorrecto\n\nRuta: `%2$s`\n\n**%3$s**\n\n```\n%4$s\n```"
+  INFLECTOR_PLURALS:
+    '/(quiz)$/i': '\1zes'
+    '/^(ox)$/i': '\1en'
+    '/([m|l])ouse$/i': '\1ice'
+    '/(matr|vert|ind)ix|ex$/i': '\1ices'
+    '/(x|ch|ss|sh)$/i': '\1es'
+    '/([^aeiouy]|qu)ies$/i': '\1y'
+    '/([^aeiouy]|qu)y$/i': '\1ies'
+    '/(hive)$/i': '\1s'
+    '/(?:([^f])fe|([lr])f)$/i': '\1\2ves'
+    '/sis$/i': 'ses'
+    '/([ti])um$/i': '\1a'
+    '/(buffal|tomat)o$/i': '\1oes'
+    '/(bu)s$/i': '\1ses'
+    '/(alias|status)/i': '\1'
+    '/(octop|vir)us$/i': '\1'
+    '/(ax|test)is$/i': '\1es'
+    '/s$/i': 's'
+    '/$/': 's'
+  INFLECTOR_SINGULAR:
+    '/(quiz)zes$/i': '\1ces'
+    '/(matr)ices$/i': '\1ix'
+    '/(vert|ind)ices$/i': '\1ex'
+    '/^(ox)en/i': '\1'
+    '/(alias|status)es$/i': '\1'
+    '/([octop|vir])i$/i': '\1'
+    '/(cris|ax|test)es$/i': '\1es'
+    '/(shoe)s$/i': '\1'
+    '/(o)es$/i': '\1'
+    '/(bus)es$/i': '\1'
+    '/([m|l])ice$/i': '\1ouse'
+    '/(x|ch|ss|sh)es$/i': '\1'
+    '/(m)ovies$/i': '\1ovie'
+    '/(s)eries$/i': '\1eries'
+    '/([^aeiouy]|qu)ies$/i': '\1'
+    '/([lr])ves$/i': '\1f'
+    '/(tive)s$/i': '\1'
+    '/(hive)s$/i': '\1'
+    '/([^f])ves$/i': '\1fe'
+    '/(^analy)ses$/i': '\1se'
+    '/((a)naly|(b)a|(d)iagno|(p)arenthe|(p)rogno|(s)ynop|(t)he)ses$/i': '\1\2se'
+    '/([ti])a$/i': '\1um'
+    '/(n)ews$/i': '\1ews'
+  INFLECTOR_UNCOUNTABLE:
+    - 'equipo'
+    - 'información'
+    - 'arroz'
+    - 'diñeiro'
+    - 'especies'
+    - 'series'
+    - 'peixe'
+    - 'ovella'
+  INFLECTOR_IRREGULAR:
+    'person': 'xente'
+    'man': 'home'
+    'child': 'neno'
+    'sex': 'sexos'
+    'move': 'move'
+  INFLECTOR_ORDINALS:
+    'default': 'º'
+    'first': 'º'
+    'second': 'º'
+    'third': 'º'
+  NICETIME:
+    NO_DATE_PROVIDED: Non fornece unha data
+    BAD_DATE: Data errada
+    AGO: hai
+    FROM_NOW: dende agora
+    JUST_NOW: xusto agora
+    SECOND: segundo
+    MINUTE: minuto
+    HOUR: hora
+    DAY: día
+    WEEK: semana
+    MONTH: mes
+    YEAR: ano
+    DECADE: década
+    SEC: seg
+    MIN: min
+    HR: hr 
+    WK: Sem
+    MO: m
+    YR: a
+    DEC: dec
+    SECOND_PLURAL: segundos
+    MINUTE_PLURAL: minutos
+    HOUR_PLURAL: horas
+    DAY_PLURAL: días
+    WEEK_PLURAL: semanas
+    MONTH_PLURAL: meses
+    YEAR_PLURAL: anos
+    DECADE_PLURAL: décadas
+    SEC_PLURAL: segs
+    MIN_PLURAL: mins
+    HR_PLURAL: hrs
+    WK_PLURAL: sem
+    MO_PLURAL: mes
+    YR_PLURAL: a
+    DEC_PLURAL: deca
+  FORM:
+    VALIDATION_FAIL: '<b>Fallou a validación:</b>'
+    INVALID_INPUT: 'Entrada incorrecta en'
+    MISSING_REQUIRED_FIELD: 'Falta un campo requirido:'
+  MONTHS_OF_THE_YEAR:
+    - 'xaneiro'
+    - 'febreiro'
+    - 'marzo'
+    - 'abril'
+    - 'maio'
+    - 'xuño'
+    - 'xullo'
+    - 'agosto'
+    - 'setembro'
+    - 'outubro'
+    - 'novembro'
+    - 'decembro'
+  DAYS_OF_THE_WEEK:
+    - 'luns'
+    - 'martes'
+    - 'mércores'
+    - 'xoves'
+    - 'venres'
+    - 'sábado'
+    - 'domingo'
+  CRON:
+    EVERY: cada
+    EVERY_HOUR: Cada hora
+    EVERY_MINUTE: Cada minuto
+    EVERY_DAY_OF_WEEK: cada día da semana
+    EVERY_DAY_OF_MONTH: cada día do mes
+    EVERY_MONTH: cada mes
+    TEXT_PERIOD: Cada <b />
+    TEXT_MINS: ' dentro de <b /> minuto(s) despois da hora'
+    TEXT_TIME: ' dentro <b />:<b />'
+    TEXT_DOW: ' o <b />'
+    TEXT_MONTH: ' de <b />'
+    TEXT_DOM: ' o <b />'
+    ERROR1: A etiqueta %s non é compatíbel!
+    ERROR2: Mal número de elementos
+    ERROR3: O jquery_element debería estar determinado na configuración de jqCron
+    ERROR4: Expresión non recoñecida

system/languages/he.yaml

@@ -37,8 +37,8 @@ GRAV:
     YR_PLURAL: שני'
     DEC_PLURAL: עש'
   FORM:
-    VALIDATION_FAIL: <b>האימות נכשל:</b>
-    INVALID_INPUT: קלט לא חוקי
+    VALIDATION_FAIL: '<b>האימות נכשל:</b>'
+    INVALID_INPUT: 'קלט לא חוקי'
     MISSING_REQUIRED_FIELD: 'שדות חובה חסרים:'
   MONTHS_OF_THE_YEAR:
     - 'ינואר'

system/languages/hr.yaml

@@ -50,8 +50,8 @@ GRAV:
     YR_PLURAL: g
     DEC_PLURAL: des
   FORM:
-    VALIDATION_FAIL: <b>Validacija nije uspjela:</b>
-    INVALID_INPUT: Pogrešan unos u
+    VALIDATION_FAIL: '<b>Validacija nije uspjela:</b>'
+    INVALID_INPUT: 'Pogrešan unos u'
     MISSING_REQUIRED_FIELD: 'Nedostaje obavezno polje:'
   MONTHS_OF_THE_YEAR:
     - 'Siječanj'

system/languages/hu.yaml

@@ -58,7 +58,7 @@ GRAV:
     YR_PLURAL: év
     DEC_PLURAL: évt
   FORM:
-    VALIDATION_FAIL: <b>Érvényesítés nem sikerült:</b>
+    VALIDATION_FAIL: '<b>Érvényesítés nem sikerült:</b>'
     INVALID_INPUT: 'A megadott érték érvénytelen:'
     MISSING_REQUIRED_FIELD: 'Ez a kötelező mező nincs kitöltve:'
   MONTHS_OF_THE_YEAR:

system/languages/id.yaml

@@ -1,6 +1,8 @@
 ---
 GRAV:
   FRONTMATTER_ERROR_PAGE: "---\ntitle: %1$s\n---\n\n# Error: Frontmatter tidak valid\n\nLokasi: `%2$s`\n\n**%3$s**\n\n```\n%4$s\n```"
+  INFLECTOR_PLURALS:
+    '/(quiz)$/i': '\1zes'
   INFLECTOR_UNCOUNTABLE:
     - 'peralatan'
     - 'informasi'
@@ -53,8 +55,8 @@ GRAV:
     YR_PLURAL: thn
     DEC_PLURAL: dekade
   FORM:
-    VALIDATION_FAIL: <b>Validasi gagal:</b>
-    INVALID_INPUT: Input tidak valid di
+    VALIDATION_FAIL: '<b>Validasi gagal:</b>'
+    INVALID_INPUT: 'Input tidak valid di'
     MISSING_REQUIRED_FIELD: 'Data yang diperlukan belum terisi:'
   MONTHS_OF_THE_YEAR:
     - 'Januari'

system/languages/is.yaml

@@ -46,8 +46,8 @@ GRAV:
     YR_PLURAL: árum
     DEC_PLURAL: árat
   FORM:
-    VALIDATION_FAIL: <b>Sannvottun mistókst:</b>
-    INVALID_INPUT: Ógilt inntak í
+    VALIDATION_FAIL: '<b>Sannvottun mistókst:</b>'
+    INVALID_INPUT: 'Ógilt inntak í'
     MISSING_REQUIRED_FIELD: 'Vantar nauðsynlegan reit:'
   MONTHS_OF_THE_YEAR:
     - 'janúar'

system/languages/it.yaml

@@ -1,6 +1,49 @@
 ---
 GRAV:
   FRONTMATTER_ERROR_PAGE: "---Titolo: %1$s---# Errore: Frontmatter non valido: '%2$s' * *%3$s * * ' '%4$s ' '"
+  INFLECTOR_PLURALS:
+    '/(quiz)$/i': '\1'
+    '/^(ox)$/i': '\1en'
+    '/([m|l])ouse$/i': '\1ice'
+    '/(matr|vert|ind)ix|ex$/i': '\1ices'
+    '/(x|ch|ss|sh)$/i': '\1es'
+    '/([^aeiouy]|qu)ies$/i': '\1y'
+    '/([^aeiouy]|qu)y$/i': '\1ies'
+    '/(hive)$/i': '\1s'
+    '/(?:([^f])fe|([lr])f)$/i': '\1\2ves'
+    '/sis$/i': 'ses'
+    '/([ti])um$/i': '\1a'
+    '/(buffal|tomat)o$/i': '\1oes'
+    '/(bu)s$/i': '\1ses'
+    '/(alias|status)/i': '\1es'
+    '/(octop|vir)us$/i': '\1i'
+    '/(ax|test)is$/i': '\1es'
+    '/s$/i': 's'
+    '/$/': 's'
+  INFLECTOR_SINGULAR:
+    '/(quiz)zes$/i': '\1'
+    '/(matr)ices$/i': '\1ix'
+    '/(vert|ind)ices$/i': '\1ex'
+    '/^(ox)en/i': '\1'
+    '/(alias|status)es$/i': '\1'
+    '/([octop|vir])i$/i': '\1us'
+    '/(cris|ax|test)es$/i': '\1is'
+    '/(shoe)s$/i': '\1'
+    '/(o)es$/i': '\1'
+    '/(bus)es$/i': '\1'
+    '/([m|l])ice$/i': '\1ouse'
+    '/(x|ch|ss|sh)es$/i': '\1'
+    '/(m)ovies$/i': '\1ovie'
+    '/(s)eries$/i': '\1eries'
+    '/([^aeiouy]|qu)ies$/i': '\1y'
+    '/([lr])ves$/i': '\1f'
+    '/(tive)s$/i': '\1'
+    '/(hive)s$/i': '\1'
+    '/([^f])ves$/i': '\1fe'
+    '/(^analy)ses$/i': '\1sis'
+    '/((a)naly|(b)a|(d)iagno|(p)arenthe|(p)rogno|(s)ynop|(t)he)ses$/i': '\1\2sis'
+    '/([ti])a$/i': '\1um'
+    '/(n)ews$/i': '\1ews'
   INFLECTOR_UNCOUNTABLE:
     - 'dotazione'
     - 'informazione'
@@ -58,9 +101,10 @@ GRAV:
     YR_PLURAL: anni
     DEC_PLURAL: decenni
   FORM:
-    VALIDATION_FAIL: <b>Validazione fallita:</b>
-    INVALID_INPUT: Input non valido in
+    VALIDATION_FAIL: '<b>Validazione fallita:</b>'
+    INVALID_INPUT: 'Input non valido in'
     MISSING_REQUIRED_FIELD: 'Campo richiesto mancante:'
+    XSS_ISSUES: "Rilevati potenziali problemi di XSS nel campo '%s'"
   MONTHS_OF_THE_YEAR:
     - 'Gennaio'
     - 'Febbraio'
@@ -82,6 +126,8 @@ GRAV:
     - 'Venerdì'
     - 'Sabato'
     - 'Domenica'
+  YES: "Sì"
+  NO: "No"
   CRON:
     EVERY: ogni
     EVERY_HOUR: ogni ora

system/languages/ja.yaml

@@ -1,11 +1,22 @@
 ---
 GRAV:
+  INFLECTOR_UNCOUNTABLE:
+    - 'equipment'
+    - '情報'
+    - 'rice'
+    - 'お金'
+    - 'species'
+    - 'series'
+    - '魚'
+    - 'ヒツジ'
   INFLECTOR_IRREGULAR:
     'person': 'みんな'
     'man': '人'
     'child': '子供'
     'sex': '性別'
     'move': '移動'
+  INFLECTOR_ORDINALS:
+    'first': '番目'
   NICETIME:
     NO_DATE_PROVIDED: 日付が設定されていません
     BAD_DATE: 不正な日付
@@ -40,8 +51,8 @@ GRAV:
     YR_PLURAL: 年
     DEC_PLURAL: 10年
   FORM:
-    VALIDATION_FAIL: <b>バリデーション失敗 :</b>
-    INVALID_INPUT: 不正な入力：
+    VALIDATION_FAIL: '<b>バリデーション失敗 :</b>'
+    INVALID_INPUT: '不正な入力：'
     MISSING_REQUIRED_FIELD: '必須項目が入力されていません:'
   MONTHS_OF_THE_YEAR:
     - '1月'
@@ -64,3 +75,7 @@ GRAV:
     - '金'
     - '土'
     - '日'
+  CRON:
+    EVERY: 毎
+    EVERY_MONTH: 毎月
+    ERROR1: 共有タイプ %s はサポートされていません

system/languages/ko.yaml

@@ -37,8 +37,8 @@ GRAV:
     YR_PLURAL: 년
     DEC_PLURAL: 년간
   FORM:
-    VALIDATION_FAIL: <b>유효성 검사 실패:</b>
-    INVALID_INPUT: 잘못된 입력
+    VALIDATION_FAIL: '<b>유효성 검사 실패:</b>'
+    INVALID_INPUT: '잘못된 입력'
     MISSING_REQUIRED_FIELD: '누락 된 필수 필드:'
   MONTHS_OF_THE_YEAR:
     - '일월'

system/languages/lt.yaml

@@ -52,8 +52,8 @@ GRAV:
     YR_PLURAL: m.
     DEC_PLURAL: dešimtmečiai
   FORM:
-    VALIDATION_FAIL: <b>Patvirtinimas nepavyko:</b>
-    INVALID_INPUT: Neteisingai įvesta į
+    VALIDATION_FAIL: '<b>Patvirtinimas nepavyko:</b>'
+    INVALID_INPUT: 'Neteisingai įvesta į'
     MISSING_REQUIRED_FIELD: 'Būtina užpildyti laukelį:'
   MONTHS_OF_THE_YEAR:
     - 'Sausis'

system/languages/nl.yaml

@@ -101,8 +101,8 @@ GRAV:
     YR_PLURAL: jaren
     DEC_PLURAL: decennia
   FORM:
-    VALIDATION_FAIL: <b>Validatie mislukt:</b>
-    INVALID_INPUT: Ongeldige invoer in
+    VALIDATION_FAIL: '<b>Validatie mislukt:</b>'
+    INVALID_INPUT: 'Ongeldige invoer in'
     MISSING_REQUIRED_FIELD: 'Ontbrekend verplicht veld:'
   MONTHS_OF_THE_YEAR:
     - 'Januari'

system/languages/no.yaml

@@ -21,6 +21,7 @@ GRAV:
     BAD_DATE: Ugyldig dato
     AGO: siden
     FROM_NOW: fra nå
+    JUST_NOW: akkurat nå
     SECOND: sekund
     MINUTE: minutt
     HOUR: time
@@ -51,8 +52,8 @@ GRAV:
     YR_PLURAL: år
     DEC_PLURAL: årtier
   FORM:
-    VALIDATION_FAIL: <b>Godkjenning mislyktes:</b>
-    INVALID_INPUT: Ugyldig innhold i
+    VALIDATION_FAIL: '<b>Godkjenning mislyktes:</b>'
+    INVALID_INPUT: 'Ugyldig innhold i'
     MISSING_REQUIRED_FIELD: 'Mangler påkrevd felt:'
   MONTHS_OF_THE_YEAR:
     - 'januar'
@@ -75,3 +76,7 @@ GRAV:
     - 'fredag'
     - 'lørdag'
     - 'søndag'
+  CRON:
+    EVERY: hver
+    EVERY_HOUR: hver time
+    EVERY_MINUTE: hvert minutt

system/languages/pl.yaml

@@ -1,11 +1,32 @@
 ---
 GRAV:
   FRONTMATTER_ERROR_PAGE: "---\ntitle: %1$s\n---\n\n# Error: Nieprawidłowy Frontmatter\n\nPath: `%2$s`\n\n**%3$s**\n\n```\n%4$s\n```"
+  INFLECTOR_SINGULAR:
+    '/(alias|status)es$/i': '\1'
+  INFLECTOR_UNCOUNTABLE:
+    - 'wyposażenie'
+    - 'informacja'
+    - 'rice'
+    - 'pieniądze'
+    - 'species'
+    - 'series'
+    - 'ryba'
+    - 'owca'
+  INFLECTOR_IRREGULAR:
+    'person': 'człowiek'
+    'man': 'mężczyźni'
+    'child': 'dzieci'
+    'sex': 'płci'
+  INFLECTOR_ORDINALS:
+    'first': 'pierwszy'
+    'second': 'drugi'
+    'third': 'trzeci'
   NICETIME:
     NO_DATE_PROVIDED: Nie podano daty
     BAD_DATE: Zła data
     AGO: temu
     FROM_NOW: od teraz
+    JUST_NOW: właśnie teraz
     SECOND: sekunda
     MINUTE: minuta
     HOUR: godzina
@@ -15,6 +36,7 @@ GRAV:
     YEAR: rok
     DECADE: dekada
     SEC: sek
+    MIN: minuta
     HR: godz
     WK: tydz
     MO: m-c
@@ -36,9 +58,10 @@ GRAV:
     YR_PLURAL: lat
     DEC_PLURAL: dekad
   FORM:
-    VALIDATION_FAIL: <b>Weryfikacja nie powiodła się:</b>
-    INVALID_INPUT: Nieprawidłowe dane wejściowe
+    VALIDATION_FAIL: '<b>Weryfikacja nie powiodła się:</b>'
+    INVALID_INPUT: 'Nieprawidłowe dane wejściowe'
     MISSING_REQUIRED_FIELD: 'Opuszczono wymagane pole:'
+    XSS_ISSUES: "Potencjalne problemy XSS wykryte w polu '%s'"
   MONTHS_OF_THE_YEAR:
     - 'Styczeń'
     - 'Luty'
@@ -60,3 +83,18 @@ GRAV:
     - 'Piątek'
     - 'Sobota'
     - 'Niedziela'
+  YES: "Tak"
+  NO: "Nie"
+  CRON:
+    EVERY: każdy
+    EVERY_HOUR: każdą godzinę
+    EVERY_MINUTE: każdą minutę
+    EVERY_DAY_OF_WEEK: każdego dnia tygodnia
+    EVERY_DAY_OF_MONTH: każdego dnia miesiące
+    EVERY_MONTH: każdego miesiąca
+    TEXT_PERIOD: Każdego <b />
+    TEXT_MINS: 'o <b /> minut po godzinie'
+    TEXT_TIME: 'o <b />:<b />'
+    ERROR1: Znacznik %s nie jest wspierany!
+    ERROR2: Nieprawidłowa liczba elementów
+    ERROR4: Wyrażenie nierozpoznane

system/languages/pt.yaml

@@ -1,8 +1,75 @@
 ---
 GRAV:
+  FRONTMATTER_ERROR_PAGE: "---\ntitle: %1$s\n---\n\n# Erro: Frontmatter Inválido\n\nLocalização: `%2$s`\n\n**%3$s**\n\n```\n%4$s\n```"
+  INFLECTOR_PLURALS:
+    '/(quiz)$/i': '\1zes'
+    '/^(ox)$/i': '\1en'
+    '/([m|l])ouse$/i': '\1ice'
+    '/(matr|vert|ind)ix|ex$/i': '\1ices'
+    '/(x|ch|ss|sh)$/i': '\1es'
+    '/([^aeiouy]|qu)ies$/i': '\1y'
+    '/([^aeiouy]|qu)y$/i': '\1ies'
+    '/(hive)$/i': '\1s'
+    '/(?:([^f])fe|([lr])f)$/i': '\1\2ves'
+    '/sis$/i': 'ses'
+    '/([ti])um$/i': '\1a'
+    '/(buffal|tomat)o$/i': '\1oes'
+    '/(bu)s$/i': '\1ses'
+    '/(alias|status)/i': '\1es'
+    '/(octop|vir)us$/i': '\1i'
+    '/(ax|test)is$/i': '\1es'
+    '/s$/i': 's'
+    '/$/': 's'
+  INFLECTOR_SINGULAR:
+    '/(quiz)zes$/i': '\1'
+    '/(matr)ices$/i': '\1ix'
+    '/(vert|ind)ices$/i': '\1ex'
+    '/^(ox)en/i': '\1'
+    '/(alias|status)es$/i': '\1'
+    '/([octop|vir])i$/i': '\1us'
+    '/(cris|ax|test)es$/i': '\1is'
+    '/(shoe)s$/i': '\1'
+    '/(o)es$/i': '\1'
+    '/(bus)es$/i': '\1'
+    '/([m|l])ice$/i': '\1ouse'
+    '/(x|ch|ss|sh)es$/i': '\1'
+    '/(m)ovies$/i': '\1ovie'
+    '/(s)eries$/i': '\1eries'
+    '/([^aeiouy]|qu)ies$/i': '\1y'
+    '/([lr])ves$/i': '\1f'
+    '/(tive)s$/i': '\1'
+    '/(hive)s$/i': '\1'
+    '/([^f])ves$/i': '\1fe'
+    '/(^analy)ses$/i': '\1sis'
+    '/((a)naly|(b)a|(d)iagno|(p)arenthe|(p)rogno|(s)ynop|(t)he)ses$/i': '\1\2sis'
+    '/([ti])a$/i': '\1um'
+    '/(n)ews$/i': '\1ews'
+  INFLECTOR_UNCOUNTABLE:
+    - 'equipamento'
+    - 'informação'
+    - 'arroz'
+    - 'dinheiro'
+    - 'espécie'
+    - 'série'
+    - 'peixe'
+    - 'ovelha'
+  INFLECTOR_IRREGULAR:
+    'person': 'pessoas'
+    'man': 'homens'
+    'child': 'crianças'
+    'sex': 'sexos'
+    'move': 'movimentos'
+  INFLECTOR_ORDINALS:
+    'default': 'º'
+    'first': 'º'
+    'second': 'º'
+    'third': 'º'
   NICETIME:
     NO_DATE_PROVIDED: Nenhuma data fornecida
+    BAD_DATE: Data inválida
     AGO: atrás
+    FROM_NOW: a partir de agora
+    JUST_NOW: mesmo agora
     SECOND: segundo
     MINUTE: minuto
     HOUR: hora
@@ -11,17 +78,32 @@ GRAV:
     MONTH: mês
     YEAR: ano
     DECADE: década
-    SEC: segundos
-    MIN: minutos
+    SEC: seg
+    MIN: min
+    HR: hora
+    WK: semana
+    MO: mês
+    YR: ano
+    DEC: década
+    SECOND_PLURAL: segundos
     MINUTE_PLURAL: minutos
+    HOUR_PLURAL: horas
     DAY_PLURAL: dias
     WEEK_PLURAL: semanas
     MONTH_PLURAL: meses
     YEAR_PLURAL: anos
-    DECADE_PLURAL: decadas
+    DECADE_PLURAL: décadas
+    SEC_PLURAL: segs
+    MIN_PLURAL: mins
+    HR_PLURAL: hrs
+    WK_PLURAL: sems
+    MO_PLURAL: meses
+    YR_PLURAL: anos
+    DEC_PLURAL: décadas
   FORM:
-    VALIDATION_FAIL: <b>Falha na validação!</b>
-    MISSING_REQUIRED_FIELD: 'Campo obrigatório requerido:'
+    VALIDATION_FAIL: '<b>Falha na validação:</b>'
+    INVALID_INPUT: 'Dados inseridos são inválidos em'
+    MISSING_REQUIRED_FIELD: 'Campo obrigatório em falta:'
   MONTHS_OF_THE_YEAR:
     - 'Janeiro'
     - 'Fevereiro'
@@ -35,12 +117,28 @@ GRAV:
     - 'Outubro'
     - 'Novembro'
     - 'Dezembro'
-  INFLECTOR_UNCOUNTABLE:
-    - 'equipment'
-    - 'information'
-    - 'arroz'
-    - 'money'
-    - 'species'
-    - 'series'
-    - 'fish'
-    - 'sheep'
+  DAYS_OF_THE_WEEK:
+    - 'Segunda-feira'
+    - 'Terça-feira'
+    - 'Quarta-feira'
+    - 'Quinta-feira'
+    - 'Sexta-feira'
+    - 'Sábado'
+    - 'Domingo'
+  CRON:
+    EVERY: cada
+    EVERY_HOUR: cada hora
+    EVERY_MINUTE: cada minuto
+    EVERY_DAY_OF_WEEK: todos os dias da semana
+    EVERY_DAY_OF_MONTH: todos os dias do mês
+    EVERY_MONTH: todos os meses
+    TEXT_PERIOD: Cada <b />
+    TEXT_MINS: ' em <b /> minuto(s) após a hora'
+    TEXT_TIME: ' em <b />:<b />'
+    TEXT_DOW: ' em <b />'
+    TEXT_MONTH: ' de <b />'
+    TEXT_DOM: ' em <b />'
+    ERROR1: A tag %s não é suportada!
+    ERROR2: Número de elementos inválido
+    ERROR3: O jquery_element deve ser definido nas configurações do jqCron
+    ERROR4: Expressão não reconhecida

system/languages/ro.yaml

@@ -53,8 +53,8 @@ GRAV:
     YR_PLURAL: ani
     DEC_PLURAL: decenii
   FORM:
-    VALIDATION_FAIL: <b>Validare nereușită</b>
-    INVALID_INPUT: Date incorecte în
+    VALIDATION_FAIL: '<b>Validare nereușită</b>'
+    INVALID_INPUT: 'Date incorecte în'
     MISSING_REQUIRED_FIELD: 'Câmp obligatoriu lipsă:'
   MONTHS_OF_THE_YEAR:
     - 'Ianuarie'

system/languages/ru.yaml

@@ -13,7 +13,7 @@ GRAV:
   INFLECTOR_IRREGULAR:
     'person': 'люди'
     'man': 'человек'
-    'child': 'ребенок'
+    'child': 'дети'
     'sex': 'пол'
     'move': 'движется'
   INFLECTOR_ORDINALS:
@@ -58,9 +58,10 @@ GRAV:
     YR_PLURAL: г
     DEC_PLURAL: дстлт
   FORM:
-    VALIDATION_FAIL: <b>Проверка не удалась:</b>
-    INVALID_INPUT: Неверный ввод в
+    VALIDATION_FAIL: '<b>Проверка не удалась:</b>'
+    INVALID_INPUT: 'Неверный ввод в'
     MISSING_REQUIRED_FIELD: 'Отсутствует необходимое поле:'
+    XSS_ISSUES: "Обнаружены потенциальные XSS проблемы в поле '%s'"
   MONTHS_OF_THE_YEAR:
     - 'январь'
     - 'февраль'
@@ -68,12 +69,12 @@ GRAV:
     - 'апрель'
     - 'май'
     - 'июнь'
-    - 'Июль'
-    - 'Август'
-    - 'Сентябрь'
-    - 'Октябрь'
-    - 'Ноябрь'
-    - 'Декабрь'
+    - 'июль'
+    - 'август'
+    - 'сентябрь'
+    - 'октябрь'
+    - 'ноябрь'
+    - 'декабрь'
   DAYS_OF_THE_WEEK:
     - 'понедельник'
     - 'вторник'
@@ -82,6 +83,8 @@ GRAV:
     - 'пятница'
     - 'суббота'
     - 'воскресенье'
+  YES: "Да"
+  NO: "Нет"
   CRON:
     EVERY: раз в
     EVERY_HOUR: раз в час

system/languages/sk.yaml

@@ -101,8 +101,8 @@ GRAV:
     YR_PLURAL: rokov
     DEC_PLURAL: dekád
   FORM:
-    VALIDATION_FAIL: <b>Overenie zlyhalo:</b>
-    INVALID_INPUT: Neplatný vstup v
+    VALIDATION_FAIL: '<b>Overenie zlyhalo:</b>'
+    INVALID_INPUT: 'Neplatný vstup v'
     MISSING_REQUIRED_FIELD: 'Chýba vyžadované pole:'
   MONTHS_OF_THE_YEAR:
     - 'Január'

system/languages/sl.yaml

@@ -36,8 +36,8 @@ GRAV:
     YR_PLURAL: l
     DEC_PLURAL: des
   FORM:
-    VALIDATION_FAIL: <b>Preverjanje veljavnosti ni uspelo:</b>
-    INVALID_INPUT: Neveljaven vnos v
+    VALIDATION_FAIL: '<b>Preverjanje veljavnosti ni uspelo:</b>'
+    INVALID_INPUT: 'Neveljaven vnos v'
     MISSING_REQUIRED_FIELD: 'Manjka obvezno polje:'
   MONTHS_OF_THE_YEAR:
     - 'Januar'

system/languages/sr.yaml

@@ -0,0 +1,144 @@
+---
+GRAV:
+  FRONTMATTER_ERROR_PAGE: "---\nнаслов: %1$s\n---\n\n# Грешка: неисправан Frontmatter\n\nПутања: `%2$s`\n\n**%3$s**\n\n```\n%4$s\n```"
+  INFLECTOR_PLURALS:
+    '/(quiz)$/i': '\1zes'
+    '/^(ox)$/i': '\1en'
+    '/([m|l])ouse$/i': '\1ice'
+    '/(matr|vert|ind)ix|ex$/i': '\1ices'
+    '/(x|ch|ss|sh)$/i': '\1es'
+    '/([^aeiouy]|qu)ies$/i': '\1y'
+    '/([^aeiouy]|qu)y$/i': '\1ies'
+    '/(hive)$/i': '\1s'
+    '/(?:([^f])fe|([lr])f)$/i': '\1\2ves'
+    '/sis$/i': 'ses'
+    '/([ti])um$/i': '\1a'
+    '/(buffal|tomat)o$/i': '\1oes'
+    '/(bu)s$/i': '\1ses'
+    '/(alias|status)/i': '\1es'
+    '/(octop|vir)us$/i': '\1i'
+    '/(ax|test)is$/i': '\1es'
+    '/s$/i': 's'
+    '/$/': 's'
+  INFLECTOR_SINGULAR:
+    '/(quiz)zes$/i': '\1'
+    '/(matr)ices$/i': '\1ix'
+    '/(vert|ind)ices$/i': '\1ex'
+    '/^(ox)en/i': '\1'
+    '/(alias|status)es$/i': '\1'
+    '/([octop|vir])i$/i': '\1us'
+    '/(cris|ax|test)es$/i': '\1is'
+    '/(shoe)s$/i': '\1'
+    '/(o)es$/i': '\1'
+    '/(bus)es$/i': '\1'
+    '/([m|l])ice$/i': '\1ouse'
+    '/(x|ch|ss|sh)es$/i': '\1'
+    '/(m)ovies$/i': '\1ovie'
+    '/(s)eries$/i': '\1eries'
+    '/([^aeiouy]|qu)ies$/i': '\1y'
+    '/([lr])ves$/i': '\1f'
+    '/(tive)s$/i': '\1'
+    '/(hive)s$/i': '\1'
+    '/([^f])ves$/i': '\1fe'
+    '/(^analy)ses$/i': '\1sis'
+    '/((a)naly|(b)a|(d)iagno|(p)arenthe|(p)rogno|(s)ynop|(t)he)ses$/i': '\1\2sis'
+    '/([ti])a$/i': '\1um'
+    '/(n)ews$/i': '\1ews'
+  INFLECTOR_UNCOUNTABLE:
+    - 'опрема'
+    - 'информација'
+    - 'пиринач'
+    - 'новац'
+    - 'врсте'
+    - 'серије'
+    - 'риба'
+    - 'овца'
+  INFLECTOR_IRREGULAR:
+    'person': 'особе'
+    'man': 'људи'
+    'child': 'деца'
+    'sex': 'полови'
+    'move': 'помери'
+  INFLECTOR_ORDINALS:
+    'default': 'ти'
+    'first': 'први'
+    'second': 'други'
+    'third': 'трећи'
+  NICETIME:
+    NO_DATE_PROVIDED: Нема датума
+    BAD_DATE: Погрешан датум
+    AGO: од пре
+    FROM_NOW: од сада
+    JUST_NOW: управо сада
+    SECOND: секунда
+    MINUTE: минута
+    HOUR: сат
+    DAY: дан
+    WEEK: недеља
+    MONTH: месец
+    YEAR: година
+    DECADE: декада
+    SEC: сек
+    MIN: мин
+    HR: сат
+    WK: нед
+    MO: мес
+    YR: год
+    DEC: дек
+    SECOND_PLURAL: секунди
+    MINUTE_PLURAL: минута
+    HOUR_PLURAL: сати
+    DAY_PLURAL: дана
+    WEEK_PLURAL: недеља
+    MONTH_PLURAL: месеци
+    YEAR_PLURAL: године(а)
+    DECADE_PLURAL: декаде(а)
+    SEC_PLURAL: сек
+    MIN_PLURAL: мин
+    HR_PLURAL: сати
+    WK_PLURAL: недеља
+    MO_PLURAL: месеци
+    YR_PLURAL: година
+    DEC_PLURAL: декада
+  FORM:
+    VALIDATION_FAIL: '<b>Провера неуспела:</b>'
+    INVALID_INPUT: 'Неисправан унос у'
+    MISSING_REQUIRED_FIELD: 'Недостаје обавезн поље:'
+  MONTHS_OF_THE_YEAR:
+    - 'Јануар'
+    - 'Фебруар'
+    - 'Март'
+    - 'Април'
+    - 'Мај'
+    - 'Јуни'
+    - 'Јули'
+    - 'Август'
+    - 'Септембар'
+    - 'Октобар'
+    - 'Новембар'
+    - 'Децембар'
+  DAYS_OF_THE_WEEK:
+    - 'Понедељак'
+    - 'Уторак'
+    - 'Среда'
+    - 'Четвртак'
+    - 'Петак'
+    - 'Субота'
+    - 'Недеља'
+  CRON:
+    EVERY: сваки
+    EVERY_HOUR: сваки сат
+    EVERY_MINUTE: сваки минут
+    EVERY_DAY_OF_WEEK: сваки дан у недељи
+    EVERY_DAY_OF_MONTH: сваки дан у месецу
+    EVERY_MONTH: сваки месец
+    TEXT_PERIOD: Сваки <b />
+    TEXT_MINS: ' у <b /> минути(а) прошлог сата'
+    TEXT_TIME: ' у <b />:<b />'
+    TEXT_DOW: ' на <b />'
+    TEXT_MONTH: ' од <b />'
+    TEXT_DOM: ' на <b />'
+    ERROR1: Таг %s није подржан!
+    ERROR2: Погрешан број елемената
+    ERROR3: јquery_element би требао да буде постављен у jqCron подешавању
+    ERROR4: Непрепознат израз

system/languages/sv.yaml

@@ -12,11 +12,21 @@ GRAV:
     - 'får'
   INFLECTOR_IRREGULAR:
     'person': 'personer'
+    'man': 'män'
+    'child': 'barn'
+    'sex': 'kön'
+    'move': 'flytta'
+  INFLECTOR_ORDINALS:
+    'default': ':e'
+    'first': ':a'
+    'second': ':a'
+    'third': ':e'
   NICETIME:
     NO_DATE_PROVIDED: Inget datum har angivits
     BAD_DATE: Ogiltigt datum
     AGO: sedan
     FROM_NOW: fr.o.m nu
+    JUST_NOW: just nu
     SECOND: sekund
     MINUTE: minut
     HOUR: timme
@@ -26,10 +36,12 @@ GRAV:
     YEAR: år
     DECADE: årtionde
     SEC: sek
+    MIN: min
     HR: t
     WK: v
     MO: m
     YR: år
+    DEC: dec
     SECOND_PLURAL: sekunder
     MINUTE_PLURAL: minuter
     HOUR_PLURAL: timmar
@@ -46,8 +58,8 @@ GRAV:
     YR_PLURAL: år
     DEC_PLURAL: dec
   FORM:
-    VALIDATION_FAIL: <b>Kontrollen misslyckades:</b>
-    INVALID_INPUT: Ogiltig indata i
+    VALIDATION_FAIL: '<b>Kontrollen misslyckades:</b>'
+    INVALID_INPUT: 'Ogiltig indata i'
     MISSING_REQUIRED_FIELD: 'Obligatoriskt fält måste fyllas i:'
   MONTHS_OF_THE_YEAR:
     - 'Januari'
@@ -70,3 +82,19 @@ GRAV:
     - 'Fredag'
     - 'Lördag'
     - 'Söndag'
+  CRON:
+    EVERY: varje
+    EVERY_HOUR: varje timme
+    EVERY_MINUTE: varje minut
+    EVERY_DAY_OF_WEEK: varje veckodag
+    EVERY_DAY_OF_MONTH: alla månadens dagar
+    EVERY_MONTH: varje månad
+    TEXT_PERIOD: Varje <b />
+    TEXT_MINS: ' timmens <b />:e minut'
+    TEXT_TIME: ' kl <b />:<b />'
+    TEXT_DOW: ' <b />'
+    TEXT_MONTH: ' <b />'
+    TEXT_DOM: ' <b />'
+    ERROR1: Taggen %s stöds inte!
+    ERROR2: Ogiltigt antal element
+    ERROR4: Uttrycket känns inte igen

system/languages/th.yaml

@@ -31,7 +31,7 @@ GRAV:
     YR_PLURAL: ปี
   FORM:
     VALIDATION_FAIL: '<b>ตรวจสอบล้มเหลว: </b>'
-    INVALID_INPUT: ป้อนข้อมูลไม่ถูกต้องใน
+    INVALID_INPUT: 'ป้อนข้อมูลไม่ถูกต้องใน'
     MISSING_REQUIRED_FIELD: 'ขาดข้อมูลที่จำเป็น:'
   MONTHS_OF_THE_YEAR:
     - 'มกราคม'

system/languages/tr.yaml

@@ -1,11 +1,32 @@
 ---
 GRAV:
   FRONTMATTER_ERROR_PAGE: "---\nBaşlık: %1$s\n---\n\n# Hata: Geçersiz Önbölüm\n\nYol: `%2$s`\n\n**%3$s**\n\n```\n%4$s\n```"
+  INFLECTOR_UNCOUNTABLE:
+    - 'ekipman'
+    - 'bilgi'
+    - 'pirinç'
+    - 'para'
+    - 'türler'
+    - 'seriler'
+    - 'balık'
+    - 'koyun'
+  INFLECTOR_IRREGULAR:
+    'person': 'kişi'
+    'man': 'erkek'
+    'child': 'çocuklar'
+    'sex': 'cinsiyet'
+    'move': 'taşınmış'
+  INFLECTOR_ORDINALS:
+    'default': '#F'
+    'first': ' 1.'
+    'second': ' 2.'
+    'third': ' 3.'
   NICETIME:
     NO_DATE_PROVIDED: Sağlanan tarih yok
     BAD_DATE: Yanlış tarih
     AGO: önce
     FROM_NOW: şu andan itibaren
+    JUST_NOW: şimdi
     SECOND: saniye
     MINUTE: dakika
     HOUR: saat
@@ -37,8 +58,8 @@ GRAV:
     YR_PLURAL: yıl
     DEC_PLURAL: onyl
   FORM:
-    VALIDATION_FAIL: <b>Doğrulama başarısız:</b>
-    INVALID_INPUT: Geçersiz bilgi girişi
+    VALIDATION_FAIL: '<b>Doğrulama başarısız:</b>'
+    INVALID_INPUT: 'Geçersiz bilgi girişi'
     MISSING_REQUIRED_FIELD: 'Gerekli alan eksik:'
   MONTHS_OF_THE_YEAR:
     - 'Ocak'
@@ -61,3 +82,17 @@ GRAV:
     - 'Cuma'
     - 'Cumartesi'
     - 'Pazar'
+  CRON:
+    EVERY: her
+    EVERY_HOUR: saatte bir
+    EVERY_MINUTE: dakikada bir
+    EVERY_DAY_OF_WEEK: haftanın her günü
+    EVERY_DAY_OF_MONTH: ayın her günü
+    EVERY_MONTH: her ay
+    TEXT_PERIOD: Her <b />
+    TEXT_MINS: ' saatin <b /> dakikasında'
+    TEXT_TIME: ' da'
+    ERROR1: Etiket %s desteklenmiyor!
+    ERROR2: Kötü eleman sayısı
+    ERROR3: jquery_element jqCron ayarları içinde tanımlanmalı
+    ERROR4: Tanınmayan ifade

system/languages/uk.yaml

@@ -37,8 +37,8 @@ GRAV:
     YR_PLURAL: рр.
     DEC_PLURAL: рр.
   FORM:
-    VALIDATION_FAIL: <b>Перевірка не вдалася:</b>
-    INVALID_INPUT: Невірне введення в
+    VALIDATION_FAIL: '<b>Перевірка не вдалася:</b>'
+    INVALID_INPUT: 'Невірне введення в'
     MISSING_REQUIRED_FIELD: 'Відсутнє обов''язкове поле:'
   MONTHS_OF_THE_YEAR:
     - 'Січень'

system/languages/vi.yaml

@@ -37,8 +37,8 @@ GRAV:
     YR_PLURAL: năm
     DEC_PLURAL: thập kỷ
   FORM:
-    VALIDATION_FAIL: <b>Xác nhận thất bại:</b>
-    INVALID_INPUT: Dữ liệu nhập không hợp lệ cho
+    VALIDATION_FAIL: '<b>Xác nhận thất bại:</b>'
+    INVALID_INPUT: 'Dữ liệu nhập không hợp lệ cho'
     MISSING_REQUIRED_FIELD: 'Thiếu trường bắt buộc:'
   MONTHS_OF_THE_YEAR:
     - 'Tháng 1'

system/languages/zh-cn.yaml

@@ -0,0 +1,144 @@
+---
+GRAV:
+  FRONTMATTER_ERROR_PAGE: "---\n标题: %1$s\n---\n\n# 错误：无效参数\n\n位置： `%2$s`\n\n**%3$s**\n\n```\n%4$s\n```"
+  INFLECTOR_PLURALS:
+    '/(quiz)$/i': '\1zes'
+    '/^(ox)$/i': '\1en'
+    '/([m|l])ouse$/i': '\1ice'
+    '/(matr|vert|ind)ix|ex$/i': '\1ices'
+    '/(x|ch|ss|sh)$/i': '\1es'
+    '/([^aeiouy]|qu)ies$/i': '\1y'
+    '/([^aeiouy]|qu)y$/i': '\1ies'
+    '/(hive)$/i': '\1s'
+    '/(?:([^f])fe|([lr])f)$/i': '\1\2ves'
+    '/sis$/i': 'ses'
+    '/([ti])um$/i': '\1a'
+    '/(buffal|tomat)o$/i': '\1oes'
+    '/(bu)s$/i': '\1ses'
+    '/(alias|status)/i': '\1es'
+    '/(octop|vir)us$/i': '\1i'
+    '/(ax|test)is$/i': '\1es'
+    '/s$/i': 's'
+    '/$/': 's'
+  INFLECTOR_SINGULAR:
+    '/(quiz)zes$/i': '\1'
+    '/(matr)ices$/i': '\1ix'
+    '/(vert|ind)ices$/i': '\1ex'
+    '/^(ox)en/i': '\1'
+    '/(alias|status)es$/i': '\1'
+    '/([octop|vir])i$/i': '\1us'
+    '/(cris|ax|test)es$/i': '\1is'
+    '/(shoe)s$/i': '\1'
+    '/(o)es$/i': '\1'
+    '/(bus)es$/i': '\1'
+    '/([m|l])ice$/i': '\1ouse'
+    '/(x|ch|ss|sh)es$/i': '\1'
+    '/(m)ovies$/i': '\1ovie'
+    '/(s)eries$/i': '\1eries'
+    '/([^aeiouy]|qu)ies$/i': '\1y'
+    '/([lr])ves$/i': '\1f'
+    '/(tive)s$/i': '\1'
+    '/(hive)s$/i': '\1'
+    '/([^f])ves$/i': '\1fe'
+    '/(^analy)ses$/i': '\1sis'
+    '/((a)naly|(b)a|(d)iagno|(p)arenthe|(p)rogno|(s)ynop|(t)he)ses$/i': '\1\2sis'
+    '/([ti])a$/i': '\1um'
+    '/(n)ews$/i': '\1ews'
+  INFLECTOR_UNCOUNTABLE:
+    - '装备'
+    - '信息'
+    - '大米'
+    - '钱'
+    - '物种'
+    - '系列'
+    - '鱼'
+    - '羊'
+  INFLECTOR_IRREGULAR:
+    'person': '人员'
+    'man': '男人'
+    'child': '儿童'
+    'sex': '性别'
+    'move': '移动'
+  INFLECTOR_ORDINALS:
+    'default': 'th'
+    'first': 'st'
+    'second': 'md'
+    'third': 'rd'
+  NICETIME:
+    NO_DATE_PROVIDED: 无日期信息
+    BAD_DATE: 无效日期
+    AGO: 前
+    FROM_NOW: 距今
+    JUST_NOW: 刚刚
+    SECOND: 秒
+    MINUTE: 分钟
+    HOUR: 小时
+    DAY: 天
+    WEEK: 周
+    MONTH: 月
+    YEAR: 年
+    DECADE: 十年
+    SEC: 秒
+    MIN: 分钟
+    HR: 小时
+    WK: 周
+    MO: 月
+    YR: 年
+    DEC: 年代
+    SECOND_PLURAL: 秒
+    MINUTE_PLURAL: 分
+    HOUR_PLURAL: 小时
+    DAY_PLURAL: 天
+    WEEK_PLURAL: 周
+    MONTH_PLURAL: 月
+    YEAR_PLURAL: 年
+    DECADE_PLURAL: 十年
+    SEC_PLURAL: 秒
+    MIN_PLURAL: 分
+    HR_PLURAL: 时
+    WK_PLURAL: 周
+    MO_PLURAL: 月
+    YR_PLURAL: 年
+    DEC_PLURAL: 年代
+  FORM:
+    VALIDATION_FAIL: '<b>验证失败：</b>'
+    INVALID_INPUT: '无效输入'
+    MISSING_REQUIRED_FIELD: '必填字段缺失：'
+  MONTHS_OF_THE_YEAR:
+    - '1月'
+    - '2月'
+    - '3月'
+    - '4月'
+    - '5月'
+    - '6月'
+    - '7月'
+    - '8月'
+    - '9月'
+    - '10月'
+    - '11月'
+    - '12月'
+  DAYS_OF_THE_WEEK:
+    - '星期一'
+    - '星期二'
+    - '星期三'
+    - '星期四'
+    - '星期五'
+    - '星期六'
+    - '星期日'
+  CRON:
+    EVERY: 每隔
+    EVERY_HOUR: 每小时
+    EVERY_MINUTE: 每分钟
+    EVERY_DAY_OF_WEEK: 一周中的每一天
+    EVERY_DAY_OF_MONTH: 月份中的每一天
+    EVERY_MONTH: 每月
+    TEXT_PERIOD: 所有 <b />
+    TEXT_MINS: ' 在 <b /> 小时过后的分钟'
+    TEXT_TIME: ' 在 <b />:<b />'
+    TEXT_DOW: ' on <b />'
+    TEXT_MONTH: ' of <b />'
+    TEXT_DOM: ' on <b />'
+    ERROR1: 不支持分享类型 %s
+    ERROR2: 无效数字
+    ERROR3: 请在 jqCron 设置中设定 jquery_element
+    ERROR4: 无法识别表达式

system/languages/zh.yaml

@@ -101,9 +101,9 @@ GRAV:
     YR_PLURAL: 年
     DEC_PLURAL: 年代
   FORM:
-    VALIDATION_FAIL: <b>验证失败：</b>
-    INVALID_INPUT: 无效输入
-    MISSING_REQUIRED_FIELD: 必填字段缺失：
+    VALIDATION_FAIL: '<b>验证失败：</b>'
+    INVALID_INPUT: '无效输入'
+    MISSING_REQUIRED_FIELD: '必填字段缺失：'
   MONTHS_OF_THE_YEAR:
     - '1月'
     - '2月'

system/pages/notfound.md

@@ -2,4 +2,5 @@
 title: Not Found
 routable: false
 notfound: true
+expires: 0
 ---

system/router.php

@@ -3,7 +3,7 @@
 /**
  * @package    Grav\Core
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2021 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 

system/src/Grav/Common/Assets.php

@@ -3,30 +3,41 @@
 /**
  * @package    Grav\Common
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2021 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Common;
 
+use Closure;
 use Grav\Common\Assets\Pipeline;
 use Grav\Common\Assets\Traits\LegacyAssetsTrait;
 use Grav\Common\Assets\Traits\TestingAssetsTrait;
 use Grav\Common\Config\Config;
 use Grav\Framework\Object\PropertyObject;
 use RocketTheme\Toolbox\ResourceLocator\UniformResourceLocator;
+use function call_user_func_array;
+use function count;
+use function func_get_args;
+use function is_array;
 
+/**
+ * Class Assets
+ * @package Grav\Common
+ */
 class Assets extends PropertyObject
 {
     use TestingAssetsTrait;
     use LegacyAssetsTrait;
 
+    const CSS = 'css';
+    const JS = 'js';
     const CSS_COLLECTION = 'assets_css';
     const JS_COLLECTION = 'assets_js';
-    const CSS_TYPE = 'Css';
-    const JS_TYPE = 'Js';
-    const INLINE_CSS_TYPE = 'InlineCss';
-    const INLINE_JS_TYPE = 'InlineJs';
+    const CSS_TYPE = Assets\Css::class;
+    const JS_TYPE = Assets\Js::class;
+    const INLINE_CSS_TYPE = Assets\InlineCss::class;
+    const INLINE_JS_TYPE = Assets\InlineJs::class;
 
     /** @const Regex to match CSS and JavaScript files */
     const DEFAULT_REGEX = '/.\.(css|js)$/i';
@@ -37,31 +48,57 @@ class Assets extends PropertyObject
     /** @const Regex to match JavaScript files */
     const JS_REGEX = '/.\.js$/i';
 
+    /** @var string */
     protected $assets_dir;
+    /** @var string */
     protected $assets_url;
 
+    /** @var array */
     protected $assets_css = [];
+    /** @var array */
     protected $assets_js = [];
 
-    // Config Options
+    // Following variables come from the configuration:
+    /** @var bool */
     protected $css_pipeline;
+    /** @var bool */
     protected $css_pipeline_include_externals;
+    /** @var bool */
     protected $css_pipeline_before_excludes;
+    /** @var bool */
+    protected $inlinecss_pipeline_include_externals;
+    /** @var bool */
+    protected $inlinecss_pipeline_before_excludes;
+    /** @var bool */
     protected $js_pipeline;
+    /** @var bool */
     protected $js_pipeline_include_externals;
+    /** @var bool */
     protected $js_pipeline_before_excludes;
+    /** @var bool */
+    protected $inlinejs_pipeline_include_externals;
+    /** @var bool */
+    protected $inlinejs_pipeline_before_excludes;
+    /** @var array */
     protected $pipeline_options = [];
 
-
+    /** @var Closure|string */
     protected $fetch_command;
+    /** @var string */
     protected $autoload;
+    /** @var bool */
     protected $enable_asset_timestamp;
+    /** @var array|null */
     protected $collections;
+    /** @var string */
     protected $timestamp;
-
+    /** @var array Keeping track for order counts (for sorting) */
+    protected $order = [];
 
     /**
      * Initialization called in the Grav lifecycle to initialize the Assets with appropriate configuration
+     *
+     * @return void
      */
     public function init()
     {
@@ -92,7 +129,6 @@ class Assets extends PropertyObject
      * assets and/or collections that will be automatically added on startup.
      *
      * @param  array $config Configurable options.
-     *
      * @return $this
      */
     public function config(array $config)
@@ -119,35 +155,35 @@ class Assets extends PropertyObject
      * It automatically detects the asset type (JavaScript, CSS or collection).
      * You may add more than one asset passing an array as argument.
      *
-     * @param array|string $asset
+     * @param string|string[] $asset
      * @return $this
      */
     public function add($asset)
     {
-        $args = \func_get_args();
+        $args = func_get_args();
 
         // More than one asset
-        if (\is_array($asset)) {
+        if (is_array($asset)) {
             foreach ($asset as $a) {
                 array_shift($args);
                 $args = array_merge([$a], $args);
-                \call_user_func_array([$this, 'add'], $args);
+                call_user_func_array([$this, 'add'], $args);
             }
         } elseif (isset($this->collections[$asset])) {
             array_shift($args);
             $args = array_merge([$this->collections[$asset]], $args);
-            \call_user_func_array([$this, 'add'], $args);
+            call_user_func_array([$this, 'add'], $args);
         } else {
             // Get extension
             $extension = pathinfo(parse_url($asset, PHP_URL_PATH), PATHINFO_EXTENSION);
 
             // JavaScript or CSS
-            if (\strlen($extension) > 0) {
+            if ($extension !== '') {
                 $extension = strtolower($extension);
                 if ($extension === 'css') {
-                    \call_user_func_array([$this, 'addCss'], $args);
+                    call_user_func_array([$this, 'addCss'], $args);
                 } elseif ($extension === 'js') {
-                    \call_user_func_array([$this, 'addJs'], $args);
+                    call_user_func_array([$this, 'addJs'], $args);
                 }
             }
         }
@@ -155,12 +191,20 @@ class Assets extends PropertyObject
         return $this;
     }
 
+    /**
+     * @param string $collection
+     * @param string $type
+     * @param string|string[] $asset
+     * @param array $options
+     * @return $this
+     */
     protected function addType($collection, $type, $asset, $options)
     {
-        if (\is_array($asset)) {
+        if (is_array($asset)) {
             foreach ($asset as $a) {
                 $this->addType($collection, $type, $a, $options);
             }
+
             return $this;
         }
 
@@ -172,7 +216,7 @@ class Assets extends PropertyObject
         // If pipeline disabled, set to position if provided, else after
         if (isset($options['pipeline'])) {
             if ($options['pipeline'] === false) {
-                $exclude_type = ($type === $this::JS_TYPE || $type === $this::INLINE_JS_TYPE) ? $this::JS_TYPE : $this::CSS_TYPE;
+                $exclude_type = ($type === $this::JS_TYPE || $type === $this::INLINE_JS_TYPE) ? $this::JS : $this::CSS;
                 $excludes = strtolower($exclude_type . '_pipeline_before_excludes');
                 if ($this->{$excludes}) {
                     $default = 'after';
@@ -190,11 +234,18 @@ class Assets extends PropertyObject
         $options['timestamp'] = $this->timestamp;
 
         // Set order
-        $options['order'] = \count($this->$collection);
+        $group = $options['group'] ?? 'head';
+        $position = $options['position'] ?? 'pipeline';
+
+        $orderKey = "{$type}|{$group}|{$position}";
+        if (!isset($this->order[$orderKey])) {
+           $this->order[$orderKey] = 0;
+        }
+
+        $options['order'] = $this->order[$orderKey]++;
 
         // Create asset of correct type
-        $asset_class = "\\Grav\\Common\\Assets\\{$type}";
-        $asset_object = new $asset_class();
+        $asset_object = new $type();
 
         // If exists
         if ($asset_object->init($asset, $options)) {
@@ -202,7 +253,6 @@ class Assets extends PropertyObject
         }
 
         return $this;
-
     }
 
     /**
@@ -212,7 +262,7 @@ class Assets extends PropertyObject
      */
     public function addCss($asset)
     {
-        return $this->addType(Assets::CSS_COLLECTION,Assets::CSS_TYPE, $asset, $this->unifyLegacyArguments(\func_get_args(), Assets::CSS_TYPE));
+        return $this->addType($this::CSS_COLLECTION, $this::CSS_TYPE, $asset, $this->unifyLegacyArguments(func_get_args(), $this::CSS_TYPE));
     }
 
     /**
@@ -222,7 +272,7 @@ class Assets extends PropertyObject
      */
     public function addInlineCss($asset)
     {
-        return $this->addType(Assets::CSS_COLLECTION, Assets::INLINE_CSS_TYPE, $asset, $this->unifyLegacyArguments(\func_get_args(), Assets::INLINE_CSS_TYPE));
+        return $this->addType($this::CSS_COLLECTION, $this::INLINE_CSS_TYPE, $asset, $this->unifyLegacyArguments(func_get_args(), $this::INLINE_CSS_TYPE));
     }
 
     /**
@@ -232,7 +282,7 @@ class Assets extends PropertyObject
      */
     public function addJs($asset)
     {
-        return $this->addType(Assets::JS_COLLECTION, Assets::JS_TYPE, $asset, $this->unifyLegacyArguments(\func_get_args(), Assets::JS_TYPE));
+        return $this->addType($this::JS_COLLECTION, $this::JS_TYPE, $asset, $this->unifyLegacyArguments(func_get_args(), $this::JS_TYPE));
     }
 
     /**
@@ -242,20 +292,19 @@ class Assets extends PropertyObject
      */
     public function addInlineJs($asset)
     {
-        return $this->addType(Assets::JS_COLLECTION, Assets::INLINE_JS_TYPE, $asset, $this->unifyLegacyArguments(\func_get_args(), Assets::INLINE_JS_TYPE));
+        return $this->addType($this::JS_COLLECTION, $this::INLINE_JS_TYPE, $asset, $this->unifyLegacyArguments(func_get_args(), $this::INLINE_JS_TYPE));
     }
 
 
     /**
      * Add/replace collection.
      *
-     * @param  string $collectionName
-     * @param  array  $assets
+     * @param string $collectionName
+     * @param array  $assets
      * @param bool    $overwrite
-     *
      * @return $this
      */
-    public function registerCollection($collectionName, Array $assets, $overwrite = false)
+    public function registerCollection($collectionName, array $assets, $overwrite = false)
     {
         if ($overwrite || !isset($this->collections[$collectionName])) {
             $this->collections[$collectionName] = $assets;
@@ -264,26 +313,33 @@ class Assets extends PropertyObject
         return $this;
     }
 
+    /**
+     * @param array $assets
+     * @param string $key
+     * @param string $value
+     * @param bool $sort
+     * @return array|false
+     */
     protected function filterAssets($assets, $key, $value, $sort = false)
     {
-        $results = array_filter($assets, function($asset) use ($key, $value) {
+        $results = array_filter($assets, function ($asset) use ($key, $value) {
 
             if ($key === 'position' && $value === 'pipeline') {
-
                 $type = $asset->getType();
 
-                if ($asset->getRemote() && $this->{$type . '_pipeline_include_externals'} === false && $asset['position'] === 'pipeline' ) {
-                    if ($this->{$type . '_pipeline_before_excludes'}) {
+                if ($asset->getRemote() && $this->{strtolower($type) . '_pipeline_include_externals'} === false && $asset['position'] === 'pipeline') {
+                    if ($this->{strtolower($type) . '_pipeline_before_excludes'}) {
                         $asset->setPosition('after');
                     } else {
                         $asset->setPosition('before');
                     }
                     return false;
                 }
-
             }
 
-            if ($asset[$key] === $value) return true;
+            if ($asset[$key] === $value) {
+                return true;
+            }
             return false;
         });
 
@@ -295,17 +351,25 @@ class Assets extends PropertyObject
         return $results;
     }
 
+    /**
+     * @param array $assets
+     * @return array
+     */
     protected function sortAssets($assets)
     {
-        uasort ($assets, function($a, $b) {
-            if ($a['priority'] == $b['priority']) {
-                return $a['order'] - $b['order'];
-            }
-            return $b['priority'] - $a['priority'];
+        uasort($assets, static function ($a, $b) {
+            return $b['priority'] <=> $a['priority'] ?: $a['order'] <=> $b['order'];
         });
+
         return $assets;
     }
 
+    /**
+     * @param string $type
+     * @param string $group
+     * @param array $attributes
+     * @return string
+     */
     public function render($type, $group = 'head', $attributes = [])
     {
         $before_output = '';
@@ -352,7 +416,6 @@ class Assets extends PropertyObject
      *
      * @param  string $group name of the group
      * @param  array  $attributes
-     *
      * @return string
      */
     public function css($group = 'head', $attributes = [])
@@ -365,7 +428,6 @@ class Assets extends PropertyObject
      *
      * @param  string $group name of the group
      * @param  array  $attributes
-     *
      * @return string
      */
     public function js($group = 'head', $attributes = [])