prepare for release

# Conflicts:
#	CHANGELOG.md
#	composer.lock
#	system/defines.php

.dependencies

@@ -7,9 +7,13 @@ git:
         url: https://github.com/getgrav/grav-plugin-error
         path: user/plugins/error
         branch: master
-    antimatter:
+    markdown-notices:
-        url: https://github.com/getgrav/grav-theme-antimatter
+        url: https://github.com/getgrav/grav-plugin-markdown-notices
-        path: user/themes/antimatter
+        path: user/plugins/markdown-notices
+        branch: master
+    quark:
+        url: https://github.com/getgrav/grav-theme-quark
+        path: user/themes/quark
         branch: master
 links:
     problems:
@@ -20,7 +24,11 @@ links:
         src: grav-plugin-error
         path: user/plugins/error
         scm: github
-    antimatter:
+    markdown-notices:
-        src: grav-theme-antimatter
+        src: grav-plugin-markdown-notices
-        path: user/themes/antimatter
+        path: user/plugins/markdown-notices
+        scm: github
+    quark:
+        src: grav-theme-quark
+        path: user/themes/quark
         scm: github

.gitignore

@@ -1,6 +1,7 @@
 # Composer
 .composer
-vendor/
+vendor/*
+!*/vendor/*
 
 # Sass
 .sass-cache
@@ -16,12 +17,16 @@ logs/*
 !logs/.*
 images/*
 !images/.*
+user/accounts/*
+!user/accounts/.*
 user/data/*
 !user/data/.*
 user/plugins/*
 !user/plugins/.*
 user/themes/*
 !user/themes/.*
+user/localhost/config/security.yaml
+user/config/security.yaml
 
 # OS Generated
 .DS_Store*
@@ -32,3 +37,8 @@ Thumbs.db
 
 # phpstorm
 .idea/*
+
+tests/_output/*
+tests/_support/_generated/*
+tests/cache/*
+tests/error.log

.htaccess

@@ -3,7 +3,7 @@
 RewriteEngine On
 
 ## Begin RewriteBase
-# If you are getting 404 errors on subpages, you may have to uncomment the RewriteBase entry
+# If you are getting 500 or 404 errors on subpages, you may have to uncomment the RewriteBase entry
 # You should change the '/' to your appropriate subfolder. For example if you have
 # your Grav install at the root of your site '/' should work, else it might be something
 # along the lines of: RewriteBase /<your_sub_folder>
@@ -13,6 +13,16 @@ RewriteEngine On
 
 ## End - RewriteBase
 
+## Begin - X-Forwarded-Proto
+# In some hosted or load balanced environments, SSL negotiation happens upstream.
+# In order for Grav to recognize the connection as secure, you need to uncomment
+# the following lines.
+#
+# RewriteCond %{HTTP:X-Forwarded-Proto} https
+# RewriteRule .* - [E=HTTPS:on]
+#
+## End - X-Forwarded-Proto
+
 ## Begin - Exploits
 # 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
@@ -44,15 +54,17 @@ RewriteRule .* index.php [L]
 
 ## Begin - Security
 # Block all direct access for these folders
-RewriteRule ^(.git|cache|bin|logs|backup)/(.*) error [L]
+RewriteRule ^(\.git|cache|bin|logs|backup|webserver-configs|tests)/(.*) error [F]
-# Block access to specific file types for these folders
+# Block access to specific file types for these system folders
-RewriteRule ^(system|user|vendor)/(.*)\.(txt|md|html|yaml|php|twig|sh|bat)$ error [L]
+RewriteRule ^(system|vendor)/(.*)\.(txt|xml|md|html|yaml|yml|php|pl|py|cgi|twig|sh|bat)$ error [F]
+# Block access to specific file types for these user folders
+RewriteRule ^(user)/(.*)\.(txt|md|yaml|yml|php|pl|py|cgi|twig|sh|bat)$ error [F]
 # Block all direct access to .md files:
-RewriteRule \.md$ error [L]
+RewriteRule \.md$ error [F]
 # Block all direct access to files and folders beginning with a dot
-RewriteRule (^\.|/\.) - [F]
+RewriteRule (^|/)\.(?!well-known) - [F]
 # Block access to specific files in the root folder
-RewriteRule ^(LICENSE|composer.lock|composer.json|nginx.conf|web.config)$ error [F]
+RewriteRule ^(LICENSE\.txt|composer\.lock|composer\.json|\.htaccess)$ error [F]
 ## End - Security
 
 </IfModule>

.travis.yml

@@ -1,7 +1,12 @@
 language: php
-php: 5.6
+php:
+  - '5.6'
+  - '7.0.21'
+  - '7.1'
+  - '7.2'
 branches:
   only:
+    - develop
     - master
     - build_test
 notifications:
@@ -13,8 +18,10 @@ notifications:
     rooms:
       - secure: "bqO0wM1B7bJnQw2fuhquSXEqI9gw6WmFytIh9sEWXzbYTzTUP5t0PcKOd3FT2BNMRaDxPJLVl+vG/oqmqDUBkEmOGcG504IQjeNzZqnMz0tXQMIcCc22Las9tFfc4Jf6RVi/qGomFtHGE9Wgii+TAN4zqZaufbNjwd8SyjO0+W8="
     template:
-      - '%{repository}#%{build_number} (%{branch}): Grav Core and Skeletons packages have been uploaded. (<a href="%{build_url}">Details</a>)'
+      - '%{repository}#%{build_number} (%{branch}): Travis Job Finished [%{duration}] (<a href="%{build_url}">Details</a>)'
     format: html
+  slack:
+    secure: dowksPsxxCxGKT6nis5hUgkp6+ZDAhoqzQHF9rJnx4hx0iEygPhVBs7pKl9yL2jubYJoLs+EXwE7z1dYgDAEJh4BnfrCokCMLpFGcxVxQC/HeAUdSQ2/RtdBYR5PRT75ScaFpqM/SfXXZVtnwVXAw9Z+JC6BjQ9vmn23m51Jw4k=
 env:
   global:
     # Colors!
@@ -31,24 +38,39 @@ env:
     - GOPATH="$HOME/go"
     - PATH="$GOPATH/bin:$PATH"
     # GH_TOKEN [API Key]
-    - secure: "jS+c+g2v33vypG4VtqiSDW2qQ4dGJZlrUKBRCztoy1yrOrYRPvc5Vzi/AS3fDmZ4yizukEwmUNNzyZQcgFvLPpmCCml46Dovp8R9OXhbNe8OnULmaSn2Zkr71oblMYu6ZP+RpYvNq0BIdSB3u2TiFriHMiTIkX9UwZNaUCOX1ig="
+    - secure: "NR9pV7YteY9OoPmjDTQG0fDfocVu+tCeiDH1F2GFhXCu71UOIvqWXpOxp0RHkG5GIXdCFHx59yu+ZO275lbaHkbF8+4lVSVrV4RcGn+pIncvxr6iZCVW05dbAxV3H8alK+xYJRGmbyfQl5wIM49WvmuGHZjcmIloS4t/omQ3N+I="
     # BB_TOKEN value => "user:pass@"
     - secure: "einUtSEkUWy2IrqLXyVjwUU+mwaaoiOXRRVdLBpA3Zye6bZx8cm5h/5AplkPWhM/NmCJoW/MwNZHHkFhlr3mDRov5iOxVmTTYfnXB+I5lxYTSgduOLLErS7mU8hfADpVDU8bHNU44fNGD3UEiG1PD4qQBX4DMlqIFmR20mjs81k="
     # GH_API_USER [for curl]
-    - secure: "Xbk/V9aIys0NxccJGR3Zrm2GRxDnA0RuazBs1puIboTYDhbi0Z7JTL+mOx3xp5Kfoniad/xAuijQESTM9MMrKqq/qCzhAMaC1+vcL4pCHZH4NSG6DBxB9BPkKVFq+1llu5FTEf8bkxHzwGR0l1ARW6TVRcgTHr5B58bCEIwEOrI="
+    - secure: "AQGcX1B2NrI8ajflY4AimZDNcK2kBA3F6mbtEFQ78NkDoWhMipsQHayWXiSTzRc0YJKvQl2Y16MTwQF4VHzjTAiiZFATgA8J88vQUjIPabi/kKjqSmcLFoaAOAxStQbW6e0z2GiQ6KBMcNF1y5iUuI63xVrBvtKrYX/w5y+ako8="
-    # Latest Release version
-    - 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)
 
 before_install:
+  - export TZ=Pacific/Honolulu
+  - echo $TRAVIS_PHP_VERSION
+  - echo $TRAVIS_BRANCH
+  - echo $TRAVIS_PULL_REQUEST
   - composer self-update
-  - go get github.com/aktau/github-release
+  - if [ $TRAVIS_BRANCH == 'develop' ] || [ $TRAVIS_PULL_REQUEST != 'false' ]; then
-  - git clone --quiet --depth=50 --branch=master https://${BB_TOKEN}bitbucket.org/rockettheme/grav-devtools.git $RT_DEVTOOLS  &>/dev/null;
+        composer install --dev --prefer-dist;
-  - if [ ! -z "$TRAVIS_TAG" ]; then
-      cd "${RT_DEVTOOLS}";
-      ./build-grav.sh skeletons.txt;
     fi
+  - if [ $TRAVIS_BRANCH != 'develop' ] && [ $TRAVIS_PHP_VERSION == "5.6" ] && [ $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;
+        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};
+            ./build-grav.sh skeletons.txt;
+        fi;
+    fi
+before_script:
+    - if [ $TRAVIS_PHP_VERSION != 'hhvm' ]; then phpenv config-rm xdebug.ini; fi
 script:
-  - if [ ! -z "$TRAVIS_TAG" ]; then
+  - if [ $TRAVIS_BRANCH == 'develop' ] || [ $TRAVIS_PULL_REQUEST != 'false' ]; then
+        vendor/bin/codecept run;
+    fi
+  - echo "Latest Release Tag - ${TRAVIS_TAG}"
+  - if [ ! -z "$TRAVIS_TAG" ] && [ $TRAVIS_BRANCH != 'develop' ] && [ $TRAVIS_PHP_VERSION == "5.6" ] && [ $TRAVIS_PULL_REQUEST == "false" ]; then
       FILES="$RT_DEVTOOLS/grav-dist/*.zip";
       for file in ${FILES[@]}; do
         NAME=${file##*/};

CODE_OF_CONDUCT.md

@@ -0,0 +1,46 @@
+# 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.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment 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
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or advances
+* Trolling, insulting/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
+
+## Our 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.
+
+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.
+
+## 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.
+
+## 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.
+
+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.
+
+## 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]
+
+[homepage]: http://contributor-covenant.org
+[version]: http://contributor-covenant.org/version/1/4/

CONTRIBUTING.md

@@ -0,0 +1,137 @@
+# Contributing to Grav
+
+:+1::tada: First, thanks for getting involved with Grav! :tada::+1:
+
+Please take a moment to review this document in order to make the contribution
+process easy and effective for everyone involved.
+
+Following these guidelines helps to communicate that you respect the time of
+the developers managing and developing this open source project. In return,
+they should reciprocate that respect in addressing your issue or assessing
+patches and features.
+
+## Grav, Plugins, Themes and Skeletons
+
+Grav is a large open source project — it's made up of over 100 repositories. When you initially consider contributing to Grav, you might be unsure about which of those 200 repositories implements the functionality you want to change or report a bug for.
+
+[https://github.com/getgrav/grav](https://github.com/getgrav/grav) is the main Grav repository. The core of Grav is provided by this repo.
+
+[https://github.com/getgrav/grav-plugin-admin](https://github.com/getgrav/grav-plugin-admin) is the Admin Plugin repository.
+
+Every Plugin and Theme has its own repository. If you have a problem you think is specific to a Theme or Plugin, please report it in its corresponding repository. Please read the Plugin or Theme documentation to ensure the problem is not addressed there already.
+
+Every Skeleton also has its own repository, so if an issue is not specific to a theme or plugin but rather to its usage in the skeleton, report it in the skeleton repository.
+
+## Using the issue tracker
+
+The issue tracker is the preferred channel for [bug reports](#bugs),
+[features requests](#features) and [submitting pull
+requests](#pull-requests), but please respect the following restrictions:
+
+* Please **do not** use the issue tracker for support requests. Use
+  [the Forum](http://getgrav.org/forum) or [the Gitter chat](https://gitter.im/getgrav/grav).
+
+
+<a name="bugs"></a>
+## Bug reports
+
+A bug is a _demonstrable problem_ that is caused by the code in the repository.
+Good bug reports are extremely helpful - thank you!
+
+Guidelines for bug reports:
+
+1. **Check you satisfy the Grav requirements** &mdash; [http://learn.getgrav.org/basics/requirements](http://learn.getgrav.org/basics/requirements)
+
+2. **Check this happens on a clean Grav install** &mdash; check if the issue happens on any Grav site, or just with a specific configuration of plugins / theme
+
+3. **Use the GitHub issue search** &mdash; check if the issue has already been
+   reported.
+
+4. **Check if the issue is already being solved in a PR** &mdash; check the open Pull Requests to see if one already solves the problem you're having
+
+5. **Check if the issue has been fixed** &mdash; try to reproduce it using the
+   latest `develop` branch in the repository.
+
+6. **Isolate the problem** &mdash; create a [reduced test
+   case](http://css-tricks.com/reduced-test-cases/) and provide a step-by-step instruction set on how to recreate the problem. Include code samples, page snippets or yaml configurations if needed.
+
+7. **Check the problem on Grav 1.1** &mdash; if you're using Grav 1.0, latest stable release, please also check if you can replicate the issue on Grav 1.1 RC as many bugs are already solved in the next Grav release.
+
+A good bug report shouldn't leave others needing to chase you up for more
+information. Please try to be as detailed as possible in your report.
+
+- What is your environment? Is it localhost, OSX, Linux, on a remote server? Same happening locally and or the server, or just locally or just on Linux?
+
+- What steps will reproduce the issue? What browser(s) and OS experience the problem?
+
+- What would you expect to be the outcome?
+
+- Did the problem start happening recently (e.g. after updating to a new version of Grav) or was this always a problem?
+
+- If the problem started happening recently, can you reproduce the problem in an older version of Grav? What's the most recent version in which the problem doesn't happen? You can download older versions of Grav from the releases page on Github.
+
+- Can you reliably reproduce the issue? If not, provide details about how often the problem happens and under which conditions it normally happens.
+
+
+All these details will help contributors to fix any potential bugs.
+
+Important: [include Code Samples in triple backticks](https://help.github.com/articles/github-flavored-markdown/#fenced-code-blocks) so that Github will provide a proper indentation. [Add the language name after the backticks](https://help.github.com/articles/github-flavored-markdown/#syntax-highlighting) to add syntax highlighting to the code snippets.
+
+Example:
+
+> Short and descriptive example bug report title
+>
+> A summary of the issue and the browser/OS environment in which it occurs. If
+> suitable, include the steps required to reproduce the bug.
+>
+> 1. This is the first step
+> 2. This is the second step
+> 3. Further steps, etc.
+>>
+> Any other information you want to share that is relevant to the issue being
+> reported. This might include the lines of code that you have identified as
+> causing the bug, and potential solutions (and your opinions on their
+> merits).
+
+
+<a name="features"></a>
+## Feature requests
+
+Feature requests are welcome. But take a moment to find out whether your idea
+fits with the scope and aims of the project. It's up to *you* to make a strong
+case to convince the project's developers of the merits of this feature. Please
+provide as much detail and context as possible.
+
+
+<a name="pull-requests"></a>
+## Pull requests
+
+Good pull requests - patches, improvements, new features - are a fantastic
+help. They should remain focused in scope and avoid containing unrelated
+commits.
+
+**Please ask first** in [Slack](https://getgrav.org/slack) or in the Forum before embarking on any significant pull request (e.g.
+implementing features, refactoring code..),
+otherwise you risk spending a lot of time working on something that the
+project's developers might not want to merge into the project.
+
+Please adhere to the coding conventions used throughout the project (indentation,
+accurate comments, etc.) and any other requirements.
+
+See [Using Pull Request](https://help.github.com/articles/using-pull-requests/) and [Fork a Repo](https://help.github.com/articles/fork-a-repo/) if you're not familiar with Pull Requests.
+
+Any pull request should be based on the `develop` branch. We will not consider pull requests made to master.
+
+**IMPORTANT**: By submitting a patch, you agree to allow the project owner to
+license your work under the same license as that used by the project.
+
+<a name="translations"></a>
+### Translations
+Translations for Grav core and the Admin plugin are managed through Crowdin:
+
+- Admin: https://crowdin.com/project/grav-admin
+- Core: https://crowdin.com/project/grav-core
+
+Please do not post translations PRs for core or admin translations on GitHub, with the exception of fixes for the english language.
+
+All other plugins and themes translations are handled directly in their GitHub repository, and the string are usually found in the `languages.yaml` file at the root of each project.

LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2014 Grav
+Copyright (c) 2018 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

@@ -1,6 +1,6 @@
 # ![](https://avatars1.githubusercontent.com/u/8237355?v=2&s=50) Grav
 
-[![SensioLabsInsight](https://insight.sensiolabs.com/projects/cfd20465-d0f8-4a0a-8444-467f5b5f16ad/mini.png)](https://insight.sensiolabs.com/projects/cfd20465-d0f8-4a0a-8444-467f5b5f16ad) [![Gitter](https://badges.gitter.im/Join Chat.svg)](https://gitter.im/getgrav/grav?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+[![SensioLabsInsight](https://insight.sensiolabs.com/projects/cfd20465-d0f8-4a0a-8444-467f5b5f16ad/mini.png)](https://insight.sensiolabs.com/projects/cfd20465-d0f8-4a0a-8444-467f5b5f16ad) [![Slack](https://grav-chat.now.sh/badge.svg)](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)
 
 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.
 
@@ -9,25 +9,33 @@ The underlying architecture of Grav is designed to use well-established and _bes
 * [Twig Templating](http://twig.sensiolabs.org/): for powerful control of the user interface
 * [Markdown](http://en.wikipedia.org/wiki/Markdown): for easy content creation
 * [YAML](http://yaml.org): for simple configuration
-* [Parsedown](http://parsedown.org/): for fast Markdown and Mardown Extra support
+* [Parsedown](http://parsedown.org/): for fast Markdown and Markdown Extra support
-* [Doctrine Cache](http://docs.doctrine-project.org/en/2.0.x/reference/caching.html): layer for performance
+* [Doctrine Cache](http://doctrine-orm.readthedocs.io/projects/doctrine-orm/en/latest/reference/caching.html): layer for performance
 * [Pimple Dependency Injection Container](http://pimple.sensiolabs.org/): for extensibility and maintainability
-* [Symfony Event Dispacher](http://symfony.com/doc/current/components/event_dispatcher/introduction.html): for plugin event handling
+* [Symfony Event Dispatcher](http://symfony.com/doc/current/components/event_dispatcher/introduction.html): for plugin event handling
 * [Symfony Console](http://symfony.com/doc/current/components/console/introduction.html): for CLI interface
 * [Gregwar Image Library](https://github.com/Gregwar/Image): for dynamic image manipulation
 
 # Requirements
 
-- PHP 5.4 or higher. Check the [required modules list](http://learn.getgrav.org/basics/requirements#php-requirements)
+- PHP 5.6.4 or higher. Check the [required modules list](https://learn.getgrav.org/basics/requirements#php-requirements)
-- Check the [Apache](http://learn.getgrav.org/basics/requirements#apache-requirements) or [IIS](http://learn.getgrav.org/basics/requirements#iis-requirements) requirements
+- Check the [Apache](https://learn.getgrav.org/basics/requirements#apache-requirements) or [IIS](https://learn.getgrav.org/basics/requirements#iis-requirements) requirements
 
 # QuickStart
 
-You have two options to get Grav:
+These are the options to get Grav:
 
 ### Downloading a Grav Package
 
-You can download a **ready-built** package from the [Downloads page on http://getgrav.org](http://getgrav.org/downloads)
+You can download a **ready-built** package from the [Downloads page on https://getgrav.org](https://getgrav.org/downloads)
+
+### With Composer
+
+You can create a new project with the latest **stable** Grav release with the following command:
+
+```
+$ composer create-project getgrav/grav ~/webroot/grav
+```
 
 ### From GitHub
 
@@ -37,23 +45,23 @@ You can download a **ready-built** package from the [Downloads page on http://ge
    $ git clone https://github.com/getgrav/grav.git
    ```
 
-2. Install the **plugin** and **theme dependencies** by using the [Grav CLI application](http://learn.getgrav.org/advanced/grav-cli) `bin/grav`:
+2. Install the **plugin** and **theme dependencies** by using the [Grav CLI application](https://learn.getgrav.org/advanced/grav-cli) `bin/grav`:
    ```
    $ cd ~/webroot/grav
    $ bin/grav install
    ```
 
-Check out the [install procedures](http://learn.getgrav.org/basics/installation) for more information.
+Check out the [install procedures](https://learn.getgrav.org/basics/installation) for more information.
 
 # Adding Functionality
 
-You can download [plugins](http://getgrav.org/downloads/plugins) or [themes](http://getgrav.org/downloads/themes) manually from the appropriate tab on the [Downloads page on http://getgrav.org](http://getgrav.org/downloads), but the preferred solution is to use the [Grav Package Manager](http://learn.getgrav.org/advanced/grav-gpm) or `GPM`:
+You can download [plugins](https://getgrav.org/downloads/plugins) or [themes](https://getgrav.org/downloads/themes) manually from the appropriate tab on the [Downloads page on https://getgrav.org](https://getgrav.org/downloads), but the preferred solution is to use the [Grav Package Manager](https://learn.getgrav.org/advanced/grav-gpm) or `GPM`:
 
 ```
 $ bin/gpm index
 ```
 
-This will display all the available plugins and then you can install one ore more with:
+This will display all the available plugins and then you can install one or more with:
 
 ```
 $ bin/gpm install <plugin/theme>
@@ -61,7 +69,7 @@ $ bin/gpm install <plugin/theme>
 
 # Updating
 
-To update Grav you should use the [Grav Package Manager](http://learn.getgrav.org/advanced/grav-gpm) or `GPM`:
+To update Grav you should use the [Grav Package Manager](https://learn.getgrav.org/advanced/grav-gpm) or `GPM`:
 
 ```
 $ bin/gpm selfupgrade
@@ -75,36 +83,107 @@ $ bin/gpm update
 
 
 # Contributing
-We appreciate any contribution to Grav, whether it is related to bugs, grammar, or simply a suggestion or improvement.
+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.
-However, we ask that any contribution follow our simple guidelines in order to be properly received.
 
-All our projects follow the [GitFlow branching model][gitflow-model], from development to release. If you are not familiar with it, there are several guides and tutorials to make you understand what it is about.
+## Security issues
-
+If you discover a possible security issue related to Grav or one of its plugins, please email the core team at contact@getgrav.org and we'll address it as soon as possible.
-You will probably want to get started by installing [this very good collection of git extensions][gitflow-extensions].
-
-What you mainly want to know is that:
-
-- All the main activity happens in the `develop` branch. Any pull request should be addressed only to that branch. We will not consider pull requests made to the `master`.
-- It's very well appreciated, and highly suggested, to start a new feature whenever you want to make changes or add functionalities. It will make it much easier for us to just checkout your feature branch and test it, before merging it into `develop`
 
 # Getting Started
 
-* [What is Grav?](http://learn.getgrav.org/basics/what-is-grav)
+* [What is Grav?](https://learn.getgrav.org/basics/what-is-grav)
-* [Install](http://learn.getgrav.org/basics/installation) Grav in few seconds
+* [Install](https://learn.getgrav.org/basics/installation) Grav in few seconds
-* Understand the [Configuration](http://learn.getgrav.org/basics/grav-configuration)
+* Understand the [Configuration](https://learn.getgrav.org/basics/grav-configuration)
-* Take a peek at our available free [Skeletons](http://getgrav.org/downloads/skeletons#extras)
+* Take a peek at our available free [Skeletons](https://getgrav.org/downloads/skeletons)
-* If you have questions, check out `#grav` on irc.freenode.net
+* If you have questions, jump on our [Slack Room](https://getgrav.org/slack)!
 * Have fun!
 
-# Exploring more
+# Exploring More
 
-* Have a look at our [Basic Tutorial](http://learn.getgrav.org/basics/basic-tutorial)
+* Have a look at our [Basic Tutorial](https://learn.getgrav.org/basics/basic-tutorial)
-* Dive into more [advanced](http://learn.getgrav.org/advanced) functions
+* Dive into more [advanced](https://learn.getgrav.org/advanced) functions
+* Learn about the [Grav CLI](https://learn.getgrav.org/cli-console/grav-cli)
+* Review examples in the [Grav Cookbook](https://learn.getgrav.org/cookbook)
+
+# Backers
+Support Grav with a monthly donation to help us continue development. [[Become a backer](https://opencollective.com/grav#backer)]
+
+<a href="https://opencollective.com/grav/backer/0/website" target="_blank"><img src="https://opencollective.com/grav/backer/0/avatar.svg"></a>
+<a href="https://opencollective.com/grav/backer/1/website" target="_blank"><img src="https://opencollective.com/grav/backer/1/avatar.svg"></a>
+<a href="https://opencollective.com/grav/backer/2/website" target="_blank"><img src="https://opencollective.com/grav/backer/2/avatar.svg"></a>
+<a href="https://opencollective.com/grav/backer/3/website" target="_blank"><img src="https://opencollective.com/grav/backer/3/avatar.svg"></a>
+<a href="https://opencollective.com/grav/backer/4/website" target="_blank"><img src="https://opencollective.com/grav/backer/4/avatar.svg"></a>
+<a href="https://opencollective.com/grav/backer/5/website" target="_blank"><img src="https://opencollective.com/grav/backer/5/avatar.svg"></a>
+<a href="https://opencollective.com/grav/backer/6/website" target="_blank"><img src="https://opencollective.com/grav/backer/6/avatar.svg"></a>
+<a href="https://opencollective.com/grav/backer/7/website" target="_blank"><img src="https://opencollective.com/grav/backer/7/avatar.svg"></a>
+<a href="https://opencollective.com/grav/backer/8/website" target="_blank"><img src="https://opencollective.com/grav/backer/8/avatar.svg"></a>
+<a href="https://opencollective.com/grav/backer/9/website" target="_blank"><img src="https://opencollective.com/grav/backer/9/avatar.svg"></a>
+<a href="https://opencollective.com/grav/backer/10/website" target="_blank"><img src="https://opencollective.com/grav/backer/10/avatar.svg"></a>
+<a href="https://opencollective.com/grav/backer/11/website" target="_blank"><img src="https://opencollective.com/grav/backer/11/avatar.svg"></a>
+<a href="https://opencollective.com/grav/backer/12/website" target="_blank"><img src="https://opencollective.com/grav/backer/12/avatar.svg"></a>
+<a href="https://opencollective.com/grav/backer/13/website" target="_blank"><img src="https://opencollective.com/grav/backer/13/avatar.svg"></a>
+<a href="https://opencollective.com/grav/backer/14/website" target="_blank"><img src="https://opencollective.com/grav/backer/14/avatar.svg"></a>
+<a href="https://opencollective.com/grav/backer/15/website" target="_blank"><img src="https://opencollective.com/grav/backer/15/avatar.svg"></a>
+<a href="https://opencollective.com/grav/backer/16/website" target="_blank"><img src="https://opencollective.com/grav/backer/16/avatar.svg"></a>
+<a href="https://opencollective.com/grav/backer/17/website" target="_blank"><img src="https://opencollective.com/grav/backer/17/avatar.svg"></a>
+<a href="https://opencollective.com/grav/backer/18/website" target="_blank"><img src="https://opencollective.com/grav/backer/18/avatar.svg"></a>
+<a href="https://opencollective.com/grav/backer/19/website" target="_blank"><img src="https://opencollective.com/grav/backer/19/avatar.svg"></a>
+<a href="https://opencollective.com/grav/backer/20/website" target="_blank"><img src="https://opencollective.com/grav/backer/20/avatar.svg"></a>
+<a href="https://opencollective.com/grav/backer/21/website" target="_blank"><img src="https://opencollective.com/grav/backer/21/avatar.svg"></a>
+<a href="https://opencollective.com/grav/backer/22/website" target="_blank"><img src="https://opencollective.com/grav/backer/22/avatar.svg"></a>
+<a href="https://opencollective.com/grav/backer/23/website" target="_blank"><img src="https://opencollective.com/grav/backer/23/avatar.svg"></a>
+<a href="https://opencollective.com/grav/backer/24/website" target="_blank"><img src="https://opencollective.com/grav/backer/24/avatar.svg"></a>
+<a href="https://opencollective.com/grav/backer/25/website" target="_blank"><img src="https://opencollective.com/grav/backer/25/avatar.svg"></a>
+<a href="https://opencollective.com/grav/backer/26/website" target="_blank"><img src="https://opencollective.com/grav/backer/26/avatar.svg"></a>
+<a href="https://opencollective.com/grav/backer/27/website" target="_blank"><img src="https://opencollective.com/grav/backer/27/avatar.svg"></a>
+<a href="https://opencollective.com/grav/backer/28/website" target="_blank"><img src="https://opencollective.com/grav/backer/28/avatar.svg"></a>
+<a href="https://opencollective.com/grav/backer/29/website" target="_blank"><img src="https://opencollective.com/grav/backer/29/avatar.svg"></a>
+
+
+# Sponsors
+Become a sponsor and get your logo on our README on Github with a link to your site. [[Become a sponsor](https://opencollective.com/grav#sponsor)]
+
+<a href="https://opencollective.com/grav/sponsor/0/website" target="_blank"><img src="https://opencollective.com/grav/sponsor/0/avatar.svg"></a>
+<a href="https://opencollective.com/grav/sponsor/1/website" target="_blank"><img src="https://opencollective.com/grav/sponsor/1/avatar.svg"></a>
+<a href="https://opencollective.com/grav/sponsor/2/website" target="_blank"><img src="https://opencollective.com/grav/sponsor/2/avatar.svg"></a>
+<a href="https://opencollective.com/grav/sponsor/3/website" target="_blank"><img src="https://opencollective.com/grav/sponsor/3/avatar.svg"></a>
+<a href="https://opencollective.com/grav/sponsor/4/website" target="_blank"><img src="https://opencollective.com/grav/sponsor/4/avatar.svg"></a>
+<a href="https://opencollective.com/grav/sponsor/5/website" target="_blank"><img src="https://opencollective.com/grav/sponsor/5/avatar.svg"></a>
+<a href="https://opencollective.com/grav/sponsor/6/website" target="_blank"><img src="https://opencollective.com/grav/sponsor/6/avatar.svg"></a>
+<a href="https://opencollective.com/grav/sponsor/7/website" target="_blank"><img src="https://opencollective.com/grav/sponsor/7/avatar.svg"></a>
+<a href="https://opencollective.com/grav/sponsor/8/website" target="_blank"><img src="https://opencollective.com/grav/sponsor/8/avatar.svg"></a>
+<a href="https://opencollective.com/grav/sponsor/9/website" target="_blank"><img src="https://opencollective.com/grav/sponsor/9/avatar.svg"></a>
+<a href="https://opencollective.com/grav/sponsor/10/website" target="_blank"><img src="https://opencollective.com/grav/sponsor/10/avatar.svg"></a>
+<a href="https://opencollective.com/grav/sponsor/11/website" target="_blank"><img src="https://opencollective.com/grav/sponsor/11/avatar.svg"></a>
+<a href="https://opencollective.com/grav/sponsor/12/website" target="_blank"><img src="https://opencollective.com/grav/sponsor/12/avatar.svg"></a>
+<a href="https://opencollective.com/grav/sponsor/13/website" target="_blank"><img src="https://opencollective.com/grav/sponsor/13/avatar.svg"></a>
+<a href="https://opencollective.com/grav/sponsor/14/website" target="_blank"><img src="https://opencollective.com/grav/sponsor/14/avatar.svg"></a>
+<a href="https://opencollective.com/grav/sponsor/15/website" target="_blank"><img src="https://opencollective.com/grav/sponsor/15/avatar.svg"></a>
+<a href="https://opencollective.com/grav/sponsor/16/website" target="_blank"><img src="https://opencollective.com/grav/sponsor/16/avatar.svg"></a>
+<a href="https://opencollective.com/grav/sponsor/17/website" target="_blank"><img src="https://opencollective.com/grav/sponsor/17/avatar.svg"></a>
+<a href="https://opencollective.com/grav/sponsor/18/website" target="_blank"><img src="https://opencollective.com/grav/sponsor/18/avatar.svg"></a>
+<a href="https://opencollective.com/grav/sponsor/19/website" target="_blank"><img src="https://opencollective.com/grav/sponsor/19/avatar.svg"></a>
+<a href="https://opencollective.com/grav/sponsor/20/website" target="_blank"><img src="https://opencollective.com/grav/sponsor/20/avatar.svg"></a>
+<a href="https://opencollective.com/grav/sponsor/21/website" target="_blank"><img src="https://opencollective.com/grav/sponsor/21/avatar.svg"></a>
+<a href="https://opencollective.com/grav/sponsor/22/website" target="_blank"><img src="https://opencollective.com/grav/sponsor/22/avatar.svg"></a>
+<a href="https://opencollective.com/grav/sponsor/23/website" target="_blank"><img src="https://opencollective.com/grav/sponsor/23/avatar.svg"></a>
+<a href="https://opencollective.com/grav/sponsor/24/website" target="_blank"><img src="https://opencollective.com/grav/sponsor/24/avatar.svg"></a>
+<a href="https://opencollective.com/grav/sponsor/25/website" target="_blank"><img src="https://opencollective.com/grav/sponsor/25/avatar.svg"></a>
+<a href="https://opencollective.com/grav/sponsor/26/website" target="_blank"><img src="https://opencollective.com/grav/sponsor/26/avatar.svg"></a>
+<a href="https://opencollective.com/grav/sponsor/27/website" target="_blank"><img src="https://opencollective.com/grav/sponsor/27/avatar.svg"></a>
+<a href="https://opencollective.com/grav/sponsor/28/website" target="_blank"><img src="https://opencollective.com/grav/sponsor/28/avatar.svg"></a>
+<a href="https://opencollective.com/grav/sponsor/29/website" target="_blank"><img src="https://opencollective.com/grav/sponsor/29/avatar.svg"></a>
 
 # License
 
-See [LICENSE](LICENSE)
+See [LICENSE](LICENSE.txt)
 
 
 [gitflow-model]: http://nvie.com/posts/a-successful-git-branching-model/
 [gitflow-extensions]: https://github.com/nvie/gitflow
+
+# Running Tests
+
+First install the dev dependencies by running `composer update` 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`

bin/gpm

@@ -2,15 +2,12 @@
 <?php
 define('GRAV_CLI', true);
 
-if (version_compare($ver = PHP_VERSION, $req = '5.4.0', '<')) {
-    exit(sprintf("You are running PHP %s, but Grav needs at least PHP %s to run.\n", $ver, $req));
-}
-
 if (!file_exists(__DIR__ . '/../vendor')){
     require_once __DIR__ . '/../system/src/Grav/Common/Composer.php';
 }
 
 use Grav\Common\Composer;
+use Grav\Common\Config\Setup;
 
 if (!file_exists(__DIR__ . '/../vendor')){
     // Before we can even start, we need to run composer first
@@ -25,6 +22,10 @@ use Grav\Common\Grav;
 
 $autoload = require_once(__DIR__ . '/../vendor/autoload.php');
 
+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));
+}
+
 if (!ini_get('date.timezone')) {
     date_default_timezone_set('UTC');
 }
@@ -37,11 +38,25 @@ 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();
+$environment = $climate->arguments->get('environment');
+
+// Set up environment based on params.
+Setup::$environment = $environment;
+
 $grav = Grav::instance(array('loader' => $autoload));
+$grav['uri']->init();
 $grav['config']->init();
 $grav['streams'];
-$grav['plugins']->init();
-$grav['themes']->init();
 
 $app = new Application('Grav Package Manager', GRAV_VERSION);
 $app->addCommands(array(
@@ -52,5 +67,7 @@ $app->addCommands(array(
     new \Grav\Console\Gpm\UninstallCommand(),
     new \Grav\Console\Gpm\UpdateCommand(),
     new \Grav\Console\Gpm\SelfupgradeCommand(),
+    new \Grav\Console\Gpm\DirectInstallCommand(),
 ));
+
 $app->run();

bin/grav

@@ -2,10 +2,6 @@
 <?php
 define('GRAV_CLI', true);
 
-if (version_compare($ver = PHP_VERSION, $req = '5.4.0', '<')) {
-    exit(sprintf("You are running PHP %s, but Grav needs at least PHP %s to run.\n", $ver, $req));
-}
-
 if (!file_exists(__DIR__ . '/../vendor')){
     require_once __DIR__ . '/../system/src/Grav/Common/Composer.php';
 }
@@ -24,6 +20,10 @@ use Symfony\Component\Console\Application;
 
 require_once __DIR__ . '/../vendor/autoload.php';
 
+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));
+}
+
 if (!ini_get('date.timezone')) {
     date_default_timezone_set('UTC');
 }
@@ -32,15 +32,14 @@ if (!file_exists(ROOT_DIR . 'index.php')) {
     exit('FATAL: Must be run from ROOT directory of Grav!');
 }
 
-$app = new Application('Grav CLI Application', '0.1.0');
+$app = new Application('Grav CLI Application', GRAV_VERSION);
 $app->addCommands(array(
-    new Grav\Console\Cli\InstallCommand(),
+    new \Grav\Console\Cli\InstallCommand(),
-    new Grav\Console\Cli\ComposerCommand(),
+    new \Grav\Console\Cli\ComposerCommand(),
-    new Grav\Console\Cli\SandboxCommand(),
+    new \Grav\Console\Cli\SandboxCommand(),
-    new Grav\Console\Cli\CleanCommand(),
+    new \Grav\Console\Cli\CleanCommand(),
-    new Grav\Console\Cli\ClearCacheCommand(),
+    new \Grav\Console\Cli\ClearCacheCommand(),
-    new Grav\Console\Cli\BackupCommand(),
+    new \Grav\Console\Cli\BackupCommand(),
-    new Grav\Console\Cli\NewProjectCommand(),
+    new \Grav\Console\Cli\NewProjectCommand(),
-    new Grav\Console\Cli\NewUserCommand(),
 ));
 $app->run();

bin/plugin

@@ -0,0 +1,137 @@
+#!/usr/bin/env php
+<?php
+define('GRAV_CLI', true);
+
+if (!file_exists(__DIR__ . '/../vendor')) {
+    require_once __DIR__ . '/../system/src/Grav/Common/Composer.php';
+}
+
+use Grav\Common\Composer;
+
+if (!file_exists(__DIR__ . '/../vendor')) {
+    // Before we can even start, we need to run composer first
+    $composer = Composer::getComposerExecutor();
+    echo "Preparing to install vendor dependencies...\n\n";
+    echo system($composer . ' --working-dir="' . __DIR__ . '/../" --no-interaction --no-dev --prefer-dist -o install');
+    echo "\n\n";
+}
+
+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\Config\Setup;
+use Grav\Common\Filesystem\Folder;
+
+$autoload = require_once(__DIR__ . '/../vendor/autoload.php');
+
+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));
+}
+
+if (!ini_get('date.timezone')) {
+    date_default_timezone_set('UTC');
+}
+
+if (!file_exists(ROOT_DIR . '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');
+
+// Set up environment based on params.
+Setup::$environment = $environment;
+
+$grav = Grav::instance(array('loader' => $autoload));
+$grav['uri']->init();
+$grav['config']->init();
+$grav['streams'];
+$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);
+
+$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]);
+
+    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);
+
+            if (in_array($entry, $available)) {
+                continue;
+            }
+
+            $available[] = $entry;
+            $output->writeln('  ' . $index . ". <red>" . str_pad($entry, 15) . "</red> <white>${bin} ${entry} list</white>");
+        }
+    }
+
+    exit;
+}
+
+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);

codeception.yml

@@ -0,0 +1,16 @@
+actor: Tester
+paths:
+    tests: tests
+    log: tests/_output
+    data: tests/_data
+    support: tests/_support
+    envs: tests/_envs
+settings:
+    bootstrap: _bootstrap.php
+    colors: true
+    memory_limit: 1024M
+extensions:
+    enabled:
+        - Codeception\Extension\RunFailed
+modules:
+    config:

composer.json

@@ -1,29 +1,59 @@
 {
     "name": "getgrav/grav",
-    "type": "library",
+    "type": "project",
     "description": "Modern, Crazy Fast, Ridiculously Easy and Amazingly Powerful Flat-File CMS",
     "keywords": ["cms","flat-file cms","flat cms","flatfile cms","php"],
     "homepage": "http://getgrav.org",
     "license": "MIT",
     "require": {
-        "php": ">=5.4.0",
+        "php": ">=5.6.4",
-        "twig/twig": "~1.16",
+        "twig/twig": "~1.24",
+        "erusev/parsedown": "1.6.4",
         "erusev/parsedown-extra": "~0.7",
-        "symfony/yaml": "~2.7",
+        "symfony/yaml": "~3.4",
-        "symfony/console": "~2.7",
+        "symfony/console": "~3.4",
-        "symfony/event-dispatcher": "~2.7",
+        "symfony/event-dispatcher": "~3.4",
-        "symfony/var-dumper": "~2.7",
+        "symfony/var-dumper": "~3.4",
-        "doctrine/cache": "~1.4",
+        "symfony/polyfill-iconv": "~1.0",
-        "filp/whoops": "1.2.*@dev",
+        "doctrine/cache": "^1.6",
+        "doctrine/collections": "^1.4",
+        "psr/simple-cache": "^1.0",
+        "psr/http-message": "^1.0",
+        "guzzlehttp/psr7": "^1.4",
+        "filp/whoops": "~2.0",
+        "matthiasmullie/minify": "^1.3",
         "monolog/monolog": "~1.0",
-        "gregwar/image": "~2.0",
+        "gregwar/image": "2.*",
-        "ircmaxell/password-compat": "1.0.*",
-        "mrclay/minify": "~2.2",
         "donatj/phpuseragentparser": "~0.3",
-        "pimple/pimple": "~3.0",
+        "pimple/pimple": "~3.2",
-        "rockettheme/toolbox": "1.1.*",
+        "rockettheme/toolbox": "~1.4",
-        "maximebf/debugbar": "~1.10"
+        "maximebf/debugbar": "~1.10",
+        "ext-mbstring": "*",
+        "ext-openssl": "*",
+        "ext-curl": "*",
+        "ext-zip": "*",
+        "league/climate": "^3.2",
+        "antoligy/dom-string-iterators": "^1.0",
+        "miljar/php-exif": "^0.6.3",
+        "composer/ca-bundle": "^1.0"
     },
+    "require-dev": {
+        "codeception/codeception": "^2.1",
+        "phpunit/php-code-coverage": "~2.0",
+        "fzaninotto/faker": "^1.5",
+        "victorjonsson/markdowndocs": "dev-master"
+    },
+    "config": {
+        "platform": {
+            "php": "5.6.4"
+        }
+    },
+    "repositories": [
+        {
+            "type": "vcs",
+            "url": "https://github.com/trilbymedia/PHP-Markdown-Documentation-Generator"
+        }
+    ],
     "autoload": {
         "psr-4": {
             "Grav\\": "system/src/Grav"
@@ -32,5 +62,15 @@
     },
     "archive": {
         "exclude": ["VERSION"]
+    },
+    "scripts": {
+        "post-create-project-cmd": "bin/grav install",
+        "test": "vendor/bin/codecept run unit",
+        "test-windows": "vendor\\bin\\codecept run unit"
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-develop": "1.x-dev"
+        }
     }
 }

index.php

@@ -1,17 +1,32 @@
 <?php
-namespace Grav;
+/**
+ * @package    Grav.Core
+ *
+ * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
 
-if (version_compare($ver = PHP_VERSION, $req = '5.4.0', '<')) {
+namespace Grav;
-    throw new \RuntimeException(sprintf('You are running PHP %s, but Grav needs at least <strong>PHP %s</strong> to run.', $ver, $req));
+define('GRAV_PHP_MIN', '5.6.4');
-}
 
 // Ensure vendor libraries exist
 $autoload = __DIR__ . '/vendor/autoload.php';
 if (!is_file($autoload)) {
-    throw new \RuntimeException("Please run: <i>bin/grav install</i>");
+    die("Please run: <i>bin/grav install</i>");
+}
+
+if (PHP_SAPI == 'cli-server') {
+    if (!isset($_SERVER['PHP_CLI_ROUTER'])) {
+       die("PHP webserver requires a router to run Grav, please use: <pre>php -S {$_SERVER['SERVER_NAME']}:{$_SERVER['SERVER_PORT']} system/router.php</pre>");
+    }
 }
 
 use Grav\Common\Grav;
+use RocketTheme\Toolbox\Event\Event;
+
+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));
+}
 
 // Register the auto-loader.
 $loader = require_once $autoload;
@@ -21,7 +36,7 @@ date_default_timezone_set(@date_default_timezone_get());
 
 // Set internal encoding if mbstring loaded
 if (!extension_loaded('mbstring')) {
-    throw new \RuntimeException("'mbstring' extension is not loaded.  This is required for Grav to run correctly");
+    die("'mbstring' extension is not loaded.  This is required for Grav to run correctly");
 }
 mb_internal_encoding('UTF-8');
 
@@ -36,7 +51,6 @@ $grav = Grav::instance(
 try {
     $grav->process();
 } catch (\Exception $e) {
-    $grav->fireEvent('onFatalException');
+    $grav->fireEvent('onFatalException', new Event(array('exception' => $e)));
     throw $e;
 }
-

nginx.conf

@@ -1,87 +0,0 @@
-worker_processes 1;
-
-events {
-    worker_connections 1024;
-}
-
-http {
-    include mime.types;
-    default_type application/octet-stream;
-    sendfile on;
-    keepalive_timeout 65;
-
-    server {
-        listen 80;
-        server_name localhost;
-
-        error_page 500 502 503 504 /50x.html;
-        location = /50x.html {
-            root html;
-        }
-
-        location / {
-            root html;
-            index index.php;
-            if (!-e $request_filename){ rewrite ^(.*)$ /index.php last; }
-        }
-
-        # if you want grav in a sub-directory of your main site
-        # (for example, example.com/mygrav) then you need this rewrite:
-        location /mygrav {
-            index index.php;
-            if (!-e $request_filename){ rewrite ^(.*)$ /mygrav/$2 last; }
-            try_files $uri $uri/ /index.php?$args;
-        }
-
-        # if using grav in a sub-directory of your site,
-        # prepend the actual path to each location
-        # for example: /mygrav/images
-        # and: /mygrav/user
-        # and: /mygrav/cache
-        # and so on
-
-        location /images/ {
-            # Serve images as static
-        }
-
-        location /user {
-            rewrite ^/user/accounts/(.*)$ /error redirect;
-            rewrite ^/user/config/(.*)$ /error redirect;
-            rewrite ^/user/(.*)\.(txt|md|html|php|yaml|json|twig|sh|bat)$ /error redirect;
-        }
-
-        location /cache {
-            rewrite ^/cache/(.*) /error redirect;
-        }
-
-        location /bin {
-            rewrite ^/bin/(.*)$ /error redirect;
-        }
-
-        location /backup {
-            rewrite ^/backup/(.*) /error redirect;
-        }
-
-        location /system {
-            rewrite ^/system/(.*)\.(txt|md|html|php|yaml|json|twig|sh|bat)$ /error redirect;
-        }
-
-        location /vendor {
-            rewrite ^/vendor/(.*)\.(txt|md|html|php|yaml|json|twig|sh|bat)$ /error redirect;
-        }
-
-        # Remember to change 127.0.0.1:9000 to the Ip/port
-        # you configured php-cgi.exe to run from
-
-        location ~ \.php$ {
-            try_files $uri =404;
-            fastcgi_split_path_info ^(.+\.php)(/.+)$;
-            fastcgi_pass 127.0.0.1:9000;
-            fastcgi_index index.php;
-            fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
-            include fastcgi_params;
-        }
-
-    }
-
-}

robots.txt

@@ -1,2 +1,12 @@
 User-agent: *
-Disallow:
+Disallow: /backup/
+Disallow: /bin/
+Disallow: /cache/
+Disallow: /grav/
+Disallow: /logs/
+Disallow: /system/
+Disallow: /vendor/
+Disallow: /user/
+Allow: /user/pages/
+Allow: /user/themes/
+Allow: /user/images/

system/assets/whoops.css

@@ -1,110 +1,19 @@
-body {
-    background-color: #eee;
-}
-
 body header {
-    background: #349886;
+    background: #3085EE;
-    border-left: 8px solid #29796B;
 }
 
-body .clipboard {
+body .left-panel {
-    width: 28px;
+    background: inherit;
-    height: 28px;
-    background: transparent url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABwAAAAcAQMAAABIw03XAAAAA3NCSVQICAjb4U/gAAAABlBMVEX///////9VfPVsAAAAAnRSTlP/AOW3MEoAAAAJcEhZcwAACxIAAAsSAdLdfvwAAAAcdEVYdFNvZnR3YXJlAEFkb2JlIEZpcmV3b3JrcyBDUzbovLKMAAAAFnRFWHRDcmVhdGlvbiBUaW1lADEwLzE1LzE0xr/LJAAAADhJREFUCJlj+P///wcGBPGDQR5E8OMi2IEEczOIaAQRHSCioQBGHAAR/7AT/z+DiA8MMALVXhABAJf9Sr5aY+UFAAAAAElFTkSuQmCC);
 }
 
 body .exc-title-primary {
-    color: #1C3631;
+    color: #fff;
-    text-shadow: none;
 }
 
 body .exc-title {
-    color: #2F5B52;
+    color: #ddd;
-    text-shadow: none;
-}
-
-body .data-table-container label {
-    color: #0082BA;
-}
-
-body .frame {
-    border: 0;
-}
-
-body .frames-container {
-    overflow-y: auto;
-    overflow-x: hidden;
-}
-
-body .active .frame-class {
-    color: #E3D8E9;
-}
-
-body .frame-class {
-    color: #9055AF;
-}
-
-body .frame.active {
-    border: 0;
-    box-shadow: none;
-    background-color: #9055AF;
 }
 
 body .frame:not(.active):hover {
-    background: #e9e9e9;
+    background: #e6e6e6;
-}
-
-body .frame-file, body .data-table tbody {
-    font-family: "DejaVu Sans Mono", Menlo, Monaco, Consolas, Courier, monospace;
-    font-size: 13px;
-}
-
-body .frame-code {
-    background: #305669;
-    border-left: 8px solid #253A47;
-    padding: 1rem;
-}
-
-body .frame-code .frame-file {
-    background: #253A47;
-    color: #eee;
-    text-shadow: none;
-    box-shadow: none;
-    font-family: inherit;
-}
-
-body .frame-code .frame-file strong {
-    color: #fff;
-    font-weight: normal;
-}
-
-body .frame-comments {
-    background: #283E4D;
-
-    box-shadow: none;
-}
-
-body .frame-comments.empty:before {
-    color: #789AAB;
-}
-
-body .details-container {
-    border: 0;
-}
-
-body .details {
-    background-color: #eee;
-    border-left: 8px solid #ddd;
-    padding: 1rem;
-}
-
-body .code-block {
-    background: #2C4454;
-    box-shadow: none;
-    font-family: "DejaVu Sans Mono", Menlo, Monaco, Consolas, Courier, monospace;
-    font-size: 13px;
-}
-
-body .handler.active {
-    background: #666;
 }

system/blueprints/config/site.yaml

@@ -16,6 +16,13 @@ form:
                     placeholder: PLUGIN_ADMIN.SITE_TITLE_PLACEHOLDER
                     help: PLUGIN_ADMIN.SITE_TITLE_HELP
 
+                default_lang:
+                    type: text
+                    label: PLUGIN_ADMIN.SITE_DEFAULT_LANG
+                    size: x-small
+                    placeholder: PLUGIN_ADMIN.SITE_DEFAULT_LANG_PLACEHOLDER
+                    help: PLUGIN_ADMIN.SITE_DEFAULT_LANG_HELP
+
                 author.name:
                     type: text
                     size: large
@@ -59,6 +66,7 @@ form:
                 summary.size:
                     type: text
                     size: x-small
+                    append: PLUGIN_ADMIN.CHARACTERS
                     label: PLUGIN_ADMIN.SUMMARY_SIZE
                     help: PLUGIN_ADMIN.SUMMARY_SIZE_HELP
                     validate:

system/blueprints/config/streams.yaml

@@ -2,6 +2,7 @@ title: PLUGIN_ADMIN.FILE_STREAMS
 
 form:
   validation: loose
+  hidden: true
   fields:
     schemes.xxx:
       type: array

system/blueprints/config/system.yaml

@@ -12,14 +12,27 @@ form:
             fields:
                 home.alias:
                     type: pages
-                    size: medium
+                    size: large
                     classes: fancy
                     label: PLUGIN_ADMIN.HOME_PAGE
                     show_all: false
                     show_modular: false
                     show_root: false
+                    show_slug: true
                     help: PLUGIN_ADMIN.HOME_PAGE_HELP
 
+                home.hide_in_urls:
+                    type: toggle
+                    label: PLUGIN_ADMIN.HIDE_HOME_IN_URLS
+                    help: PLUGIN_ADMIN.HIDE_HOME_IN_URLS_HELP
+                    highlight: 0
+                    options:
+                        1: PLUGIN_ADMIN.YES
+                        0: PLUGIN_ADMIN.NO
+                    validate:
+                        type: bool
+
+
                 pages.theme:
                     type: themeselect
                     classes: fancy
@@ -44,7 +57,7 @@ form:
                     size: medium
                     classes: fancy
                     help: PLUGIN_ADMIN.TIMEZONE_HELP
-                    '@data-options': '\Grav\Common\Utils::timezones'
+                    data-options@: '\Grav\Common\Utils::timezones'
                     default: ''
                     options:
                         '': 'Default (Server Timezone)'
@@ -57,9 +70,7 @@ form:
                     label: PLUGIN_ADMIN.DEFAULT_DATE_FORMAT
                     help: PLUGIN_ADMIN.DEFAULT_DATE_FORMAT_HELP
                     placeholder: PLUGIN_ADMIN.DEFAULT_DATE_FORMAT_PLACEHOLDER
-                    '@data-options': '\Grav\Common\Utils::dateFormats'
+                    data-options@: '\Grav\Common\Utils::dateFormats'
-                    options:
-                        "": Auto Guess or Enter Custom
                     validate:
                         type: string
 
@@ -73,7 +84,7 @@ form:
                     options:
                         "F jS \\a\\t g:ia": Date1
                         "l jS \\of F g:i A": Date2
-                        "D, m M Y G:i:s": Date3
+                        "D, d M Y G:i:s": Date3
                         "d-m-y G:i": Date4
                         "jS M Y": Date5
 
@@ -86,13 +97,13 @@ form:
                     options:
                         "F jS \\a\\t g:ia": Date1
                         "l jS \\of F g:i A": Date2
-                        "D, m M Y G:i:s": Date3
+                        "D, d M Y G:i:s": Date3
                         "d-m-y G:i": Date4
                         "jS M Y": Date5
 
                 pages.order.by:
                     type: select
-                    size: long
+                    size: large
                     classes: fancy
                     label: PLUGIN_ADMIN.DEFAULT_ORDERING
                     help: PLUGIN_ADMIN.DEFAULT_ORDERING_HELP
@@ -115,6 +126,7 @@ form:
                 pages.list.count:
                     type: text
                     size: x-small
+                    append: PLUGIN_ADMIN.PAGES
                     label: PLUGIN_ADMIN.DEFAULT_PAGE_COUNT
                     help: PLUGIN_ADMIN.DEFAULT_PAGE_COUNT_HELP
                     validate:
@@ -142,6 +154,13 @@ form:
                          twig: Twig Events
                      use: keys
 
+                pages.append_url_extension:
+                    type: text
+                    size: x-small
+                    placeholder: "e.g. .html"
+                    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
@@ -161,8 +180,9 @@ form:
                     help: PLUGIN_ADMIN.REDIRECT_DEFAULT_CODE_HELP
                     options:
                         301: 301 - Permanent
+                        302: 302 - Found
                         303: 303 - Other
-                        307: 307 - Temporary
+                        304: 304 - Not Modified
 
                 pages.redirect_trailing_slash:
                     type: toggle
@@ -215,6 +235,49 @@ form:
                     validate:
                         type: bool
 
+                pages.twig_first:
+                    type: toggle
+                    label: PLUGIN_ADMIN.TWIG_FIRST
+                    help: PLUGIN_ADMIN.TWIG_FIRST_HELP
+                    highlight: 0
+                    options:
+                        1: PLUGIN_ADMIN.YES
+                        0: PLUGIN_ADMIN.NO
+                    validate:
+                        type: bool
+
+                pages.never_cache_twig:
+                    type: toggle
+                    label: PLUGIN_ADMIN.NEVER_CACHE_TWIG
+                    help: PLUGIN_ADMIN.NEVER_CACHE_TWIG_HELP
+                    highlight: 0
+                    options:
+                        1: PLUGIN_ADMIN.YES
+                        0: PLUGIN_ADMIN.NO
+                    validate:
+                        type: bool
+
+                pages.frontmatter.process_twig:
+                    type: toggle
+                    label: PLUGIN_ADMIN.FRONTMATTER_PROCESS_TWIG
+                    help: PLUGIN_ADMIN.FRONTMATTER_PROCESS_TWIG_HELP
+                    highlight: 0
+                    options:
+                        1: PLUGIN_ADMIN.YES
+                        0: PLUGIN_ADMIN.NO
+                    validate:
+                        type: bool
+
+                pages.frontmatter.ignore_fields:
+                    type: selectize
+                    size: large
+                    placeholder: "e.g. forms"
+                    label: PLUGIN_ADMIN.FRONTMATTER_IGNORE_FIELDS
+                    help: PLUGIN_ADMIN.FRONTMATTER_IGNORE_FIELDS_HELP
+                    classes: fancy
+                    validate:
+                        type: commalist
+
         languages:
             type: section
             title: PLUGIN_ADMIN.LANGUAGES
@@ -225,6 +288,7 @@ form:
                 languages.supported:
                     type: selectize
                     size: large
+                    placeholder: "e.g. en, fr"
                     label: PLUGIN_ADMIN.SUPPORTED
                     help: PLUGIN_ADMIN.SUPPORTED_HELP
                     classes: fancy
@@ -307,11 +371,18 @@ form:
                 pages.expires:
                     type: text
                     size: small
+                    append: NICETIME.SECOND_PLURAL
                     label: PLUGIN_ADMIN.EXPIRES
                     help: PLUGIN_ADMIN.EXPIRES_HELP
                     validate:
                         type: number
                         min: 1
+                pages.cache_control:
+                    type: text
+                    size: medium
+                    label: PLUGIN_ADMIN.CACHE_CONTROL
+                    help: PLUGIN_ADMIN.CACHE_CONTROL_HELP
+                    placeholder: 'e.g. public, max-age=31536000'
                 pages.last_modified:
                     type: toggle
                     label: PLUGIN_ADMIN.LAST_MODIFIED
@@ -409,14 +480,15 @@ form:
 
                 cache.check.method:
                     type: select
-                    size: small
+                    size: medium
                     classes: fancy
                     label: PLUGIN_ADMIN.CACHE_CHECK_METHOD
                     help: PLUGIN_ADMIN.CACHE_CHECK_METHOD_HELP
                     options:
-                        file: File
+                        file: Markdown + Yaml file timestamps
-                        folder: Folder
+                        folder: Folder timestamps
-                        none: None
+                        hash: All files timestamps
+                        none: No timestamp checking
 
                 cache.driver:
                     type: select
@@ -428,9 +500,12 @@ form:
                         auto: Auto detect
                         file: File
                         apc: APC
-                        xcache: XCache
+                        apcu: APCu
-                        memcache: MemCache
+                        xcache: Xcache
+                        memcache: Memcache
+                        memcached: Memcached
                         wincache: WinCache
+                        redis: Redis
 
                 cache.prefix:
                     type: text
@@ -439,9 +514,32 @@ form:
                     help: PLUGIN_ADMIN.CACHE_PREFIX_HELP
                     placeholder: PLUGIN_ADMIN.CACHE_PREFIX_PLACEHOLDER
 
+                cache.clear_images_by_default:
+                    type: toggle
+                    label: PLUGIN_ADMIN.CLEAR_IMAGES_BY_DEFAULT
+                    help: PLUGIN_ADMIN.CLEAR_IMAGES_BY_DEFAULT_HELP
+                    highlight: 1
+                    options:
+                        1: PLUGIN_ADMIN.YES
+                        0: PLUGIN_ADMIN.NO
+                    validate:
+                        type: bool
+
+                cache.cli_compatibility:
+                    type: toggle
+                    label: PLUGIN_ADMIN.CLI_COMPATIBILITY
+                    help: PLUGIN_ADMIN.CLI_COMPATIBILITY_HELP
+                    highlight: 0
+                    options:
+                        1: PLUGIN_ADMIN.YES
+                        0: PLUGIN_ADMIN.NO
+                    validate:
+                        type: bool
+
                 cache.lifetime:
                     type: text
                     size: small
+                    append: NICETIME.SECOND_PLURAL
                     label: PLUGIN_ADMIN.LIFETIME
                     help: PLUGIN_ADMIN.LIFETIME_HELP
                     validate:
@@ -458,6 +556,72 @@ form:
                     validate:
                         type: bool
 
+                cache.allow_webserver_gzip:
+                    type: toggle
+                    label: PLUGIN_ADMIN.ALLOW_WEBSERVER_GZIP
+                    help: PLUGIN_ADMIN.ALLOW_WEBSERVER_GZIP_HELP
+                    highlight: 0
+                    options:
+                        1: PLUGIN_ADMIN.YES
+                        0: PLUGIN_ADMIN.NO
+                    validate:
+                        type: bool
+
+                cache.memcache.server:
+                    type: text
+                    size: medium
+                    label: PLUGIN_ADMIN.MEMCACHE_SERVER
+                    help: PLUGIN_ADMIN.MEMCACHE_SERVER_HELP
+                    placeholder: "localhost"
+
+                cache.memcache.port:
+                    type: text
+                    size: small
+                    label: PLUGIN_ADMIN.MEMCACHE_PORT
+                    help: PLUGIN_ADMIN.MEMCACHE_PORT_HELP
+                    placeholder: "11211"
+
+                cache.memcached.server:
+                    type: text
+                    size: medium
+                    label: PLUGIN_ADMIN.MEMCACHED_SERVER
+                    help: PLUGIN_ADMIN.MEMCACHED_SERVER_HELP
+                    placeholder: "localhost"
+
+                cache.memcached.port:
+                    type: text
+                    size: small
+                    label: PLUGIN_ADMIN.MEMCACHED_PORT
+                    help: PLUGIN_ADMIN.MEMCACHED_PORT_HELP
+                    placeholder: "11211"
+
+                cache.redis.socket:
+                    type: text
+                    size: medium
+                    label: PLUGIN_ADMIN.REDIS_SOCKET
+                    help: PLUGIN_ADMIN.REDIS_SOCKET_HELP
+                    placeholder: "/var/run/redis/redis.sock"
+
+                cache.redis.server:
+                    type: text
+                    size: medium
+                    label: PLUGIN_ADMIN.REDIS_SERVER
+                    help: PLUGIN_ADMIN.REDIS_SERVER_HELP
+                    placeholder: "localhost"
+
+                cache.redis.port:
+                    type: text
+                    size: small
+                    label: PLUGIN_ADMIN.REDIS_PORT
+                    help: PLUGIN_ADMIN.REDIS_PORT_HELP
+                    placeholder: "6379"
+
+                cache.redis.password:
+                    type: text
+                    size: small
+                    label: PLUGIN_ADMIN.REDIS_PASSWORD
+
+
 
         twig:
             type: section
@@ -480,7 +644,7 @@ form:
                     type: toggle
                     label: PLUGIN_ADMIN.TWIG_DEBUG
                     help: PLUGIN_ADMIN.TWIG_DEBUG_HELP
-                    highlight: 0
+                    highlight: 1
                     options:
                         1: PLUGIN_ADMIN.YES
                         0: PLUGIN_ADMIN.NO
@@ -509,6 +673,17 @@ form:
                     validate:
                         type: bool
 
+                twig.umask_fix:
+                    type: toggle
+                    label: PLUGIN_ADMIN.TWIG_UMASK_FIX
+                    help: PLUGIN_ADMIN.TWIG_UMASK_FIX_HELP
+                    highlight: 0
+                    options:
+                        1: PLUGIN_ADMIN.YES
+                        0: PLUGIN_ADMIN.NO
+                    validate:
+                        type: bool
+
         assets:
             type: section
             title: PLUGIN_ADMIN.ASSETS
@@ -526,6 +701,28 @@ form:
                     validate:
                        type: bool
 
+                assets.css_pipeline_include_externals:
+                    type: toggle
+                    label: PLUGIN_ADMIN.CSS_PIPELINE_INCLUDE_EXTERNALS
+                    help: PLUGIN_ADMIN.CSS_PIPELINE_INCLUDE_EXTERNALS_HELP
+                    highlight: 1
+                    options:
+                        1: PLUGIN_ADMIN.YES
+                        0: PLUGIN_ADMIN.NO
+                    validate:
+                       type: bool
+
+                assets.css_pipeline_before_excludes:
+                    type: toggle
+                    label: PLUGIN_ADMIN.CSS_PIPELINE_BEFORE_EXCLUDES
+                    help: PLUGIN_ADMIN.CSS_PIPELINE_BEFORE_EXCLUDES_HELP
+                    highlight: 1
+                    options:
+                        1: PLUGIN_ADMIN.YES
+                        0: PLUGIN_ADMIN.NO
+                    validate:
+                       type: bool
+
                 assets.css_minify:
                     type: toggle
                     label: PLUGIN_ADMIN.CSS_MINIFY
@@ -570,6 +767,28 @@ form:
                     validate:
                         type: bool
 
+                assets.js_pipeline_include_externals:
+                    type: toggle
+                    label: PLUGIN_ADMIN.JAVASCRIPT_PIPELINE_INCLUDE_EXTERNALS
+                    help: PLUGIN_ADMIN.JAVASCRIPT_PIPELINE_INCLUDE_EXTERNALS_HELP
+                    highlight: 1
+                    options:
+                        1: PLUGIN_ADMIN.YES
+                        0: PLUGIN_ADMIN.NO
+                    validate:
+                       type: bool
+
+                assets.js_pipeline_before_excludes:
+                    type: toggle
+                    label: PLUGIN_ADMIN.JAVASCRIPT_PIPELINE_BEFORE_EXCLUDES
+                    help: PLUGIN_ADMIN.JAVASCRIPT_PIPELINE_BEFORE_EXCLUDES_HELP
+                    highlight: 1
+                    options:
+                        1: PLUGIN_ADMIN.YES
+                        0: PLUGIN_ADMIN.NO
+                    validate:
+                       type: bool
+
                 assets.js_minify:
                     type: toggle
                     label: PLUGIN_ADMIN.JAVASCRIPT_MINIFY
@@ -593,10 +812,12 @@ form:
                         type: bool
 
                 assets.collections:
-                    type: array
+                    type: multilevel
                     label: PLUGIN_ADMIN.COLLECTIONS
                     placeholder_key: collection_name
                     placeholder_value: collection_path
+                    validate:
+                        type: array
 
         errors:
             type: section
@@ -605,15 +826,18 @@ form:
 
             fields:
                 errors.display:
-                    type: toggle
+                    type: select
                     label: PLUGIN_ADMIN.DISPLAY_ERRORS
                     help: PLUGIN_ADMIN.DISPLAY_ERRORS_HELP
-                    highlight: 0
+                    size: medium
+                    highlight: 1
                     options:
-                        1: PLUGIN_ADMIN.YES
+                        -1: PLUGIN_ADMIN.ERROR_SYSTEM
-                        0: PLUGIN_ADMIN.NO
+                        0: PLUGIN_ADMIN.ERROR_SIMPLE
+                        1: PLUGIN_ADMIN.ERROR_FULL_BACKTRACE
                     validate:
-                        type: bool
+                        type: int
+
 
                 errors.log:
                     type: toggle
@@ -661,12 +885,11 @@ form:
 
             fields:
                 images.default_image_quality:
-                    type: text
+                    type: range
+                    append: '%'
                     label: PLUGIN_ADMIN.DEFAULT_IMAGE_QUALITY
                     help: PLUGIN_ADMIN.DEFAULT_IMAGE_QUALITY_HELP
-                    classes: x-small
                     validate:
-                        type: number
                         min: 1
                         max: 100
 
@@ -681,6 +904,16 @@ form:
                     validate:
                         type: bool
 
+                images.cache_perms:
+                    type: select
+                    size: small
+                    label: PLUGIN_ADMIN.CACHE_PERMS
+                    help: PLUGIN_ADMIN.CACHE_PERMS_HELP
+                    highlight: '0755'
+                    options:
+                        '0755': '0755'
+                        '0775': '0775'
+
                 images.debug:
                     type: toggle
                     label: PLUGIN_ADMIN.IMAGES_DEBUG
@@ -692,13 +925,16 @@ form:
                     validate:
                         type: bool
 
-                media.upload_limit:
+                images.auto_fix_orientation:
-                    type: text
+                    type: toggle
-                    label: PLUGIN_ADMIN.UPLOAD_LIMIT
+                    label: PLUGIN_ADMIN.IMAGES_AUTO_FIX_ORIENTATION
-                    help: PLUGIN_ADMIN.UPLOAD_LIMIT_HELP
+                    help: PLUGIN_ADMIN.IMAGES_AUTO_FIX_ORIENTATION_HELP
-                    classes: small
+                    highlight: 0
+                    options:
+                        1: PLUGIN_ADMIN.YES
+                        0: PLUGIN_ADMIN.NO
                     validate:
-                        type: number
+                        type: bool
 
                 media.enable_media_timestamp:
                     type: toggle
@@ -711,6 +947,37 @@ form:
                     validate:
                         type: bool
 
+                media.auto_metadata_exif:
+                      type: toggle
+                      label: PLUGIN_ADMIN.ENABLE_AUTO_METADATA
+                      help: PLUGIN_ADMIN.ENABLE_AUTO_METADATA_HELP
+                      highlight: 0
+                      options:
+                          1: PLUGIN_ADMIN.YES
+                          0: PLUGIN_ADMIN.NO
+                      validate:
+                          type: bool
+
+
+
+                media.allowed_fallback_types:
+                    type: selectize
+                    size: large
+                    label: PLUGIN_ADMIN.FALLBACK_TYPES
+                    help: PLUGIN_ADMIN.FALLBACK_TYPES_HELP
+                    classes: fancy
+                    validate:
+                        type: commalist
+
+                media.unsupported_inline_types:
+                    type: selectize
+                    size: large
+                    label: PLUGIN_ADMIN.INLINE_TYPES
+                    help: PLUGIN_ADMIN.INLINE_TYPES_HELP
+                    classes: fancy
+                    validate:
+                        type: commalist
+
         session:
             type: section
             title: PLUGIN_ADMIN.SESSION
@@ -718,24 +985,38 @@ form:
 
             fields:
                 session.enabled:
-                    type: toggle
+                    type: hidden
                     label: PLUGIN_ADMIN.ENABLED
                     help: PLUGIN_ADMIN.SESSION_ENABLED_HELP
                     highlight: 1
                     options:
                         1: PLUGIN_ADMIN.YES
                         0: PLUGIN_ADMIN.NO
+                    default: true
+                    validate:
+                        type: bool
+
+                session.initialize:
+                    type: toggle
+                    label: PLUGIN_ADMIN.SESSION_INITIALIZE
+                    help: PLUGIN_ADMIN.SESSION_INITIALIZE_HELP
+                    highlight: 1
+                    options:
+                        1: PLUGIN_ADMIN.YES
+                        0: PLUGIN_ADMIN.NO
+                    default: true
                     validate:
                         type: bool
 
                 session.timeout:
                     type: text
                     size: small
+                    append: NICETIME.SECOND_PLURAL
                     label: PLUGIN_ADMIN.TIMEOUT
                     help: PLUGIN_ADMIN.TIMEOUT_HELP
                     validate:
                         type: number
-                        min: 1
+                        min: 0
 
                 session.name:
                     type: text
@@ -743,6 +1024,47 @@ form:
                     label: PLUGIN_ADMIN.NAME
                     help: PLUGIN_ADMIN.SESSION_NAME_HELP
 
+                session.secure:
+                    type: toggle
+                    label: PLUGIN_ADMIN.SESSION_SECURE
+                    help: PLUGIN_ADMIN.SESSION_SECURE_HELP
+                    highlight: 1
+                    options:
+                        1: PLUGIN_ADMIN.YES
+                        0: PLUGIN_ADMIN.NO
+                    default: false
+                    validate:
+                        type: bool
+
+                session.httponly:
+                    type: toggle
+                    label: PLUGIN_ADMIN.SESSION_HTTPONLY
+                    help: PLUGIN_ADMIN.SESSION_HTTPONLY_HELP
+                    highlight: 1
+                    options:
+                        1: PLUGIN_ADMIN.YES
+                        0: PLUGIN_ADMIN.NO
+                    default: true
+                    validate:
+                        type: bool
+
+                session.path:
+                    type: text
+                    size: small
+                    label: PLUGIN_ADMIN.SESSION_PATH
+                    help: PLUGIN_ADMIN.SESSION_PATH_HELP
+
+                session.split:
+                    type: toggle
+                    label: PLUGIN_ADMIN.SESSION_SPLIT
+                    help: PLUGIN_ADMIN.SESSION_SPLIT_HELP
+                    highlight: 1
+                    options:
+                        1: PLUGIN_ADMIN.YES
+                        0: PLUGIN_ADMIN.NO
+                    default: true
+                    validate:
+                        type: bool
 
         advanced:
             type: section
@@ -750,6 +1072,90 @@ form:
             underline: true
 
             fields:
+                gpm.releases:
+                    type: toggle
+                    label: PLUGIN_ADMIN.GPM_RELEASES
+                    highlight: stable
+                    help: PLUGIN_ADMIN.GPM_RELEASES_HELP
+                    options:
+                        stable: PLUGIN_ADMIN.STABLE
+                        testing: PLUGIN_ADMIN.TESTING
+
+                gpm.proxy_url:
+                    type: text
+                    size: medium
+                    placeholder: "e.g. 127.0.0.1:3128"
+                    label: PLUGIN_ADMIN.PROXY_URL
+                    help: PLUGIN_ADMIN.PROXY_URL_HELP
+
+                gpm.method:
+                    type: toggle
+                    label: PLUGIN_ADMIN.GPM_METHOD
+                    highlight: auto
+                    help: PLUGIN_ADMIN.GPM_METHOD_HELP
+                    options:
+                        auto: PLUGIN_ADMIN.AUTO
+                        fopen: PLUGIN_ADMIN.FOPEN
+                        curl: PLUGIN_ADMIN.CURL
+
+                gpm.official_gpm_only:
+                    type: toggle
+                    label: PLUGIN_ADMIN.GPM_OFFICIAL_ONLY
+                    highlight: auto
+                    help: PLUGIN_ADMIN.GPM_OFFICIAL_ONLY_HELP
+                    highlight: 1
+                    options:
+                        1: PLUGIN_ADMIN.YES
+                        0: PLUGIN_ADMIN.NO
+                    default: true
+                    validate:
+                        type: bool
+
+                gpm.verify_peer:
+                    type: toggle
+                    label: PLUGIN_ADMIN.GPM_VERIFY_PEER
+                    highlight: 1
+                    help: PLUGIN_ADMIN.GPM_VERIFY_PEER_HELP
+                    options:
+                        1: PLUGIN_ADMIN.YES
+                        0: PLUGIN_ADMIN.NO
+                    validate:
+                        type: bool
+
+                reverse_proxy_setup:
+                    type: toggle
+                    label: PLUGIN_ADMIN.REVERSE_PROXY
+                    highlight: 0
+                    help: PLUGIN_ADMIN.REVERSE_PROXY_HELP
+                    options:
+                        1: PLUGIN_ADMIN.YES
+                        0: PLUGIN_ADMIN.NO
+                    validate:
+                        type: bool
+
+                username_regex:
+                    type: text
+                    size: large
+                    label: PLUGIN_ADMIN.USERNAME_REGEX
+                    help: PLUGIN_ADMIN.USERNAME_REGEX_HELP
+
+                pwd_regex:
+                    type: text
+                    size: large
+                    label: PLUGIN_ADMIN.PWD_REGEX
+                    help: PLUGIN_ADMIN.PWD_REGEX_HELP
+
+                intl_enabled:
+                    type: toggle
+                    label: PLUGIN_ADMIN.INTL_ENABLED
+                    highlight: 1
+                    help: PLUGIN_ADMIN.INTL_ENABLED_HELP
+                    options:
+                        1: PLUGIN_ADMIN.YES
+                        0: PLUGIN_ADMIN.NO
+                    validate:
+                        type: bool
+
                 wrapped_site:
                     type: toggle
                     label: PLUGIN_ADMIN.WRAPPED_SITE
@@ -774,6 +1180,7 @@ form:
 
                 param_sep:
                     type: select
+                    size: medium
                     label: PLUGIN_ADMIN.PARAMETER_SEPARATOR
                     classes: fancy
                     help: PLUGIN_ADMIN.PARAMETER_SEPARATOR_HELP
@@ -781,3 +1188,33 @@ form:
                     options:
                         ':': ': (default)'
                         ';': '; (for Apache running on Windows)'
+
+                force_ssl:
+                    type: toggle
+                    label: PLUGIN_ADMIN.FORCE_SSL
+                    highlight: 0
+                    help: PLUGIN_ADMIN.FORCE_SSL_HELP
+                    options:
+                        1: PLUGIN_ADMIN.YES
+                        0: PLUGIN_ADMIN.NO
+                    validate:
+                        type: bool
+
+                force_lowercase_urls:
+                    type: toggle
+                    label: PLUGIN_ADMIN.FORCE_LOWERCASE_URLS
+                    highlight: 1
+                    default: 1
+                    help: PLUGIN_ADMIN.FORCE_LOWERCASE_URLS_HELP
+                    options:
+                        1: PLUGIN_ADMIN.YES
+                        0: PLUGIN_ADMIN.NO
+                    validate:
+                        type: bool
+
+                custom_base_url:
+                    type: text
+                    size: medium
+                    placeholder: "e.g. http://yoursite.com/yourpath"
+                    label: PLUGIN_ADMIN.CUSTOM_BASE_URL
+                    help: PLUGIN_ADMIN.CUSTOM_BASE_URL_HELP

system/blueprints/pages/default.yaml

@@ -2,9 +2,9 @@ title: PLUGIN_ADMIN.DEFAULT
 
 rules:
   slug:
-    pattern: "[a-z][a-z0-9_\-]+"
+    pattern: '[a-zA-Zа-яA-Я0-9_\-]+'
-    min: 2
+    min: 1
-    max: 80
+    max: 200
 
 form:
   validation: loose
@@ -29,11 +29,10 @@ form:
 
             content:
                 type: markdown
-                label: PLUGIN_ADMIN.CONTENT
                 validate:
                   type: textarea
 
-            uploads:
+            header.media_order:
               type: pagemedia
               label: PLUGIN_ADMIN.PAGE_MEDIA
 
@@ -45,7 +44,7 @@ form:
 
             publishing:
               type: section
-              title: Publishing
+              title: PLUGIN_ADMIN.PUBLISHING
               underline: true
 
               fields:
@@ -88,7 +87,6 @@ form:
                   placeholder_key: PLUGIN_ADMIN.METADATA_KEY
                   placeholder_value: PLUGIN_ADMIN.METADATA_VALUE
 
-
             taxonomies:
               type: section
               title: PLUGIN_ADMIN.TAXONOMIES
@@ -119,31 +117,16 @@ form:
                       title: PLUGIN_ADMIN.SETTINGS
                       underline: true
 
-                    ordering:
-                      type: toggle
-                      label: PLUGIN_ADMIN.FOLDER_NUMERIC_PREFIX
-                      help: PLUGIN_ADMIN.FOLDER_NUMERIC_PREFIX_HELP
-                      highlight: 1
-                      options:
-                        1: PLUGIN_ADMIN.ENABLED
-                        0: PLUGIN_ADMIN.DISABLED
-                      validate:
-                        type: bool
-
                     folder:
                       type: text
                       label: PLUGIN_ADMIN.FOLDER_NAME
                       validate:
-                        type: slug
+                        rule: slug
 
                     route:
-                      type: select
+                      type: parents
                       label: PLUGIN_ADMIN.PARENT
                       classes: fancy
-                      '@data-options': '\Grav\Common\Page\Pages::parents'
-                      '@data-default': '\Grav\Plugin\admin::route'
-                      options:
-                        '/': PLUGIN_ADMIN.DEFAULT_OPTION_ROOT
 
                     name:
                       type: select
@@ -151,7 +134,7 @@ form:
                       label: PLUGIN_ADMIN.PAGE_FILE
                       help: PLUGIN_ADMIN.PAGE_FILE_HELP
                       default: default
-                      '@data-options': '\Grav\Common\Page\Pages::pageTypes'
+                      data-options@: '\Grav\Common\Page\Pages::pageTypes'
 
                     header.body_classes:
                       type: text
@@ -167,9 +150,20 @@ form:
                       title: PLUGIN_ADMIN.ORDERING
                       underline: true
 
+                    ordering:
+                      type: toggle
+                      label: PLUGIN_ADMIN.FOLDER_NUMERIC_PREFIX
+                      help: PLUGIN_ADMIN.FOLDER_NUMERIC_PREFIX_HELP
+                      highlight: 1
+                      options:
+                        1: PLUGIN_ADMIN.ENABLED
+                        0: PLUGIN_ADMIN.DISABLED
+                      validate:
+                        type: bool
+
                     order:
                       type: order
-                      label: PLUGIN_ADMIN.PAGE_ORDER
+                      label: PLUGIN_ADMIN.SORTABLE_PAGES
                       sitemap:
 
             overrides:
@@ -179,6 +173,19 @@ form:
 
               fields:
 
+                header.dateformat:
+                  toggleable: true
+                  type: select
+                  size: medium
+                  selectize:
+                    create: true
+                  label: PLUGIN_ADMIN.DEFAULT_DATE_FORMAT
+                  help: PLUGIN_ADMIN.DEFAULT_DATE_FORMAT_HELP
+                  placeholder: PLUGIN_ADMIN.DEFAULT_DATE_FORMAT_PLACEHOLDER
+                  data-options@: '\Grav\Common\Utils::dateFormats'
+                  validate:
+                    type: string
+
                 header.menu:
                   type: text
                   label: PLUGIN_ADMIN.MENU
@@ -204,7 +211,7 @@ form:
                   type: checkboxes
                   label: PLUGIN_ADMIN.PROCESS
                   toggleable: true
-                  '@config-default': system.pages.process
+                  config-default@: system.pages.process
                   default:
                     markdown: true
                     twig: false
@@ -213,13 +220,37 @@ form:
                     twig: Twig
                   use: keys
 
+                header.twig_first:
+                  type: toggle
+                  toggleable: true
+                  label: PLUGIN_ADMIN.TWIG_FIRST
+                  help: PLUGIN_ADMIN.TWIG_FIRST_HELP
+                  highlight: 0
+                  options:
+                    1: PLUGIN_ADMIN.YES
+                    0: PLUGIN_ADMIN.NO
+                  validate:
+                    type: bool
+
+                header.never_cache_twig:
+                  type: toggle
+                  toggleable: true
+                  label: PLUGIN_ADMIN.NEVER_CACHE_TWIG
+                  help: PLUGIN_ADMIN.NEVER_CACHE_TWIG_HELP
+                  highlight: 0
+                  options:
+                    1: PLUGIN_ADMIN.YES
+                    0: PLUGIN_ADMIN.NO
+                  validate:
+                    type: bool
+
                 header.child_type:
                   type: select
                   toggleable: true
                   label: PLUGIN_ADMIN.DEFAULT_CHILD_TYPE
                   default: default
                   placeholder: PLUGIN_ADMIN.USE_GLOBAL
-                  '@data-options': '\Grav\Common\Page\Pages::types'
+                  data-options@: '\Grav\Common\Page\Pages::types'
 
                 header.routable:
                   type: toggle
@@ -256,13 +287,72 @@ form:
                   validate:
                     type: bool
 
+                header.debugger:
+                  type: toggle
+                  toggleable: true
+                  label: PLUGIN_ADMIN.DEBUGGER
+                  help: PLUGIN_ADMIN.DEBUGGER_HELP
+                  highlight: 1
+                  options:
+                    1: PLUGIN_ADMIN.ENABLED
+                    0: PLUGIN_ADMIN.DISABLED
+                  validate:
+                    type: bool
+
                 header.template:
+                  type: text
+                  toggleable: true
+                  label: PLUGIN_ADMIN.DISPLAY_TEMPLATE
+
+                header.append_url_extension:
+                  type: text
+                  label: PLUGIN_ADMIN.APPEND_URL_EXT
+                  toggleable: true
+                  help: PLUGIN_ADMIN.APPEND_URL_EXT_HELP
+
+            routes_only:
+              type: section
+              title: PLUGIN_ADMIN.ROUTE_OVERRIDES
+              underline: true
+
+              fields:
+
+                header.routes.default:
+                  type: text
+                  toggleable: true
+                  label: PLUGIN_ADMIN.ROUTE_DEFAULT
+
+                header.routes.canonical:
+                  type: text
+                  toggleable: true
+                  label: PLUGIN_ADMIN.ROUTE_CANONICAL
+
+                header.routes.aliases:
+                  type: array
+                  toggleable: true
+                  value_only: true
+                  size: large
+                  label: PLUGIN_ADMIN.ROUTE_ALIASES
+
+
+            admin_only:
+              type: section
+              title: PLUGIN_ADMIN.ADMIN_SPECIFIC_OVERRIDES
+              underline: true
+
+              fields:
+
+                header.admin.children_display_order:
                   type: select
+                  label: PLUGIN_ADMIN.ADMIN_CHILDREN_DISPLAY_ORDER
+                  help: PLUGIN_ADMIN.ADMIN_CHILDREN_DISPLAY_ORDER_HELP
                   toggleable: true
                   classes: fancy
-                  label: PLUGIN_ADMIN.DISPLAY_TEMPLATE
+                  default: 'collection'
-                  default: default
+                  options:
-                  '@data-options': '\Grav\Common\Page\Pages::types'
+                    'default': 'Ordered by Folder name (default)'
+                    'collection': 'Ordered by Collection definition'
+
 
                 header.order_by:
                   type: hidden

system/blueprints/pages/external.yaml

@@ -0,0 +1,52 @@
+title: PLUGIN_ADMIN:EXTERNAL
+extends@:
+    type: default
+    context: blueprints://pages
+
+form:
+  validation: loose
+  fields:
+
+    tabs:
+      type: tabs
+      active: 1
+
+      fields:
+
+        content:
+          fields:
+
+            header.title:
+              type: text
+              autofocus: true
+              style: horizontal
+              label: PLUGIN_ADMIN.TITLE
+
+            content:
+              unset@: true
+
+            header.media_order:
+              unset@: true
+
+            header.external_url:
+                type: text
+                label: PLUGIN_ADMIN.EXTERNAL_URL
+                placeholder: https://getgrav.org
+                validate:
+                    required: true
+        options:
+          fields:
+
+            publishing:
+
+              fields:
+
+                header.date:
+                  unset@: true
+
+                header.metadata:
+                  unset@: true
+
+            taxonomies:
+              unset@: true
+

system/blueprints/pages/modular.yaml

@@ -1,7 +1,5 @@
 title: PLUGIN_ADMIN.MODULAR
-@extends:
+extends@: default
-    type: default
-    context: blueprints://pages
 
 form:
   fields:
@@ -13,35 +11,28 @@ form:
         content:
           fields:
 
+            modular_title:
+              type: spacer
+              title: PLUGIN_ADMIN.MODULAR_SETUP
+
             header.content.items:
-              type: select
+              type: text
               label: PLUGIN_ADMIN.ITEMS
               default: '@self.modular'
-              options:
+              size: medium
-                '@self.modular': Children
 
             header.content.order.by:
-              type: select
+              type: text
               label: PLUGIN_ADMIN.ORDER_BY
-              default: date
+              placeholder: date
-              options:
+              help:
-                folder: PLUGIN_ADMIN.FOLDER
+              size: small
-                title: PLUGIN_ADMIN.TITLE
-                date: PLUGIN_ADMIN.DATE
-                default: PLUGIN_ADMIN.DEFAULT
 
             header.content.order.dir:
-              type: select
+              type: text
               label: PLUGIN_ADMIN.ORDER
-              default: desc
+              help: '"desc" or "asc" are valid values'
-              options:
+              placeholder: desc
-                asc: PLUGIN_ADMIN.ASCENDING
+              size: small
-                desc: PLUGIN_ADMIN.DESCENDING
 
-            header.process:
-              type: ignore
-            content:
-              type: ignore
-            uploads:
-              type: ignore
 

system/blueprints/pages/modular_new.yaml

@@ -1,56 +0,0 @@
-rules:
-  slug:
-    pattern: "[a-z][a-z0-9_\-]+"
-    min: 2
-    max: 80
-
-form:
-  validation: loose
-  fields:
-
-    section:
-        type: section
-        title: PLUGIN_ADMIN.ADD_MODULAR_CONTENT
-
-    title:
-      type: text
-      label: PLUGIN_ADMIN.PAGE_TITLE
-      validate:
-        required: true
-
-    folder:
-      type: text
-      label: PLUGIN_ADMIN.FOLDER_NAME
-      validate:
-        type: slug
-        required: true
-
-    route:
-      type: select
-      label: PLUGIN_ADMIN.PAGE
-      classes: fancy
-      '@data-options': '\Grav\Common\Page\Pages::parents'
-      '@data-default': '\Grav\Plugin\admin::route'
-      options:
-        '': PLUGIN_ADMIN.DEFAULT_OPTION_SELECT
-      validate:
-        required: true
-
-    name:
-      type: select
-      classes: fancy
-      label: PLUGIN_ADMIN.MODULAR_TEMPLATE
-      help: PLUGIN_ADMIN.PAGE_FILE_HELP
-      default: default
-      '@data-options': '\Grav\Common\Page\Pages::modularTypes'
-      validate:
-        required: true
-
-    modular:
-      type: hidden
-      default: 1
-      validate:
-        type: bool
-
-    blueprint:
-      type: blueprint

system/blueprints/pages/modular_raw.yaml

@@ -1,97 +0,0 @@
-rules:
-  slug:
-    pattern: "[a-z][a-z0-9_\-]+"
-    min: 2
-    max: 80
-
-form:
-  validation: loose
-  fields:
-
-    tabs:
-      type: tabs
-      active: 1
-
-      fields:
-        content:
-          type: tab
-          title: PLUGIN_ADMIN.CONTENT
-
-          fields:
-            frontmatter:
-              type: frontmatter
-              label: PLUGIN_ADMIN.FRONTMATTER
-
-
-            content:
-              type: markdown
-              label: PLUGIN_ADMIN.CONTENT
-
-            uploads:
-              type: pagemedia
-              label: PLUGIN_ADMIN.PAGE_MEDIA
-
-
-        options:
-          type: tab
-          title: PLUGIN_ADMIN.OPTIONS
-
-          fields:
-
-            columns:
-              type: columns
-
-              fields:
-                column1:
-                  type: column
-
-                  fields:
-
-                    ordering:
-                      type: toggle
-                      label: PLUGIN_ADMIN.FOLDER_NUMERIC_PREFIX
-                      help: PLUGIN_ADMIN.FOLDER_NUMERIC_PREFIX_HELP
-                      highlight: 1
-                      options:
-                        1: PLUGIN_ADMIN.ENABLED
-                        0: PLUGIN_ADMIN.DISABLED
-                      validate:
-                        type: bool
-
-                    folder:
-                      type: text
-                      label: PLUGIN_ADMIN.FILENAME
-                      validate:
-                        type: slug
-                        required: true
-
-                    route:
-                      type: select
-                      label: PLUGIN_ADMIN.PARENT
-                      classes: fancy
-                      '@data-options': '\Grav\Common\Page\Pages::parents'
-                      '@data-default': '\Grav\Plugin\admin::route'
-                      options:
-                        '': PLUGIN_ADMIN.DEFAULT_OPTION_SELECT
-                      validate:
-                        required: true
-
-                    name:
-                      type: select
-                      classes: fancy
-                      label: PLUGIN_ADMIN.MODULAR_TEMPLATE
-                      default: default
-                      '@data-options': '\Grav\Common\Page\Pages::modularTypes'
-                      validate:
-                        required: true
-
-                column2:
-                    type: column
-
-                    fields:
-                      order:
-                        type: order
-                        label: PLUGIN_ADMIN.ORDERING
-
-            blueprint:
-              type: blueprint

system/blueprints/pages/move.yaml

@@ -1,17 +0,0 @@
-rules:
-  slug:
-    pattern: "[a-z][a-z0-9_\-]+"
-    min: 2
-    max: 80
-
-form:
-  validation: loose
-  fields:
-    route:
-      type: select
-      label: PLUGIN_ADMIN.PARENT
-      classes: fancy
-      '@data-options': '\Grav\Common\Page\Pages::parents'
-      '@data-default': '\Grav\Plugin\admin::route'
-      options:
-        '/': PLUGIN_ADMIN.DEFAULT_OPTION_ROOT

system/blueprints/pages/new.yaml

@@ -1,66 +0,0 @@
-rules:
-  slug:
-    pattern: "[a-z][a-z0-9_\-]+"
-    min: 2
-    max: 80
-
-form:
-  validation: loose
-  fields:
-
-    section:
-        type: section
-        title: PLUGIN_ADMIN.ADD_PAGE
-
-    title:
-      type: text
-      label: PLUGIN_ADMIN.PAGE_TITLE
-      help: PLUGIN_ADMIN.PAGE_TITLE_HELP
-      validate:
-        required: true
-
-    folder:
-      type: text
-      label: PLUGIN_ADMIN.FOLDER_NAME
-      help: PLUGIN_ADMIN.FOLDER_NAME_HELP
-      validate:
-        type: slug
-        required: true
-
-    route:
-      type: select
-      label: PLUGIN_ADMIN.PARENT_PAGE
-      classes: fancy
-      '@data-options': '\Grav\Common\Page\Pages::parents'
-      '@data-default': '\Grav\Plugin\admin::getLastPageRoute'
-      options:
-        '/': PLUGIN_ADMIN.DEFAULT_OPTION_ROOT
-      validate:
-        required: true
-
-    name:
-      type: select
-      classes: fancy
-      label: PLUGIN_ADMIN.PAGE_FILE
-      help: PLUGIN_ADMIN.PAGE_FILE_HELP
-      '@data-options': '\Grav\Common\Page\Pages::types'
-      '@data-default': '\Grav\Plugin\admin::getLastPageName'
-      validate:
-        required: true
-
-    visible:
-      type: toggle
-      label: PLUGIN_ADMIN.VISIBLE
-      help: PLUGIN_ADMIN.VISIBLE_HELP
-      highlight: ''
-      default: ''
-      options:
-        '': Auto
-        1: PLUGIN_ADMIN.YES
-        0: PLUGIN_ADMIN.NO
-      validate:
-        type: bool
-        required: true
-
-    blueprint:
-      type: blueprint

system/blueprints/pages/raw.yaml

@@ -1,96 +0,0 @@
-rules:
-  slug:
-    pattern: "[a-z][a-z0-9_\-]+"
-    min: 2
-    max: 80
-
-form:
-  validation: loose
-  fields:
-
-    tabs:
-      type: tabs
-      active: 1
-
-      fields:
-        content:
-          type: tab
-          title: PLUGIN_ADMIN.CONTENT
-
-          fields:
-            frontmatter:
-              type: frontmatter
-              label: PLUGIN_ADMIN.FRONTMATTER
-              autofocus: true
-
-            content:
-              type: markdown
-              label: PLUGIN_ADMIN.CONTENT
-
-            uploads:
-              type: pagemedia
-              label: PLUGIN_ADMIN.PAGE_MEDIA
-
-        options:
-          type: tab
-          title: PLUGIN_ADMIN.OPTIONS
-
-          fields:
-
-            columns:
-              type: columns
-
-              fields:
-                column1:
-                  type: column
-
-                  fields:
-
-                    ordering:
-                      type: toggle
-                      label: PLUGIN_ADMIN.FOLDER_NUMERIC_PREFIX
-                      help: PLUGIN_ADMIN.FOLDER_NUMERIC_PREFIX_HELP
-                      highlight: 1
-                      options:
-                        1: PLUGIN_ADMIN.ENABLED
-                        0: PLUGIN_ADMIN.DISABLED
-                      validate:
-                        type: bool
-
-                    folder:
-                      type: text
-                      label: PLUGIN_ADMIN.FOLDER_NAME
-                      help: PLUGIN_ADMIN.FOLDER_NAME_HELP
-                      validate:
-                        type: slug
-                        required: true
-
-                    route:
-                      type: select
-                      label: PLUGIN_ADMIN.PARENT
-                      classes: fancy
-                      '@data-options': '\Grav\Common\Page\Pages::parents'
-                      '@data-default': '\Grav\Plugin\admin::route'
-                      options:
-                        '/': PLUGIN_ADMIN.DEFAULT_OPTION_ROOT
-
-                    name:
-                      type: select
-                      classes: fancy
-                      label: PLUGIN_ADMIN.DISPLAY_TEMPLATE
-                      help: PLUGIN_ADMIN.DISPLAY_TEMPLATE_HELP
-                      default: default
-                      '@data-options': '\Grav\Common\Page\Pages::types'
-                      validate:
-                        required: true
-
-                column2:
-                    type: column
-
-                    fields:
-                      order:
-                        type: order
-                        label: PLUGIN_ADMIN.ORDERING
-
-            blueprint:
-              type: blueprint

system/blueprints/user/account.yaml

@@ -1,56 +1,125 @@
-title: Site
+title: Account
 form:
     validation: loose
+
     fields:
 
-        content:
+            info:
-            type: section
+                type: userinfo
-            title: PLUGIN_ADMIN.ACCOUNT
+                size: large
 
-            fields:
+            avatar:
-                username:
+                type: file
-                    type: text
+                size: large
-                    size: large
+                destination: 'user://accounts/avatars'
-                    label: PLUGIN_ADMIN.USERNAME
+                multiple: false
-                    disabled: true
+                random_name: true
-                    readonly: true
 
-                email:
+            content:
-                    type: email
+                type: section
-                    size: large
+                title: PLUGIN_ADMIN.ACCOUNT
-                    label: PLUGIN_ADMIN.EMAIL
+                underline: true
-                    validate:
-                      type: email
-                      message: PLUGIN_ADMIN.EMAIL_VALIDATION_MESSAGE
-                      required: true
 
-                password:
+            username:
-                    type: password
+                type: text
-                    size: large
+                size: large
-                    label: PLUGIN_ADMIN.PASSWORD
+                label: PLUGIN_ADMIN.USERNAME
-                    validate:
+                disabled: true
-                      required: true
+                readonly: true
-                      message: PLUGIN_ADMIN.PASSWORD_VALIDATION_MESSAGE
-                      pattern: '(?=.*\d)(?=.*[a-z])(?=.*[A-Z]).{8,}'
 
-                fullname:
+            email:
-                    type: text
+                type: email
-                    size: large
+                size: large
-                    label: PLUGIN_ADMIN.FULL_NAME
+                label: PLUGIN_ADMIN.EMAIL
-                    validate:
+                validate:
-                      required: true
+                  type: email
+                  message: PLUGIN_ADMIN.EMAIL_VALIDATION_MESSAGE
+                  required: true
 
-                title:
+            password:
-                    type: text
+                type: password
-                    size: large
+                size: large
-                    label: PLUGIN_ADMIN.TITLE
+                label: PLUGIN_ADMIN.PASSWORD
+                autocomplete: new-password
+                validate:
+                  required: false
+                  message: PLUGIN_ADMIN.PASSWORD_VALIDATION_MESSAGE
+                  config-pattern@: system.pwd_regex
 
-                language:
+            fullname:
-                    type: select
+                type: text
-                    label: PLUGIN_ADMIN.LANGUAGE
+                size: large
-                    size: medium
+                label: PLUGIN_ADMIN.FULL_NAME
-                    classes: fancy
+                validate:
-                    '@data-options': '\Grav\Plugin\admin::adminLanguages'
+                  required: true
-                    default: 'en'
-                    help: PLUGIN_ADMIN.LANGUAGE_HELP
 
+            title:
+                type: text
+                size: large
+                label: PLUGIN_ADMIN.TITLE
+
+            language:
+                type: select
+                label: PLUGIN_ADMIN.LANGUAGE
+                size: medium
+                classes: fancy
+                data-options@: '\Grav\Plugin\Admin\Admin::adminLanguages'
+                default: 'en'
+                help: PLUGIN_ADMIN.LANGUAGE_HELP
+
+            twofa_check:
+                type: conditional
+                condition: config.plugins.admin.twofa_enabled
+
+                fields:
+
+                    twofa:
+                        title: PLUGIN_ADMIN.2FA_TITLE
+                        type: section
+                        underline: true
+
+                    twofa_enabled:
+                        type: toggle
+                        label: PLUGIN_ADMIN.2FA_ENABLED
+                        classes: twofa-toggle
+                        highlight: 1
+                        default: 0
+                        options:
+                          1: PLUGIN_ADMIN.YES
+                          0: PLUGIN_ADMIN.NO
+                        validate:
+                          type: bool
+
+
+                    twofa_secret:
+                        type: 2fa_secret
+                        outerclasses: 'twofa-secret'
+                        markdown: true
+                        label: PLUGIN_ADMIN.2FA_SECRET
+                        sublabel: PLUGIN_ADMIN.2FA_SECRET_HELP
+
+
+            security:
+                title: PLUGIN_ADMIN.ACCESS_LEVELS
+                type: section
+                security: admin.super
+                underline: true
+
+                fields:
+                    groups:
+                        type: select
+                        multiple: true
+                        size: large
+                        label: PLUGIN_ADMIN.GROUPS
+                        data-options@: '\Grav\Common\User\Group::groupNames'
+                        classes: fancy
+                        help: PLUGIN_ADMIN.GROUPS_HELP
+                        validate:
+                            type: commalist
+
+                    access:
+                        type: permissions
+                        label: PLUGIN_ADMIN.PERMISSIONS
+                        ignore_empty: true
+                        validate:
+                            type: array

system/blueprints/user/group.yaml

@@ -0,0 +1,37 @@
+title: Group
+form:
+    validation: loose
+
+    fields:
+        spacer:
+            type: spacer
+            text: '<br>'
+
+        groupname:
+            type: text
+            size: large
+            label: PLUGIN_ADMIN.NAME
+            disabled: true
+            readonly: true
+
+        readableName:
+            type: text
+            size: large
+            label: PLUGIN_ADMIN_PRO.READABLE_NAME
+
+        description:
+            type: text
+            size: large
+            label: PLUGIN_ADMIN.DESCRIPTION
+
+        icon:
+            type: text
+            size: small
+            label: PLUGIN_ADMIN_PRO.ICON
+
+        access:
+            type: permissions
+            label: PLUGIN_ADMIN.PERMISSIONS
+            ignore_empty: true
+            validate:
+                type: array

system/blueprints/user/group_new.yaml

@@ -0,0 +1,16 @@
+title: PLUGIN_ADMIN_PRO.ADD_GROUP
+
+form:
+  validation: loose
+  fields:
+
+    content:
+      type: section
+      title: PLUGIN_ADMIN_PRO.ADD_GROUP
+
+    groupname:
+      type: text
+      label: PLUGIN_ADMIN_PRO.GROUP_NAME
+      help: PLUGIN_ADMIN_PRO.GROUP_NAME_HELP
+      validate:
+        required: true

system/config/media.yaml

@@ -1,190 +1,210 @@
-defaults:
+types:
-  type: file
+  defaults:
-  thumb: media/thumb.png
+    type: file
-  mime: application/octet-stream
+    thumb: media/thumb.png
-  image:
+    mime: application/octet-stream
-    filters:
+    image:
-      default:
+      filters:
-        - enableProgressive
+        default:
-
+          - enableProgressive
-jpg:
-  type: image
-  thumb: media/thumb-jpg.png
-  mime: image/jpeg
-jpe:
-  type: image
-  thumb: media/thumb-jpg.png
-  mime: image/jpeg
-jpeg:
-  type: image
-  thumb: media/thumb-jpeg.png
-  mime: image/jpeg
-png:
-  type: image
-  thumb: media/thumb-png.png
-  mime: image/png
-gif:
-  type: animated
-  thumb: media/thumb-gif.png
-  mime: image/gif
-
-svg:
-  type: vector
-  thumb: media/thumb-gif.png
-  mime: image/svg+xml
-
-mp4:
-  type: video
-  thumb: media/thumb-mp4.png
-  mime: video/mp4
-mov:
-  type: video
-  thumb: media/thumb-mov.png
-  mime: video/quicktime
-m4v:
-  type: video
-  thumb: media/thumb-m4v.png
-  mime: video/x-m4v
-swf:
-  type: video
-  thumb: media/thumb-swf.png
-  mime: video/x-flv
-flv:
-  type: video
-  thumb: media/thumb-flv.png
-  mime: video/x-flv
-
-mp3:
-  type: audio
-  thumb: media/thumb-mp3.png
-  mime: audio/mp3
-ogg:
-  type: audio
-  thumb: media/thumb-ogg.png
-  mime: audio/ogg
-wma:
-  type: audio
-  thumb: media/thumb-wma.png
-  mime: audio/wma
-m4a:
-  type: audio
-  thumb: media/thumb-m4a.png
-  mime: audio/m4a
-wav:
-  type: audio
-  thumb: media/thumb-wav.png
-  mime: audio/wav
-aiff:
-  type: audio
-  mime: audio/aiff
-aif:
-  type: audio
-  mime: audio/aif
-
-txt:
-  type: file
-  thumb: media/thumb-txt.png
-  mime: text/plain
-xml:
-  type: file
-  thumb: media/thumb-xml.png
-  mime: application/xml
-doc:
-  type: file
-  thumb: media/thumb-doc.png
-  mime: application/msword
-docx:
-  type: file
-  mime: application/msword
-xls:
-  type: file
-  mime: application/vnd.ms-excel
-xlt:
-  type: file
-  mime: application/vnd.ms-excel
-xlm:
-  type: file
-  mime: application/vnd.ms-excel
-xld:
-  type: file
-  mime: application/vnd.ms-excel
-xla:
-  type: file
-  mime: application/vnd.ms-excel
-xlc:
-  type: file
-  mime: application/vnd.ms-excel
-xlw:
-  type: file
-  mime: application/vnd.ms-excel
-xll:
-  type: file
-  mime: application/vnd.ms-excel
-ppt:
-  type: file
-  mime: application/vnd.ms-powerpoint
-pps:
-  type: file
-  mime: application/vnd.ms-powerpoint
-rtf:
-  type: file
-  mime: application/rtf
-
-bmp:
-  type: file
-  mime: image/bmp
-tiff:
-  type: file
-  mime: image/tiff
-mpeg:
-  type: file
-  mime: video/mpeg
-mpg:
-  type: file
-  mime: video/mpeg
-mpe:
-  type: file
-  mime: video/mpeg
-avi:
-  type: file
-  mime: video/msvideo
-wmv:
-  type: file
-  mime: video/x-ms-wmv
-
-html:
-  type: file
-  thumb: media/thumb-html.png
-  mime: text/html
-htm:
-  type: file
-  thumb: media/thumb-html.png
-  mime: text/html
-pdf:
-  type: file
-  thumb: media/thumb-pdf.png
-  mime: application/pdf
-zip:
-  type: file
-  thumb: media/thumb-zip.png
-  mime: application/zip
-gz:
-  type: file
-  thumb: media/thumb-gz.png
-  mime: application/gzip
-tar:
-  type: file
-  mime: application/x-tar
-css:
-  type: file
-  thumb: media/thumb-css.png
-  mime: text/css
-js:
-  type: file
-  thumb: media/thumb-js.png
-  mime: application/javascript
-json:
-  type: file
-  thumb: media/thumb-json.png
-  mime: application/json
 
+  jpg:
+    type: image
+    thumb: media/thumb-jpg.png
+    mime: image/jpeg
+  jpe:
+    type: image
+    thumb: media/thumb-jpg.png
+    mime: image/jpeg
+  jpeg:
+    type: image
+    thumb: media/thumb-jpg.png
+    mime: image/jpeg
+  png:
+    type: image
+    thumb: media/thumb-png.png
+    mime: image/png
+  gif:
+    type: animated
+    thumb: media/thumb-gif.png
+    mime: image/gif
+  svg:
+    type: vector
+    thumb: media/thumb-svg.png
+    mime: image/svg+xml
+  mp4:
+    type: video
+    thumb: media/thumb-mp4.png
+    mime: video/mp4
+  mov:
+    type: video
+    thumb: media/thumb-mov.png
+    mime: video/quicktime
+  m4v:
+    type: video
+    thumb: media/thumb-m4v.png
+    mime: video/x-m4v
+  swf:
+    type: video
+    thumb: media/thumb-swf.png
+    mime: video/x-flv
+  flv:
+    type: video
+    thumb: media/thumb-flv.png
+    mime: video/x-flv
+  webm:
+    type: file
+    thumb: media/thumb-webm.png
+    mime: video/webm
+  ogv:
+    type: video
+    thumb: media/thumb-ogg.png
+    mime: video/ogg
+  mp3:
+    type: audio
+    thumb: media/thumb-mp3.png
+    mime: audio/mp3
+  ogg:
+    type: audio
+    thumb: media/thumb-ogg.png
+    mime: audio/ogg
+  wma:
+    type: audio
+    thumb: media/thumb-wma.png
+    mime: audio/wma
+  m4a:
+    type: audio
+    thumb: media/thumb-m4a.png
+    mime: audio/m4a
+  wav:
+    type: audio
+    thumb: media/thumb-wav.png
+    mime: audio/wav
+  aiff:
+    type: audio
+    thumb: media/thumb-aif.png
+    mime: audio/aiff
+  aif:
+    type: audio
+    thumb: media/thumb-aif.png
+    mime: audio/aif
+  txt:
+    type: file
+    thumb: media/thumb-txt.png
+    mime: text/plain
+  xml:
+    type: file
+    thumb: media/thumb-xml.png
+    mime: application/xml
+  doc:
+    type: file
+    thumb: media/thumb-doc.png
+    mime: application/msword
+  docx:
+    type: file
+    thumb: media/thumb-docx.png
+    mime: application/msword
+  xls:
+    type: file
+    thumb: media/thumb-xls.png
+    mime: application/vnd.ms-excel
+  xlsx:
+    type: file
+    thumb: media/thumb-xlsx.png
+    mime: application/vnd.ms-excel
+  ppt:
+    type: file
+    thumb: media/thumb-ppt.png
+    mime: application/vnd.ms-powerpoint
+  pptx:
+    type: file
+    thumb: media/thumb-pptx.png
+    mime: application/vnd.ms-powerpoint
+  pps:
+    type: file
+    thumb: media/thumb-pps.png
+    mime: application/vnd.ms-powerpoint
+  rtf:
+    type: file
+    thumb: media/thumb-rtf.png
+    mime: application/rtf
+  bmp:
+    type: file
+    thumb: media/thumb-bmp.png
+    mime: image/bmp
+  tiff:
+    type: file
+    thumb: media/thumb-tiff.png
+    mime: image/tiff
+  mpeg:
+    type: file
+    thumb: media/thumb-mpg.png
+    mime: video/mpeg
+  mpg:
+    type: file
+    thumb: media/thumb-mpg.png
+    mime: video/mpeg
+  mpe:
+    type: file
+    thumb: media/thumb-mpe.png
+    mime: video/mpeg
+  avi:
+    type: file
+    thumb: media/thumb-avi.png
+    mime: video/msvideo
+  wmv:
+    type: file
+    thumb: media/thumb-wmv.png
+    mime: video/x-ms-wmv
+  html:
+    type: file
+    thumb: media/thumb-html.png
+    mime: text/html
+  htm:
+    type: file
+    thumb: media/thumb-html.png
+    mime: text/html
+  ics:
+    type: iCal
+    thumb: media/thumb-ics.png
+    mime: text/calendar
+  pdf:
+    type: file
+    thumb: media/thumb-pdf.png
+    mime: application/pdf
+  ai:
+    type: file
+    thumb: media/thumb-ai.png
+    mime: image/ai
+  psd:
+    type: file
+    thumb: media/thumb-psd.png
+    mime: image/psd
+  zip:
+    type: file
+    thumb: media/thumb-zip.png
+    mime: application/zip
+  7z:
+    type: file
+    thumb: media/thumb-7z.png
+    mime: application/x-7z-compressed
+  gz:
+    type: file
+    thumb: media/thumb-gz.png
+    mime: application/gzip
+  tar:
+    type: file
+    thumb: media/thumb-tar.png
+    mime: application/x-tar
+  css:
+    type: file
+    thumb: media/thumb-css.png
+    mime: text/css
+  js:
+    type: file
+    thumb: media/thumb-js.png
+    mime: application/javascript
+  json:
+    type: file
+    thumb: media/thumb-json.png
+    mime: application/json

system/config/site.yaml

@@ -1,8 +1,9 @@
 title: Grav                                 # Name of the site
+default_lang: en                            # Default language for site (potentially used by theme)
 
 author:
   name: John Appleseed                      # Default author name
-  email: 'john@email.com'                   # Default author email
+  email: 'john@example.com'                 # Default author email
 
 taxonomies: [category,tag]                  # Arbitrary list of taxonomy types
 
@@ -16,12 +17,12 @@ summary:
   delimiter: ===                            # The summary delimiter
 
 redirects:
-  /redirect-test: /                         # Redirect test goes to home page
+#  '/redirect-test': '/'                         # Redirect test goes to home page
-  /old/(.*): /new/$1                        # Would redirect /old/my-page to /new/my-page
+#  '/old/(.*)': '/new/$1'                        # Would redirect /old/my-page to /new/my-page
 
 routes:
-  /something/else: '/blog/sample-3'         # Alias for /blog/sample-3
+#  '/something/else': '/blog/sample-3'         # Alias for /blog/sample-3
-  /new/(.*): '/blog/$1'                     # Regex any /new/my-page URL to /blog/my-page Route
+#  '/new/(.*)': '/blog/$1'                     # Regex any /new/my-page URL to /blog/my-page Route
 
 blog:
   route: '/blog'                            # Custom value added (accessible via system.blog.route)

system/config/streams.yaml

@@ -1,9 +1,4 @@
 schemes:
-  asset:
-    type: ReadOnlyStream
-    paths:
-      - assets
-
   image:
     type: ReadOnlyStream
     paths:

system/config/system.yaml

@@ -1,111 +1,152 @@
-absolute_urls: false                   # Absolute or relative URLs for `base_url`
+absolute_urls: false                             # Absolute or relative URLs for `base_url`
-timezone: ''                           # Valid values: http://php.net/manual/en/timezones.php
+timezone: ''                                     # Valid values: http://php.net/manual/en/timezones.php
-default_locale:                        # Default locale (defaults to system)
+default_locale:                                  # Default locale (defaults to system)
-param_sep: ':'                         # Parameter separator, use ';' for Apache on windows
+param_sep: ':'                                   # Parameter separator, use ';' for Apache on windows
-wrapped_site: false                    # For themes/plugins to know if Grav is wrapped by another platform
+wrapped_site: false                              # For themes/plugins to know if Grav is wrapped by another platform
+reverse_proxy_setup: false                       # Running in a reverse proxy scenario with different webserver ports than proxy
+force_ssl: false                                 # If enabled, Grav forces to be accessed via HTTPS (NOTE: Not an ideal solution)
+force_lowercase_urls: true                       # If you want to support mixed cased URLs set this to false
+custom_base_url: ''                              # Set the base_url manually, e.g. http://yoursite.com/yourpath
+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)
 
 languages:
-  supported: []                        # List of languages supported. eg: [en, fr, de]
+  supported: []                                  # List of languages supported. eg: [en, fr, de]
-  include_default_lang: true           # Include the default lang prefix in all URLs
+  include_default_lang: true                     # Include the default lang prefix in all URLs
-  translations: true                   # Enable translations by default
+  translations: true                             # Enable translations by default
-  translations_fallback: true          # Fallback through supported translations if active lang doesn't exist
+  translations_fallback: true                    # Fallback through supported translations if active lang doesn't exist
-  session_store_active: false          # Store active language in session
+  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
+  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
+  override_locale: false                         # Override the default or system locale with language specific one
 
 home:
-  alias: '/home'                       # Default path for home, ie /
+  alias: '/home'                                 # Default path for home, ie /
+  hide_in_urls: false                            # Hide the home route in URLs
 
 pages:
-  theme: antimatter                    # Default theme (defaults to "antimatter" theme)
+  theme: quark                                   # Default theme (defaults to "quark" theme)
   order:
-    by: default                        # Order pages by "default", "alpha" or "date"
+    by: default                                  # Order pages by "default", "alpha" or "date"
-    dir: asc                           # Default ordering direction, "asc" or "desc"
+    dir: asc                                     # Default ordering direction, "asc" or "desc"
   list:
-    count: 20                          # Default item count per page
+    count: 20                                    # Default item count per page
   dateformat:
-    default:                           # The default date format Grav expects in the `date: ` field
+    default:                                     # The default date format Grav expects in the `date: ` field
-    short: 'jS M Y'                    # Short date format
+    short: 'jS M Y'                              # Short date format
-    long: 'F jS \a\t g:ia'             # Long date format
+    long: 'F jS \a\t g:ia'                       # Long date format
-  publish_dates: true                  # automatically publish/unpublish based on dates
+  publish_dates: true                            # automatically publish/unpublish based on dates
   process:
-    markdown: true                     # Process Markdown
+    markdown: true                               # Process Markdown
-    twig: false                        # Process Twig
+    twig: false                                  # Process Twig
+  twig_first: false                              # Process Twig before markdown when processing both on a page
+  never_cache_twig: false                        # Only cache content, never cache twig processed in content (incompatible with `twig_first: true`)
   events:
-    page: true                         # Enable page level events
+    page: true                                   # Enable page level events
-    twig: true                         # Enable twig level events
+    twig: true                                   # Enable Twig level events
   markdown:
-    extra: false                       # Enable support for Markdown Extra support (GFM by default)
+    extra: false                                 # Enable support for Markdown Extra support (GFM by default)
-    auto_line_breaks: false            # Enable automatic line breaks
+    auto_line_breaks: false                      # Enable automatic line breaks
-    auto_url_links: false              # Enable automatic HTML links
+    auto_url_links: false                        # Enable automatic HTML links
-    escape_markup: false               # Escape markup tags into entities
+    escape_markup: false                         # Escape markup tags into entities
-    special_chars:                     # List of special characters to automatically convert to entities
+    special_chars:                               # List of special characters to automatically convert to entities
       '>': 'gt'
       '<': 'lt'
-  types: [txt,xml,html,json,rss,atom]  # list of valid page types
+  types: [txt,xml,html,htm,json,rss,atom]        # list of valid page types
-  expires: 604800                      # Page expires time in seconds (604800 seconds = 7 days)
+  append_url_extension: ''                       # Append page's extension in Page urls (e.g. '.html' results in /path/page.html)
-  last_modified: false                 # Set the last modified date header based on file modifcation timestamp
+  expires: 604800                                # Page expires time in seconds (604800 seconds = 7 days)
-  etag: false                          # Set the etag header tag
+  cache_control:                                 # Can be blank for no setting, or a valid `cache-control` text value
-  vary_accept_encoding: false          # Add `Vary: Accept-Encoding` header
+  last_modified: false                           # Set the last modified date header based on file modification timestamp
-  redirect_default_route: false        # Automatically redirect to a page's default route
+  etag: false                                    # Set the etag header tag
-  redirect_default_code: 301           # Default code to use for redirects
+  vary_accept_encoding: false                    # Add `Vary: Accept-Encoding` header
-  redirect_trailing_slash:  true       # Handle automatically or 301 redirect a trailing / URL
+  redirect_default_route: false                  # Automatically redirect to a page's default route
-  ignore_files: [.DS_Store]            # Files to ignore in Pages
+  redirect_default_code: 302                     # Default code to use for redirects
-  ignore_folders: [.git, .idea]        # Folders to ignore in Pages
+  redirect_trailing_slash: true                  # Handle automatically or 302 redirect a trailing / URL
-  ignore_hidden: true                  # Ignore all Hidden files and folders
+  ignore_files: [.DS_Store]                      # Files to ignore in Pages
-  url_taxonomy_filters: true           # Enable auto-magic URL-based taxonomy filters for page collections
+  ignore_folders: [.git, .idea]                  # Folders to ignore in Pages
+  ignore_hidden: true                            # Ignore all Hidden files and folders
+  url_taxonomy_filters: true                     # Enable auto-magic URL-based taxonomy filters for page collections
+  frontmatter:
+    process_twig: false                          # Should the frontmatter be processed to replace Twig variables?
+    ignore_fields: ['form','forms']              # Fields that might contain Twig variables and should not be processed
 
 cache:
-  enabled: true                        # Set to true to enable caching
+  enabled: true                                  # Set to true to enable caching
   check:
-    method: file                       # Method to check for updates in pages: file|folder|none
+    method: file                                 # Method to check for updates in pages: file|folder|hash|none
-  driver: auto                         # One of: auto|file|apc|xcache|memcache|wincache
+  driver: auto                                   # One of: auto|file|apc|xcache|memcache|wincache
-  prefix: 'g'                          # Cache prefix string (prevents cache conflicts)
+  prefix: 'g'                                    # Cache prefix string (prevents cache conflicts)
-  lifetime: 604800                     # Lifetime of cached data in seconds (0 = infinite)
+  clear_images_by_default: true                  # By default grav will include processed images in cache clear, this can be disabled
-  gzip: false                          # GZip compress the page output
+  cli_compatibility: false                       # Ensures only non-volatile drivers are used (file, redis, memcache, etc.)
+  lifetime: 604800                               # Lifetime of cached data in seconds (0 = infinite)
+  gzip: false                                    # GZip compress the page output
+  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
 
 twig:
-  cache: true                          # Set to true to enable twig caching
+  cache: true                                    # Set to true to enable Twig caching
-  debug: false                         # Enable Twig debug
+  debug: true                                    # Enable Twig debug
-  auto_reload: true                    # Refresh cache on changes
+  auto_reload: true                              # Refresh cache on changes
-  autoescape: false                    # Autoescape Twig vars
+  autoescape: false                              # Autoescape Twig vars (DEPRECATED, always enabled in strict mode)
-  undefined_functions: true            # Allow undefined functions
+  undefined_functions: true                      # Allow undefined functions
-  undefined_filters: true              # Allow undefined filters
+  undefined_filters: true                        # Allow undefined filters
+  umask_fix: false                               # By default Twig creates cached files as 755, fix switches this to 775
 
-assets:                                # Configuration for Assets Manager (JS, CSS)
+assets:                                          # Configuration for Assets Manager (JS, CSS)
-  css_pipeline: false                  # The CSS pipeline is the unification of multiple CSS resources into one file
+  css_pipeline: false                            # The CSS pipeline is the unification of multiple CSS resources into one file
-  css_minify: true                     # Minify the CSS during pipelining
+  css_pipeline_include_externals: true           # Include external URLs in the pipeline by default
-  css_minify_windows: false            # Minify Override for Windows platforms. False by default due to ThreadStackSize
+  css_pipeline_before_excludes: true             # Render the pipeline before any excluded files
-  css_rewrite: true                    # Rewrite any CSS relative URLs during pipelining
+  css_minify: true                               # Minify the CSS during pipelining
-  js_pipeline: false                   # The JS pipeline is the unification of multiple JS resources into one file
+  css_minify_windows: false                      # Minify Override for Windows platforms. False by default due to ThreadStackSize
-  js_minify: true                      # Minify the JS during pipelining
+  css_rewrite: true                              # Rewrite any CSS relative URLs during pipelining
-  enable_asset_timestamp: false        # Enable asset timestamps
+  js_pipeline: false                             # The JS pipeline is the unification of multiple JS resources into one file
+  js_pipeline_include_externals: true            # Include external URLs in the pipeline by default
+  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
   collections:
-    jquery: system://assets/jquery/jquery-2.1.4.min.js
+    jquery: system://assets/jquery/jquery-2.x.min.js
 
 errors:
-  display: false                       # Display full backtrace-style error page
+  display: 0                                     # Display either (1) Full backtrace | (0) Simple Error | (-1) System Error
-  log: true                            # Log errors to /logs folder
+  log: true                                      # Log errors to /logs folder
 
 debugger:
-  enabled: false                       # Enable Grav debugger and following settings
+  enabled: false                                 # Enable Grav debugger and following settings
   shutdown:
-    close_connection: true             # Close the connection before calling onShutdown(). false for debugging
+    close_connection: true                       # Close the connection before calling onShutdown(). false for debugging
 
 images:
-  default_image_quality: 85            # Default image quality to use when resampling images (85%)
+  default_image_quality: 85                      # Default image quality to use when resampling images (85%)
-  cache_all: false                     # Cache all image by default
+  cache_all: false                               # Cache all image by default
-  debug: false                         # Show an overlay over images indicating the pixel depth of the image when working with retina for example
+  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
 
 media:
-  enable_media_timestamp: false        # Enable media timetsamps
+  enable_media_timestamp: false                  # Enable media timestamps
-  upload_limit: 0                      # Set maximum upload size in bytes (0 is unlimited)
+  unsupported_inline_types: []                   # Array of supported media types to try to display inline
-  unsupported_inline_types: []         # Array of unsupported media file types to try to display inline
+  allowed_fallback_types: []                     # Array of allowed media types of files found if accessed via Page route
+  auto_metadata_exif: false                      # Automatically create metadata files from Exif data where possible
 
 session:
-  enabled: true                        # Enable Session support
+  enabled: true                                  # Enable Session support
-  timeout: 1800                        # Timeout in seconds
+  initialize: true                               # Initialize session from Grav (if false, plugin needs to start the session)
-  name: grav-site                      # Name prefix of the session cookie
+  timeout: 1800                                  # Timeout in seconds
+  name: grav-site                                # Name prefix of the session cookie. Use alphanumeric, dashes or underscores only. Do not use dots in the session name
+  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.
+  split: true                                    # Sessions should be independent between site and plugins (such as admin)
+  path:
 
-security:
+gpm:
-  default_hash: $2y$10$kwsyMVwM8/7j0K/6LHT.g.Fs49xOCTp2b8hh/S5.dPJuJcJB6T.UK
+  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
+
+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)

system/defines.php

@@ -1,10 +1,21 @@
 <?php
+/**
+ * @package    Grav.Core
+ *
+ * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
 
 // Some standard defines
 define('GRAV', true);
-define('GRAV_VERSION', '1.0.0-rc.2');
+define('GRAV_VERSION', '1.5.0-rc.1');
+define('GRAV_TESTING', true);
 define('DS', '/');
 
+if (!defined('GRAV_PHP_MIN')) {
+    define('GRAV_PHP_MIN', '5.6.4');
+}
+
 // Directories and Paths
 if (!defined('GRAV_ROOT')) {
     define('GRAV_ROOT', str_replace(DIRECTORY_SEPARATOR, DS, getcwd()));
@@ -12,20 +23,20 @@ if (!defined('GRAV_ROOT')) {
 define('ROOT_DIR', GRAV_ROOT . '/');
 define('USER_PATH', 'user/');
 define('USER_DIR', ROOT_DIR . USER_PATH);
-define('SYSTEM_DIR', ROOT_DIR .'system/');
-define('ASSETS_DIR', ROOT_DIR . 'assets/');
 define('CACHE_DIR', ROOT_DIR . 'cache/');
-define('IMAGES_DIR', ROOT_DIR . 'images/');
-define('LOG_DIR', ROOT_DIR .'logs/');
-define('ACCOUNTS_DIR', USER_DIR .'accounts/');
-define('PAGES_DIR', USER_DIR .'pages/');
 
 // DEPRECATED: Do not use!
+define('ASSETS_DIR', ROOT_DIR . 'assets/');
+define('IMAGES_DIR', ROOT_DIR . '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('VENDOR_DIR', ROOT_DIR .'vendor/');
+define('LOG_DIR', ROOT_DIR .'logs/');
 // END DEPRECATED
 
 // Some extensions