Merge branch 'release/1.1.15'

This is for your open collective backers and sponsors to appear directly on your README. 
see how it'll look [here](https://github.com/apex/apex#backers)
[More info](https://github.com/opencollective/opencollective/wiki/Github-banner)

Also add badges on top.

.dependencies

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

.gitignore

@@ -1,6 +1,7 @@
 # Composer
 .composer
-vendor/
+vendor/*
+!*/vendor/*
 
 # Sass
 .sass-cache
@@ -25,6 +26,7 @@ user/plugins/*
 user/themes/*
 !user/themes/.*
 user/localhost/config/security.yaml
+user/config/security.yaml
 
 # OS Generated
 .DS_Store*
@@ -35,3 +37,9 @@ Thumbs.db
 
 # phpstorm
 .idea/*
+user/config/security.yaml
+
+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,7 +54,7 @@ RewriteRule .* index.php [L]
 
 ## Begin - Security
 # Block all direct access for these folders
-RewriteRule ^(.git|cache|bin|logs|backup)/(.*) error [F]
+RewriteRule ^(.git|cache|bin|logs|backup|webserver-configs|tests)/(.*) error [F]
 # Block access to specific file types for these system folders
 RewriteRule ^(system|vendor)/(.*)\.(txt|xml|md|html|yaml|php|pl|py|cgi|twig|sh|bat)$ error [F]
 # Block access to specific file types for these user folders
@@ -52,9 +62,9 @@ RewriteRule ^(user)/(.*)\.(txt|md|yaml|php|pl|py|cgi|twig|sh|bat)$ error [F]
 # Block all direct access to .md files:
 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.txt|composer.lock|composer.json|nginx.conf|web.config|htaccess.txt|\.htaccess)$ 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.5'
+  - '5.6'
+  - '7.0'
+  - hhvm
 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!
@@ -35,20 +42,34 @@ env:
     # 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="
-    # 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)
+    - secure: "AQGcX1B2NrI8ajflY4AimZDNcK2kBA3F6mbtEFQ78NkDoWhMipsQHayWXiSTzRc0YJKvQl2Y16MTwQF4VHzjTAiiZFATgA8J88vQUjIPabi/kKjqSmcLFoaAOAxStQbW6e0z2GiQ6KBMcNF1y5iUuI63xVrBvtKrYX/w5y+ako8="
 
 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
-  - 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;
+  - if [ $TRAVIS_BRANCH == 'develop' ] || [ $TRAVIS_PULL_REQUEST != 'false' ]; then
+        composer install --dev --prefer-dist;
     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);
+        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##*/};

CHANGELOG.md

@@ -1,3 +1,576 @@
+# v1.1.15
+## 01/30/2017
+
+1. [](#new)
+    * Added a new `Collection::merge()` method to allow merging of multiple collections [#1258](https://github.com/getgrav/grav/pull/1258)
+    * Added [OpenCollective](https://opencollective.com/grav) backer/sponsor info to `README.md`
+1. [](#improved)
+    * Add an additional parameter to GPM::findPackage to avoid throwing an exception, for use in Twig [#1008](https://github.com/getgrav/grav/issues/1008)
+    * Skip symlinks if found while clearing cache [#1269](https://github.com/getgrav/grav/issues/1269)
+1. [](#bugfix)
+    * Fixed an issue when page collection with header-based `sort.by` returns an array [#1264](https://github.com/getgrav/grav/issues/1264)
+    * Fix `Response` object to handle `303` redirects when `open_basedir` in effect [#1267](https://github.com/getgrav/grav/issues/1267)
+    * Silence `E_WARNING: Zend OPcache API is restricted by "restrict_api" configuration directive`
+
+# v1.1.14
+## 01/18/2017
+
+1. [](#bugfix)
+    * Fixed `Page::collection()` returning array and not Collection object when header variable did not exist
+    * Revert `Content-Encoding: identity` fix, and let you set `cache: allow_webserver_gzip:` option to switch to `identity` [#548](https://github.com/getgrav/grav/issues/548)
+
+# v1.1.13
+## 01/17/2017
+
+1. [](#new)
+    * Added new `never_cache_twig` page option in `system.yaml` and frontmatter. Allows dynamic Twig logic in regular and modular Twig templates [#1244](https://github.com/getgrav/grav/pull/1244)
+1. [](#improved)
+    * Several improvements to aid theme development [#232](https://github.com/getgrav/grav/pull/1232)
+    * Added `hash` cache check option and made dropdown more descriptive [Admin #923](https://github.com/getgrav/grav-plugin-admin/issues/923)
+1. [](#bugfix)
+    * Fixed cross volume file system operations [#635](https://github.com/getgrav/grav/issues/635)
+    * Fix issue with pages folders validation not accepting uppercase letters
+    * Fix renaming the folder name if the page, in the default language, had a custom slug set in its header
+    * Fixed issue with `Content-Encoding: none`. It should really be `Content-Encoding: identity` instead
+    * Fixed broken `hash` method on page modifications detection
+    * Fixed issue with multi-lang pages not caching independently without unique `.md` file [#1211](https://github.com/getgrav/grav/issues/1211)
+    * Fixed all `$_GET` parameters missing in Nginx (please update your nginx.conf) [#1245](https://github.com/getgrav/grav/issues/1245)
+    * Fixed issue in trying to process broken symlink [#1254](https://github.com/getgrav/grav/issues/1254)
+
+# v1.1.12
+## 12/26/2016
+
+1. [](#bugfix)
+    * Fixed issue with JSON calls throwing errors due to debugger enabled [#1227](https://github.com/getgrav/grav/issues/1227)
+
+# v1.1.11
+## 12/22/2016
+
+1. [](#improved)
+    * Fall back properly to HTML if template type not found
+1. [](#bugfix)
+    * Fix issue with modular pages folders validation [#900](https://github.com/getgrav/grav-plugin-admin/issues/900)
+
+# v1.1.10
+## 12/21/2016
+
+1. [](#improved)
+    * Improve detection of home path. Also allow `~/.grav` on Windows, drop `ConsoleTrait::isWindows()` method, used only for that [#1204](https://github.com/getgrav/grav/pull/1204)
+    * Reworked PHP CLI router [#1219](https://github.com/getgrav/grav/pull/1219)
+    * More robust theme/plugin logic in `bin/gpm direct-install`
+1. [](#bugfix)
+    * Fixed case where extracting a package would cause an error during rename
+    * Fix issue with using `Yaml::parse` direcly on a filename, now deprecated
+    * Add pattern for frontend validation of folder slugs [#891](https://github.com/getgrav/grav-plugin-admin/issues/891)
+    * Fix issue with Inflector when translation is disabled [SimpleSearch #87](https://github.com/getgrav/grav-plugin-simplesearch/issues/87)
+    * Explicitly expose `array_unique` Twig filter [Admin #897](https://github.com/getgrav/grav-plugin-admin/issues/897)
+
+# v1.1.9
+## 12/13/2016
+
+1. [](#new)
+    * RC released as stable
+1. [](#improved)
+    * Better error handling in cache clear
+    * YAML syntax fixes for the future compatibility
+    * Added new parameter `remove` for `onBeforeCacheClear` event
+    * Add support for calling Media object as function to get medium by filename
+1. [](#bugfix)
+    * Added checks before accessing admin reference during `Page::blueprints()` call. Allows to access `page.blueprints` from Twig in the frontend
+
+# v1.1.9-rc.3
+## 12/07/2016
+
+1. [](#new)
+    * Add `ignore_empty` property to be used on array fields, if positive only save options with a value
+    * Use new `permissions` field in user account
+    * Add `range(int start, int end, int step)` twig function to generate an array of numbers between start and end, inclusive
+    * New retina Media image derivatives array support (`![](image.jpg?derivatives=[640,1024,1440])`) [#1147](https://github.com/getgrav/grav/pull/1147)
+    * Added stream support for images (`![Sepia Image](image://image.jpg?sepia)`)
+    * Added stream support for links (`[Download PDF](user://data/pdf/my.pdf)`)
+    * Added new `onBeforeCacheClear` event to add custom paths to cache clearing process
+1. [](#improved)
+    * Added alias `selfupdate` to the `self-upgrade` `bin/gpm` CLI command
+    * Synced `webserver-configs/htaccess.txt` with `.htaccess`
+    * Use permissions field in group details.
+    * Updated vendor libraries
+    * Added a warning on GPM update to update Grav first if needed [#1194](https://github.com/getgrav/grav/pull/1194)
+ 1. [](#bugfix)
+    * Fix page collections problem with `@page.modular` [#1178](https://github.com/getgrav/grav/pull/1178)
+    * Fix issue with using a multiple taxonomy filter of which one had no results, thanks to @hughbris [#1184](https://github.com/getgrav/grav/issues/1184)
+    * Fix saving permissions in group
+    * Fixed issue with redirect of a page getting moved to a different location
+
+# v1.1.9-rc.2
+## 11/26/2016
+
+1. [](#new)
+    * Added two new sort order options for pages: `publish_date` and `unpublish_date` [#1173](https://github.com/getgrav/grav/pull/1173))
+1. [](#improved)
+    * Multisite: Create image cache folder if it doesn't exist
+    * Add 2 new language values for French [#1174](https://github.com/getgrav/grav/issues/1174)
+1. [](#bugfix)
+    * Fixed issue when we have a meta file without corresponding media [#1179](https://github.com/getgrav/grav/issues/1179)
+    * Update class namespace for Admin class [Admin #874](https://github.com/getgrav/grav-plugin-admin/issues/874)
+
+# v1.1.9-rc.1
+## 11/09/2016
+
+1. [](#new)
+    * Added a `CompiledJsonFile` object to better handle Json files.
+    * Added Base32 encode/decode class
+    * Added a new `User::find()` method
+1. [](#improved)
+    * Moved `messages` object into core Grav from login plugin
+    * Added `getTaxonomyItemKeys` to the Taxonomy object [#1124](https://github.com/getgrav/grav/issues/1124)
+    * Added a `redirect_me` Twig function [#1124](https://github.com/getgrav/grav/issues/1124)
+    * Added a Caddyfile for newer Caddy versions [#1115](https://github.com/getgrav/grav/issues/1115)
+    * Allow to override sorting flags for page header-based or default ordering. If the `intl` PHP extension is loaded, only these flags are available: https://secure.php.net/manual/en/collator.asort.php. Otherwise, you can use the PHP standard sorting flags (https://secure.php.net/manual/en/array.constants.php) [#1169](https://github.com/getgrav/grav/issues/1169)
+1. [](#bugfix)
+    * Fixed an issue with site redirects/routes, not processing with extension (.html, .json, etc.)
+    * Don't truncate HTML if content length is less than summary size [#1125](https://github.com/getgrav/grav/issues/1125)
+    * Return max available number when calling random() on a collection passing an int > available items [#1135](https://github.com/getgrav/grav/issues/1135)
+    * Use correct ratio when applying image filters to image alternatives [#1147](https://github.com/getgrav/grav/issues/1147)
+    * Fixed URI path in multi-site when query parameters were used in front page
+
+# v1.1.8
+## 10/22/2016
+
+1. [](#bugfix)
+    * Fixed warning with unset `ssl` option when using GPM [#1132](https://github.com/getgrav/grav/issues/1132)
+
+# v1.1.7
+## 10/22/2016
+
+1. [](#improved)
+    * Improved the capabilities of Image derivatives [#1107](https://github.com/getgrav/grav/pull/1107)
+1. [](#bugfix)
+    * Only pass verify_peer settings to cURL and fopen if the setting is disabled [#1120](https://github.com/getgrav/grav/issues/1120)
+
+# v1.1.6
+## 10/19/2016
+
+1. [](#new)
+    * Added ability for Page to override the output format (`html`, `xml`, etc..) [#1067](https://github.com/getgrav/grav/issues/1067)
+    * Added `Utils::getExtensionByMime()` and cleaned up `Utils::getMimeByExtension` + tests
+    * Added a `cache.check.method: 'hash'` option in `system.yaml` that checks all files + dates inclusively
+    * Include jQuery 3.x in the Grav assets
+    * Added the option to automatically fix orientation on images based on their Exif data, by enabling `system.images.auto_fix_orientation`.
+1. [](#improved)
+    * Add `batch()` function to Page Collection class
+    * Added new `cache.redis.socket` setting that allow to pass a UNIX socket as redis server
+    * It is now possible to opt-out of the SSL verification via the new `system.gpm.verify_peer` setting. This is sometimes necessary when receiving a "GPM Unable to Connect" error. More details in ([#1053](https://github.com/getgrav/grav/issues/1053))
+    * It is now possible to force the use of either `curl` or `fopen` as `Response` connection method, via the new `system.gpm.method` setting. By default this is set to 'auto' and gives priority to 'fopen' first, curl otherwise.
+    * InstallCommand can now handle Licenses
+    * Uses more helpful `1x`, `2x`, `3x`, etc names in the Retina derivatives cache files.
+    * Added new method `Plugins::isPluginActiveAdmin()` to check if plugin route is active in Admin plugin
+    * Added new `Cache::setEnabled` and `Cache::getEnabled` to enable outside control of cache
+    * Updated vendor libs including Twig `1.25.0`
+    * Avoid git ignoring any vendor folder in a Grav site subfolder (but still ignore the main `vendor/` folder)
+    * Added an option to get just a route back from `Uri::convertUrl()` function
+    * Added option to control split session [#1096](https://github.com/getgrav/grav/pull/1096)
+    * Added new `verbosity` levels to `system.error.display` to allow for system error messages [#1091](https://github.com/getgrav/grav/pull/1091)
+    * Improved the API for Grav plugins to access the Parsedown parser directly [#1062](https://github.com/getgrav/grav/pull/1062)
+1. [](#bugfix)
+    * Fixed missing `progress` method in the DirectInstall Command
+    * `Response` class now handles better unsuccessful requests such as 404 and 401
+    * Fixed saving of `external` page types [Admin #789](https://github.com/getgrav/grav-plugin-admin/issues/789)
+    * Fixed issue deleting parent folder of folder with `param_sep` in the folder name [admin #796](https://github.com/getgrav/grav-plugin-admin/issues/796)
+    * Fixed an issue with streams in `bin/plugin`
+    * Fixed `jpeg` file format support in Media
+
+# v1.1.5
+## 09/09/2016
+
+1. [](#new)
+    * Added new `bin/gpm direct-install` command to install local and remote zip archives
+1. [](#improved)
+    * Refactored `onPageNotFound` event to fire after `onPageInitialized`
+    * Follow symlinks in `Folder::all()`
+    * Twig variable `base_url` now supports multi-site by path feature
+    * Improved `bin/plugin` to list plugins with commands faster by limiting the depth of recursion
+1. [](#bugfix)
+    * Quietly skip missing streams in `Cache::clearCache()`
+    * Fix issue in calling page.summary when no content is present in a page
+    * Fix for HUGE session timeouts [#1050](https://github.com/getgrav/grav/issues/1050)
+
+# v1.1.4
+## 09/07/2016
+
+1. [](#new)
+    * Added new `tmp` folder at root. Accessible via stream `tmp://`. Can be cleared with `bin/grav clear --tmp-only` as well as `--all`.
+    * Added support for RTL in `LanguageCodes` so you can determine if a language is RTL or not
+    * Ability to set `custom_base_url` in system configuration
+    * Added `override` and `force` options for Streams setup
+1. [](#improved)
+    * Important vendor updates to provide PHP 7.1 beta support!
+    * Added a `Util::arrayFlatten()` static function
+    * Added support for 'external_url' page header to enable easier external URL based menu items
+    * Improved the UI for CLI GPM Index view to use a table
+    * Added `@page.modular` Collection type [#988](https://github.com/getgrav/grav/issues/988)
+    * Added support for `self@`, `page@`, `taxonomy@`, `root@` Collection syntax for cleaner YAML compatibility
+    * Improved GPM commands to allow for `-y` to automate **yes** responses and `-o` for **update** and **selfupgrade** to overwrite installations [#985](https://github.com/getgrav/grav/issues/985)
+    * Added randomization to `safe_email` Twig filter for greater security [#998](https://github.com/getgrav/grav/issues/998)
+    * Allow `Utils::setDotNotation` to merge data, rather than just set
+    * Moved default `Image::filter()` to the `save` action to ensure they are applied last [#984](https://github.com/getgrav/grav/issues/984)
+    * Improved the `Truncator` code to be more reliable [#1019](https://github.com/getgrav/grav/issues/1019)
+    * Moved media blueprints out of core (now in Admin plugin)
+1. [](#bugfix)
+    * Removed 307 redirect code option as it is not well supported [#743](https://github.com/getgrav/grav-plugin-admin/issues/743)
+    * Fixed issue with folders with name `*.md` are not confused with pages [#995](https://github.com/getgrav/grav/issues/995)
+    * Fixed an issue when filtering collections causing null key
+    * Fix for invalid HTML when rendering GIF and Vector media [#1001](https://github.com/getgrav/grav/issues/1001)
+    * Use pages.markdown.extra in the user's system.yaml [#1007](https://github.com/getgrav/grav/issues/1007)
+    * Fix for `Memcached` connection [#1020](https://github.com/getgrav/grav/issues/1020)
+
+# v1.1.3
+## 08/14/2016
+
+1. [](#bugfix)
+    * Fix for lightbox media function throwing error [#981](https://github.com/getgrav/grav/issues/981)
+
+# v1.1.2
+## 08/10/2016
+
+1. [](#new)
+    * Allow forcing SSL by setting `system.force_ssl` (Force SSL in the Admin System Config) [#899](https://github.com/getgrav/grav/pull/899)
+1. [](#improved)
+    * Improved `authorize` Twig extension to accept a nested array of authorizations  [#948](https://github.com/getgrav/grav/issues/948)
+    * Don't add timestamps on remote assets as it can cause conflicts
+    * Grav now looks at types from `media.yaml` when retrieving page mime types [#966](https://github.com/getgrav/grav/issues/966)
+    * Added support for dumping exceptions in the Debugger
+1. [](#bugfix)
+    * Fixed `Folder::delete` method to recursively remove files and folders and causing Upgrade to fail.
+    * Fix [#952](https://github.com/getgrav/grav/issues/952) hyphenize the session name.
+    * If no parent is set and siblings collection is called, return a new and empty collection [grav-plugin-sitemap/issues/22](https://github.com/getgrav/grav-plugin-sitemap/issues/22)
+    * Prevent exception being thrown when calling the Collator constructor failed in a Windows environment with the Intl PHP Extension enabled [#961](https://github.com/getgrav/grav/issues/961)
+    * Fix for markdown images not properly rendering `id` attribute [#956](https://github.com/getgrav/grav/issues/956)
+
+# v1.1.1
+## 07/16/2016
+
+1. [](#improved)
+    * Made `paramsRegex()` static to allow it to be called statically
+1. [](#bugfix)
+    * Fixed backup when using very long site titles with invalid characters [grav-plugin-admin#701](https://github.com/getgrav/grav-plugin-admin/issues/701)
+    * Fixed a typo in the `webserver-configs/nginx.conf` example
+
+# v1.1.0
+## 07/14/2016
+
+1. [](#improved)
+    * Added support for validation of multiple email in the `type: email` field [grav-plugin-email#31](https://github.com/getgrav/grav-plugin-email/issues/31)
+    * Unified PHP code header styling
+    * Added 6 more languages and updated language codes
+    * set default "releases" option to `stable`
+1. [](#bugfix)
+    * Fix backend validation for file fields marked as required [grav-plugin-form#78](https://github.com/getgrav/grav-plugin-form/issues/78)
+
+# v1.1.0-rc.3
+## 06/21/2016
+
+1. [](#new)
+    * Add a onPageFallBackUrl event when starting the fallbackUrl() method to allow the Login plugin to protect the page media
+    * Conveniently allow ability to retrieve user information via config object [#913](https://github.com/getgrav/grav/pull/913) - @Vivalldi
+    * Grav served images can now use header caching [#905](https://github.com/getgrav/grav/pull/905)
+1. [](#improved)
+    * Take asset modification timestamp into consideration in pipelining [#917](https://github.com/getgrav/grav/pull/917) - @Sommerregen
+1. [](#bugfix)
+    * Respect `enable_asset_timestamp` settings for pipelined Assets [#906](https://github.com/getgrav/grav/issues/906)
+    * Fixed collections end dates for 32-bit systems [#902](https://github.com/getgrav/grav/issues/902)
+    * Fixed a recent regression (1.1.0-rc1) with parameter separator different than `:`
+
+# v1.1.0-rc.2
+## 06/14/2016
+
+1. [](#new)
+    * Added getters and setters for Assets to allow manipulation of CSS/JS/Collection based assets via plugins [#876](https://github.com/getgrav/grav/issues/876)
+1. [](#improved)
+    * Pass the exception to the `onFatalException()` event
+    * Updated to latest jQuery 2.2.4 release
+    * Moved list items in `system/config/media.yaml` config into a `types:` key which allows you delete default items.
+    * Updated `webserver-configs/nginx.conf` with `try_files` fix from @mrhein and @rondlite [#743](https://github.com/getgrav/grav/pull/743)
+    * Updated cache references to include `memecache` and `redis` [#887](https://github.com/getgrav/grav/issues/887)
+    * Updated composer libraries
+1. [](#bugfix)
+    * Fixed `Utils::normalizePath()` that was truncating 0's [#882](https://github.com/getgrav/grav/issues/882)
+
+# v1.1.0-rc.1
+## 06/01/2016
+
+1. [](#new)
+    * Added `Utils::getDotNotation()` and `Utils::setDotNotation()` methods + tests
+    * Added support for `xx-XX` locale language lookups in `LanguageCodes` class [#854](https://github.com/getgrav/grav/issues/854)
+    * New CSS/JS Minify library that does a more reliable job [#864](https://github.com/getgrav/grav/issues/864)
+1. [](#improved)
+    * GPM installation of plugins and themes into correct multisite folders [#841](https://github.com/getgrav/grav/issues/841)
+    * Use `Page::rawRoute()` in blueprints for more reliable mulit-language support
+1. [](#bugfix)
+    * Fixes for `zlib.output_compression` as well as `mod_deflate` GZIP compression
+    * Fix for corner-case redirect logic causing infinite loops and out-of-memory errors
+    * Fix for saving fields in expert mode that have no `Validation::typeX()` methods [#626](https://github.com/getgrav/grav-plugin-admin/issues/626)
+    * Detect if user really meant to extend parent blueprint, not another one (fixes old page type blueprints)
+    * Fixed a bug in `Page::relativePagePath()` when `Page::$name` is not defined
+    * Fix for poor handling of params + query element in `Uri::processParams()` [#859](https://github.com/getgrav/grav/issues/859)
+    * Fix for double encoding in markdown links [#860](https://github.com/getgrav/grav/issues/860)
+    * Correctly handle language strings to determine if it's in admin or not [#627](https://github.com/getgrav/grav-plugin-admin/issues/627)
+
+# v1.1.0-beta.5
+## 05/23/2016
+
+1. [](#improved)
+    * Updated jQuery from 2.2.0 to 2.2.3
+    * Set `Uri::ip()` to static by default so it can be used in form fields
+    * Improved `Session` class with flash storage
+    * `Page::getContentMeta()` now supports an optional key.
+1. [](#bugfix)
+    * Fixed "Invalid slug set in YAML frontmatter" when setting `Page::slug()` with empty string [#580](https://github.com/getgrav/grav-plugin-admin/issues/580)
+    * Only `.gitignore` Grav's vendor folder
+    * Fix trying to remove Grav with `GPM uninstall` of a plugin with Grav dependency
+    * Fix Page Type blueprints not being able to extend their parents
+    * `filterFile` validation method always returns an array of files, behaving like `multiple="multiple"`
+    * Fixed [#835](https://github.com/getgrav/grav-plugin-admin/issues/835) check for empty image file first to prevent getimagesize() fatal error
+    * Avoid throwing an error when Grav's Gzip and mod_deflate are enabled at the same time on a non php-fpm setup
+
+# v1.1.0-beta.4
+## 05/09/2016
+
+1. [](#bugfix)
+    * Drop dependencies calculations if plugin is installed via symlink
+    * Drop Grav from dependencies calculations
+    * Send slug name as part of installed packages
+    * Fix for summary entities not being properly decoded [#825](https://github.com/getgrav/grav/issues/825)
+
+
+# v1.1.0-beta.3
+## 05/04/2016
+
+1. [](#improved)
+    * Pass the Page type when calling `onBlueprintCreated`
+    * Changed `Page::cachePageContent()` form **private** to **public** so a page can be recached via plugin
+1. [](#bugfix)
+    * Fixed handling of `{'loading':'async'}` with Assets Pipeline
+    * Fix for new modular page modal `Page` field requiring a value [#529](https://github.com/getgrav/grav-plugin-admin/issues/529)
+    * Fix for broken `bin/gpm version` command
+    * Fix handling "grav" as a dependency
+    * Fix when installing multiple packages and one is the dependency of another, don't try to install it twice
+    * Fix using name instead of the slug to determine a package folder. Broke for packages whose name was 2+ words
+
+# v1.1.0-beta.2
+## 04/27/2016
+
+1. [](#new)
+    * Added new `Plugin::getBlueprint()` and `Theme::getBlueprint()` method
+    * Allow **page blueprints** to be added via Plugins.
+1. [](#improved)
+    * Moved to new `data-*@` format in blueprints
+    * Updated composer-based libraries
+    * Moved some hard-coded `CACHE_DIR` references to use locator
+    * Set `twig.debug: true` by default
+1. [](#bugfix)
+    * Fixed issue with link rewrites and local assets pipeline with `absolute_urls: true`
+    * Allow Cyrillic slugs [#520](https://github.com/getgrav/grav-plugin-admin/issues/520)
+    * Fix ordering issue with accented letters [#784](https://github.com/getgrav/grav/issues/784)
+    * Fix issue with Assets pipeline and missing newlines causing invalid JavaScript
+
+# v1.1.0-beta.1
+## 04/20/2016
+
+1. [](#new)
+    * **Blueprint Improvements**: The main improvements to Grav take the form of a major rewrite of our blueprint functionality. Blueprints are an essential piece of functionality within Grav that helps define configuration fields. These allow us to create a definition of a form field that can be rendered in the administrator plugin and allow the input, validation, and storage of values into the various configuration and page files that power Grav. Grav 1.0 had extensive support for building and extending blueprints, but Grav 1.1 takes this even further and adds improvements to our existing system.
+    * **Extending Blueprints**: You could extend forms in Grav 1.0, but now you can use a newer `extends@:` default syntax rather than the previous `'@extends'` string that needed to be quoted in YAML. Also this new format allows for the defining of a `context` which lets you define where to look for the base blueprint. Another new feature is the ability to extend from multiple blueprints.
+    * **Embedding/Importing Blueprints**: One feature that has been requested is the ability to embed or import one blueprint into another blueprint. This allows you to share fields or sub-form between multiple forms. This is accomplished via the `import@` syntax.
+    * **Removing Existing Fields and Properties**: Another new feature is the ability to remove completely existing fields or properties from an extended blueprint. This allows the user a lot more flexibility when creating custom forms by simply using the new `unset@: true` syntax. To remove a field property you would use `unset-<property>@: true` in your extended field definition, for example: `unset-options@: true`.
+    * **Replacing Existing Fields and Properties**: Similar to removing, you can now replace an existing field or property with the `replace@: true` syntax for the whole field, and `replace-<property>@: true` for a specific property.
+    * **Field Ordering**: Probably the most frequently requested blueprint functionality that we have added is the ability to change field ordering. Imagine that you want to extend the default page blueprint but add a new tab. Previously, this meant your tab would be added at the end of the form, but now you can define that you wish the new tab to be added right after the `content` tab. This works for any field too, so you can extend a blueprint and add your own custom fields anywhere you wish! This is accomplished by using the new `ordering@:` syntax with either an existing property name or an integer.
+    * **Configuration Properties**: Another useful new feature is the ability to directly access Grav configuration in blueprints with `config-<property>@` syntax. For example you can set a default for a field via `config-default@: site.author.name` which will use the author.name value from the `site.yaml` file as the `default` value for this field.
+    * **Function Calls**: The ability to call PHP functions for values has been improved in Grav 1.1 to be more powerful. You can use the `data-<property>@` syntax to call static methods to obtain values. For example: `data-default@: '\Grav\Plugin\Admin::route'`. You can now even pass parameters to these methods.
+    * **Validation Rules**: You can now define a custom blueprint-level validation rule and assign this rule to a form field.
+    * **Custom Form Field Types**: This advanced new functionality allows you to create a custom field type via a new plugin event called getFormFieldTypes(). This allows you to provide extra functionality or instructions on how to handle the form form field.
+    * **GPM Versioning**: A new feature that we have wanted to add to our GPM package management system is the ability to control dependencies by version. We have opted to use a syntax very similar to the Composer Package Manager that is already familiar to most PHP developers. This new versioning system allows you to define specific minimum version requirements of dependent packages within Grav. This should ensure that we have less (hopefully none!) issues when you update one package that also requires a specific minimum version of another package. The admin plugin for example may have an update that requires a specific version of Grav itself.
+    * **GPM Testing Channel**: GPM repository now comes with both a `stable` and `testing` channel. A new setting in `system.gpm.releases` allow to switch between the two channels. Developers will be able to decide whether their resource is going to be in a pre-release state or stable. Only users who switch to the **testing** channel will be able to install a pre-release version.
+    * **GPM Events**: Packages (plugins and themes) can now add event handlers to hook in the package GPM events: install, update, uninstall. A package can listen for events before and after each of these events, and can execute any PHP code, and optionally halt the procedure or return a message.
+    * Refactor of the process chain breaking out `Processors` into individual classes to allow for easier modification and addition. Thanks to toovy for this work. - [#745](https://github.com/getgrav/grav/pull/745)
+    * Added multipart downloads, resumable downloads, download throttling, and video streaming in the `Utils::download()` method.
+    * Added optional config to allow Twig processing in page frontmatter - [#788](https://github.com/getgrav/grav/pull/788)
+    * Added the ability to provide blueprints via a plugin (previously limited to Themes only).
+    * Added Developer CLI Tools to easily create a new theme or plugin
+    * Allow authentication for proxies - [#698](https://github.com/getgrav/grav/pull/698)
+    * Allow to override the default Parsedown behavior - [#747](https://github.com/getgrav/grav/pull/747)
+    * Added an option to allow to exclude external files from the pipeline, and to render the pipeline before/after excluded files
+    * Added the possibility to store translations of themes in separate files inside the `languages` folder
+    * Added a method to the Uri class to return the base relative URL including the language prefix, or the base relative url if multilanguage is not enabled
+    * Added a shortcut for pages.find() alias
+1. [](#improved)
+    * Now supporting hostnames with localhost environments for better vhost support/development
+    * Refactor hard-coded paths to use PHP Streams that allow a setup file to configure where certain parts of Grav are stored in the physical filesystem.
+    * If multilanguage is active, include the Intl Twig Extension to allow translating dates automatically (http://twig.sensiolabs.org/doc/extensions/intl.html)
+    * Allow having local themes with the same name as GPM themes, by adding `gpm: false` to the theme blueprint - [#767](https://github.com/getgrav/grav/pull/767)
+    * Caddyfile and Lighttpd config files updated
+    * Removed `node_modules` folder from backups to make them faster
+    * Display error when `bin/grav install` hasn't been run instead of throwing exception. Prevents "white page" errors if error display is off
+    * Improved command line flow when installing multiple packages: don't reinstall packages if already installed, ask once if should use symlinks if symlinks are found
+    * Added more tests to our testing suite
+    * Added x-ua-compatible to http_equiv metadata processing
+    * Added ability to have a per-page `frontmatter.yaml` file to set header frontmatter defaults. Especially useful for multilang scenarios - [#775](https://github.com/getgrav/grav/pull/775)
+    * Removed deprecated `bin/grav newuser` CLI command.  use `bin/plugin login newuser` instead.
+    * Added `webm` and `ogv` video types to the default media types list.
+1. [](#bugfix)
+    * Fix Zend Opcache `opcache.validate_timestamps=0` not detecting changes in compiled yaml and twig files
+    * Avoid losing params, query and fragment from the URL when auto-redirecting to a language-specific route - [#759](https://github.com/getgrav/grav/pull/759)
+    * Fix for non-pipeline assets getting lost when pipeline is cached to filesystem
+    * Fix for double encoding resulting from Markdown Extra
+    * Fix for a remote link breaking all CSS rewrites for pipeline
+    * Fix an issue with Retina alternatives not clearing properly between repeat uses
+    * Fix for non standard http/s external markdown links - [#738](https://github.com/getgrav/grav/issues/738)
+    * Fix for `find()` calling redirects via `dispatch()` causing infinite loops - [#781](https://github.com/getgrav/grav/issues/781)
+
+# v1.0.10
+## 02/11/2016
+
+1. [](#new)
+    * Added new `Page::contentMeta()` mechanism to store content-level meta data alongside content
+    * Added Japanese language translation
+1. [](#improved)
+    * Updated some vendor libraries
+1. [](#bugfix)
+    * Hide `streams` blueprint from Admin plugin
+    * Fix translations of languages with `---` in YAML files
+
+# v1.0.9
+## 02/05/2016
+
+1. [](#new)
+    * New **Unit Testing** via Codeception http://codeception.com/
+    * New **page-level SSL** functionality when using `absolute_urls`
+    * Added `reverse_proxy` config option for issues with non-standard ports
+    * Added `proxy_url` config option to support GPM behind proxy servers #639
+    * New `Pages::parentsRawRoutes()` method
+    * Enhanced `bin/gpm info` CLI command with Changelog support #559
+    * Ability to add empty *Folder* via admin plugin
+    * Added latest `jQuery 2.2.0` library to core
+    * Added translations from Crowdin
+1. [](#improved)
+    * [BC] Metadata now supports only flat arrays. To use open graph metas and the likes (ie, 'og:title'), simply specify it in the key.
+    * Refactored `Uri::convertUrl()` method to be more reliable + tests created
+    * Date for last update of a modular sub-page sets modified date of modular page itself
+    * Split configuration up into two steps
+    * Moved Grav-based `base_uri` variables into `Uri::init()`
+    * Refactored init in `URI` to better support testing
+    * Allow `twig_vars` to be exposed earlier and merged later
+    * Avoid setting empty metadata
+    * Accept single group access as a string rather than requiring an array
+    * Return `$this` in Page constructor and init to allow chaining
+    * Added `ext-*` PHP requirements to `composer.json`
+    * Use Whoops 2.0 library while supporting old style
+    * Removed redundant old default-hash fallback mechanisms
+    * Commented out default redirects and routes in `site.yaml`
+    * Added `/tests` folder to deny's of all `webserver-configs/*` files
+    * Various PS and code style fixes
+1. [](#bugfix)
+    * Fix default generator metadata
+    * Fix for broken image processing caused by `Uri::convertUrl()` bugs
+    * Fix loading JS and CSS from collections #623
+    * Fix stream overriding
+    * Remove the URL extension for home link
+    * Fix permissions when the user has no access level set at all
+    * Fix issue with user with multiple groups getting denied on first group
+    * Fixed an issue with `Pages()` internal cache lookup not being unique enough
+    * Fix for bug with `site.redirects` and `site.routes` being an empty list
+    * [Markdown] Don't process links for **special protocols**
+    * [Whoops] serve JSON errors when request is JSON
+
+
+# v1.0.8
+## 01/08/2016
+
+1. [](#new)
+    * Added `rotate`, `flip` and `fixOrientation` image medium methods
+1. [](#bugfix)
+    * Removed IP from Nonce generation. Should be more reliable in a variety of scenarios
+
+# v1.0.7
+## 01/07/2016
+
+1. [](#new)
+    * Added `composer create-project` as an additional installation method #585
+    * New optional system config setting to strip home from page routs and urls #561
+    * Added Greek, Finnish, Norwegian, Polish, Portuguese, and Romanian languages
+    * Added new `Page->topParent()` method to return top most parent of a page
+    * Added plugins configuration tab to debugger
+    * Added support for APCu and PHP7.0 via new Doctrine Cache release
+    * Added global setting for `twig_first` processing (false by default)
+    * New configuration options for Session settings #553
+1. [](#improved)
+    * Switched to SSL for GPM calls
+    * Use `URI->host()` for session domain
+    * Add support for `open_basedir` when installing packages via GPM
+    * Improved `Utils::generateNonceString()` method to handle reverse proxies
+    * Optimized core thumbnails saving 38% in file size
+    * Added new `bin/gpm index --installed-only` option
+    * Improved GPM errors to provider more helpful diagnostic of issues
+    * Removed old hardcoded PHP version references
+    * Moved `onPageContentProcessed()` event so it's fired more reliably
+    * Maintain md5 keys during sorting of Assets #566
+    * Update to Caddyfile for Caddy web server
+1. [](#bugfix)
+    * Fixed an issue with cache/config checksum not being set on cache load
+    * Fix for page blueprint and theme inheritance issue #534
+    * Set `ZipBackup` timeout to 10 minutes if possible
+    * Fix case where we only have inline data for CSS or JS  #565
+    * Fix `bin/grav sandbox` command to work with new `webserver-config` folder
+    * Fix for markdown attributes on external URLs
+    * Fixed issue where `data:` page header was acting as `publish_date:`
+    * Fix for special characters in URL parameters (e.g. /tag:c++) #541
+    * Safety check for an array of nonces to only use the first one
+
+# v1.0.6
+## 12/22/2015
+
+1. [](#new)
+    * Set minimum requirements to [PHP 5.5.9](http://bit.ly/1Jt9OXO)
+    * Added `saveConfig` to Themes
+1. [](#improved)
+    * Updated Whoops to new 2.0 version (PHP 7.0 compatible)
+    * Moved sample web server configs into dedicated directory
+    * FastCGI will use Apache's `mod_deflate` if gzip turned off
+1. [](#bugfix)
+    * Fix broken media image operators
+    * Only call extra method of blueprints if blueprints exist
+    * Fix lang prefix in url twig variables #523
+    * Fix case insensitive HTTPS check #535
+    * Field field validation handles case `multiple` missing
+
+# v1.0.5
+## 12/18/2015
+
+1. [](#new)
+    * Add ability to extend markdown with plugins
+    * Added support for plugins to have individual language files
+    * Added `7z` to media formats
+    * Use Grav's fork of Parsedown until PR is merged
+    * New function to persist plugin configuration to disk
+    * GPM `selfupgrade` will now check PHP version requirements
+1. [](#improved)
+    * If the field allows multiple files, return array
+    * Handle non-array values in file validation
+1. [](#bugfix)
+    * Fix when looping `fields` param in a `list` field
+    * Properly convert commas to spaces for media attributes
+    * Forcing Travis VM to HI timezone to address future files in zip file
+
+# v1.0.4
+## 12/12/2015
+
+1. [](#bugfix)
+    * Needed to put default image folder permissions for YAML compatibility
+
+# v1.0.3
+## 12/11/2015
+
+1. [](#bugfix)
+    * Fixed issue when saving config causing incorrect image cache folder perms
+
 # v1.0.2
 ## 12/11/2015
 
@@ -7,7 +580,7 @@
 # v1.0.1
 ## 12/11/2015
 
-1. [](#improved)   
+1. [](#improved)
     * Reduced package sizes by removing extra vendor dev bits
 1. [](#bugfix)
     * Fix issue when you enable debugger from admin plugin
@@ -20,7 +593,7 @@
     * Added setters to set state of CSS/JS pipelining
     * Added `user/accounts` to `.gitignore`
     * Added configurable permissions option for Image cache
-1. [](#improved)   
+1. [](#improved)
     * Hungarian translation updated
     * Refactored Theme initialization for improved flexibility
     * Wrapped security section of account blueprints in an 'super user' authorize check
@@ -54,7 +627,7 @@
     * Automatically create unique security salt for each configuration
     * Added Hungarian translation
     * Added support for User groups
-1. [](#improved)   
+1. [](#improved)
     * Improved robots.txt to disallow crawling of non-user folders
     * Nonces only generated once per action and process
     * Added IP into Nonce string calculation
@@ -406,7 +979,7 @@
     * Added new `onImageMediumSaved()` event (useful for post-image processing)
     * Added `Vary: Accept-Encoding` option
 2. [](#improved)
-    * Multilang-safe delimeter position
+    * Multilang-safe delimiter position
     * Refactored Twig classes and added optional umask setting
     * Removed `pageinit()` timing
     * `Page->routable()` now takes `published()` state into account
@@ -492,7 +1065,7 @@
     * Improved query string handling
     * Optimization to image handling supporting URL encoded filenames
     * Use global `composer` when available rather than Grv provided one
-    * Use `PHP_BINARY` contant rather than `php` executable
+    * Use `PHP_BINARY` constant rather than `php` executable
     * Updated Doctrine Cache library
     * Updated Symfony libraries
     * Moved `convertUrl()` method to Uri object

CONTRIBUTING.md

@@ -0,0 +1,124 @@
+# 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 people 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 Gitter 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.
+
+**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.

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) [![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) [![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.
 
@@ -10,7 +10,7 @@ The underlying architecture of Grav is designed to use well-established and _bes
 * [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 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 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
@@ -18,17 +18,25 @@ The underlying architecture of Grav is designed to use well-established and _bes
 
 # Requirements
 
-- PHP 5.4 or higher. Check the [required modules list](http://learn.getgrav.org/basics/requirements#php-requirements)
+- PHP 5.5.9 or higher. Check the [required modules list](http://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
 
 # 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)
 
+### 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
 
 1. Clone the Grav repository from [https://github.com/getgrav/grav]() to a folder in the webroot of your server, e.g. `~/webroot/grav`. Launch a **terminal** or **console** and navigate to the webroot folder:
@@ -92,15 +100,83 @@ What you mainly want to know is that:
 * [What is Grav?](http://learn.getgrav.org/basics/what-is-grav)
 * [Install](http://learn.getgrav.org/basics/installation) Grav in few seconds
 * Understand the [Configuration](http://learn.getgrav.org/basics/grav-configuration)
-* Take a peek at our available free [Skeletons](http://getgrav.org/downloads/skeletons#extras)
-* If you have questions, check out `#grav` on irc.freenode.net
+* Take a peek at our available free [Skeletons](http://getgrav.org/downloads/skeletons)
+* If you have questions, jump on our [Gitter Room](https://gitter.im/getgrav/grav)!
 * Have fun!
 
-# Exploring more
+# Exploring More
 
 * Have a look at our [Basic Tutorial](http://learn.getgrav.org/basics/basic-tutorial)
 * Dive into more [advanced](http://learn.getgrav.org/advanced) functions
 
+# Backers
+Support us with a monthly donation and help us continue our activities. [[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.txt)
@@ -108,3 +184,10 @@ 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.
+
+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,7 +38,23 @@ 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'];
 
@@ -50,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\ComposerCommand(),
-    new Grav\Console\Cli\SandboxCommand(),
-    new Grav\Console\Cli\CleanCommand(),
-    new Grav\Console\Cli\ClearCacheCommand(),
-    new Grav\Console\Cli\BackupCommand(),
-    new Grav\Console\Cli\NewProjectCommand(),
-    new Grav\Console\Cli\NewUserCommand(),
+    new \Grav\Console\Cli\InstallCommand(),
+    new \Grav\Console\Cli\ComposerCommand(),
+    new \Grav\Console\Cli\SandboxCommand(),
+    new \Grav\Console\Cli\CleanCommand(),
+    new \Grav\Console\Cli\ClearCacheCommand(),
+    new \Grav\Console\Cli\BackupCommand(),
+    new \Grav\Console\Cli\NewProjectCommand(),
 ));
 $app->run();

bin/plugin

@@ -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';
 }
@@ -25,10 +21,15 @@ 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');
 }
@@ -37,12 +38,29 @@ 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)';
 
@@ -70,7 +88,7 @@ if (!$name) {
     $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']);
+    $list = Folder::all('plugins://', ['compare' => 'Pathname', 'pattern' => '/\/cli\/' . $pattern . '$/usm', 'levels' => 2]);
 
     if (count($list)) {
         $available = [];
@@ -101,16 +119,19 @@ if ($plugin === null) {
 $path = 'plugins://' . $name . '/cli';
 
 try {
-    $commands = Folder::all($path, ['compare' => 'Filename', 'pattern' => '/' . $pattern . '$/usm']);
+    $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) {
-    require_once "plugins://{$name}/cli/{$command}";
-    $command = 'Grav\Plugin\Console\\' . preg_replace('/.php$/', '', $command);
-    $app->add(new $command());
+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,13 +1,14 @@
 {
     "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",
-        "twig/twig": "~1.23",
+        "php": ">=5.5.9",
+        "twig/twig": "~1.24",
+        "erusev/parsedown": "dev-master as 1.6.0",
         "erusev/parsedown-extra": "~0.7",
         "symfony/yaml": "~2.8",
         "symfony/console": "~2.8",
@@ -15,15 +16,25 @@
         "symfony/var-dumper": "~2.8",
         "symfony/polyfill-iconv": "~1.0",
         "doctrine/cache": "~1.5",
-        "filp/whoops": "1.1.10",
+        "filp/whoops": "~2.0",
+        "matthiasmullie/minify": "^1.3",
         "monolog/monolog": "~1.0",
-        "gregwar/image": "~2.0",
-        "ircmaxell/password-compat": "1.0.*",
-        "mrclay/minify": "~2.2",
+        "gregwar/image": "dev-master#72568cfbeb77515278f2ccb386fc344e874b7ae8",
         "donatj/phpuseragentparser": "~0.3",
         "pimple/pimple": "~3.0",
-        "rockettheme/toolbox": "~1.2",
-        "maximebf/debugbar": "~1.10"
+        "rockettheme/toolbox": "~1.0",
+        "maximebf/debugbar": "~1.10",
+        "ext-mbstring": "*",
+        "ext-openssl": "*",
+        "ext-curl": "*",
+        "ext-zip": "*",
+        "league/climate": "^3.2",
+        "antoligy/dom-string-iterators": "^1.0"
+    },
+    "require-dev": {
+        "codeception/codeception": "^2.1",
+        "phpunit/php-code-coverage": "~2.0",
+        "fzaninotto/faker": "^1.5"
     },
     "autoload": {
         "psr-4": {
@@ -33,5 +44,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,27 +1,41 @@
 <?php
-namespace Grav;
+/**
+ * @package    Grav.Core
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
 
-if (version_compare($ver = PHP_VERSION, $req = '5.4.0', '<')) {
-    throw new \RuntimeException(sprintf('You are running PHP %s, but Grav needs at least <strong>PHP %s</strong> to run.', $ver, $req));
-}
+namespace Grav;
 
 // 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;
 
 // Register the auto-loader.
 $loader = require_once $autoload;
 
+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));
+}
+
 // Set timezone to default, falls back to system if php.ini not set
 date_default_timezone_set(@date_default_timezone_get());
 
 // Set internal encoding if mbstring loaded
 if (!extension_loaded('mbstring')) {
-    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 +50,6 @@ $grav = Grav::instance(
 try {
     $grav->process();
 } catch (\Exception $e) {
-    $grav->fireEvent('onFatalException');
+    $grav->fireEvent('onFatalException', new Event(['exception' => $e]));
     throw $e;
 }
-

system/assets/whoops.css

@@ -1,110 +1,19 @@
-body {
-    background-color: #eee;
-}
-
 body header {
-    background: #349886;
-    border-left: 8px solid #29796B;
+    background: #8552A2;
 }
 
-body .clipboard {
-    width: 28px;
-    height: 28px;
-    background: transparent url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABwAAAAcAQMAAABIw03XAAAAA3NCSVQICAjb4U/gAAAABlBMVEX///////9VfPVsAAAAAnRSTlP/AOW3MEoAAAAJcEhZcwAACxIAAAsSAdLdfvwAAAAcdEVYdFNvZnR3YXJlAEFkb2JlIEZpcmV3b3JrcyBDUzbovLKMAAAAFnRFWHRDcmVhdGlvbiBUaW1lADEwLzE1LzE0xr/LJAAAADhJREFUCJlj+P///wcGBPGDQR5E8OMi2IEEczOIaAQRHSCioQBGHAAR/7AT/z+DiA8MMALVXhABAJf9Sr5aY+UFAAAAAElFTkSuQmCC);
+body .left-panel {
+    background: inherit;
 }
 
 body .exc-title-primary {
-    color: #1C3631;
-    text-shadow: none;
+    color: #fff;
 }
 
 body .exc-title {
-    color: #2F5B52;
-    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;
+    color: #ddd;
 }
 
 body .frame:not(.active):hover {
-    background: #e9e9e9;
-}
-
-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;
+    background: #e6e6e6;
 }

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: vsmall
+                    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

@@ -20,6 +20,18 @@ form:
                     show_root: false
                     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 +56,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 +69,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'
-                    options:
-                        "": Auto Guess or Enter Custom
+                    data-options@: '\Grav\Common\Utils::dateFormats'
                     validate:
                         type: string
 
@@ -115,6 +125,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:
@@ -167,8 +178,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
@@ -221,6 +233,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
@@ -314,6 +369,7 @@ form:
                 pages.expires:
                     type: text
                     size: small
+                    append: NICETIME.SECOND_PLURAL
                     label: PLUGIN_ADMIN.EXPIRES
                     help: PLUGIN_ADMIN.EXPIRES_HELP
                     validate:
@@ -416,14 +472,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
-                        folder: Folder
-                        none: None
+                        file: Markdown + Yaml file timestamps
+                        folder: Folder timestamps
+                        hash: All files timestamps
+                        none: No timestamp checking
 
                 cache.driver:
                     type: select
@@ -435,9 +492,61 @@ form:
                         auto: Auto detect
                         file: File
                         apc: APC
-                        xcache: XCache
-                        memcache: MemCache
+                        apcu: APCu
+                        xcache: Xcache
+                        memcache: Memcache
+                        memcached: Memcached
                         wincache: WinCache
+                        redis: Redis
+
+                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.prefix:
                     type: text
@@ -449,6 +558,7 @@ form:
                 cache.lifetime:
                     type: text
                     size: small
+                    append: NICETIME.SECOND_PLURAL
                     label: PLUGIN_ADMIN.LIFETIME
                     help: PLUGIN_ADMIN.LIFETIME_HELP
                     validate:
@@ -465,6 +575,16 @@ 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
 
         twig:
             type: section
@@ -487,7 +607,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
@@ -544,6 +664,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
@@ -588,6 +730,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
@@ -623,15 +787,16 @@ 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
-                        0: PLUGIN_ADMIN.NO
-                    validate:
-                        type: bool
+                        -1: PLUGIN_ADMIN.ERROR_SYSTEM
+                        0: PLUGIN_ADMIN.ERROR_SIMPLE
+                        1: PLUGIN_ADMIN.ERROR_FULL_BACKTRACE
+
 
                 errors.log:
                     type: toggle
@@ -680,6 +845,7 @@ form:
             fields:
                 images.default_image_quality:
                     type: text
+                    append: '%'
                     label: PLUGIN_ADMIN.DEFAULT_IMAGE_QUALITY
                     help: PLUGIN_ADMIN.DEFAULT_IMAGE_QUALITY_HELP
                     classes: x-small
@@ -706,9 +872,8 @@ form:
                     help: PLUGIN_ADMIN.CACHE_PERMS_HELP
                     highlight: '0755'
                     options:
-                        1: '0755'
-                        0: '0775'
-
+                        '0755': '0755'
+                        '0775': '0775'
 
                 images.debug:
                     type: toggle
@@ -721,8 +886,20 @@ form:
                     validate:
                         type: bool
 
+                images.auto_fix_orientation:
+                    type: toggle
+                    label: PLUGIN_ADMIN.IMAGES_AUTO_FIX_ORIENTATION
+                    help: PLUGIN_ADMIN.IMAGES_AUTO_FIX_ORIENTATION_HELP
+                    highlight: 0
+                    options:
+                        1: PLUGIN_ADMIN.YES
+                        0: PLUGIN_ADMIN.NO
+                    validate:
+                        type: bool
+
                 media.upload_limit:
                     type: text
+                    append: bytes
                     label: PLUGIN_ADMIN.UPLOAD_LIMIT
                     help: PLUGIN_ADMIN.UPLOAD_LIMIT_HELP
                     classes: small
@@ -781,6 +958,7 @@ form:
                 session.timeout:
                     type: text
                     size: small
+                    append: NICETIME.SECOND_PLURAL
                     label: PLUGIN_ADMIN.TIMEOUT
                     help: PLUGIN_ADMIN.TIMEOUT_HELP
                     validate:
@@ -793,6 +971,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
@@ -800,6 +1019,54 @@ 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.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
+
                 wrapped_site:
                     type: toggle
                     label: PLUGIN_ADMIN.WRAPPED_SITE
@@ -832,3 +1099,21 @@ 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
+
+                custom_base_url:
+                    type: text
+                    size: medium
+                    placeholder: "e.g. http://localhost:8080"
+                    label: PLUGIN_ADMIN.CUSTOM_BASE_URL
+                    help: PLUGIN_ADMIN.CUSTOM_BASE_URL_HELP

system/blueprints/media/meta.yaml

@@ -1,7 +0,0 @@
-form:
-  validation: loose
-  fields:
-
-    alt_text:
-      type: string
-      label: Alt Text

system/blueprints/media/move.yaml

@@ -1,8 +0,0 @@
-form:
-  validation: loose
-  fields:
-    route:
-      type: select
-      label: PLUGIN_ADMIN.PAGE
-      classes: fancy
-      '@data-options': '\Grav\Common\Page\Pages::parents'

system/blueprints/media/rename.yaml

@@ -1,8 +0,0 @@
-form:
-  validation: loose
-  fields:
-    new_file_name:
-      type: text
-      label: PLUGIN_ADMIN_PRO.NEW_FILE_NAME
-      validate:
-        required: true

system/blueprints/pages/default.yaml

@@ -2,7 +2,7 @@ title: PLUGIN_ADMIN.DEFAULT
 
 rules:
   slug:
-    pattern: "[a-z][a-z0-9_\-]+"
+    pattern: '[a-zа-я][a-zа-я0-9_\-]+'
     min: 2
     max: 80
 
@@ -29,7 +29,6 @@ form:
 
             content:
                 type: markdown
-                showPreview: true
                 validate:
                   type: textarea
 
@@ -45,7 +44,7 @@ form:
 
             publishing:
               type: section
-              title: Publishing
+              title: PLUGIN_ADMIN.PUBLISHING
               underline: true
 
               fields:
@@ -134,13 +133,14 @@ form:
                       label: PLUGIN_ADMIN.FOLDER_NAME
                       validate:
                         type: slug
+                        pattern: '[a-zA-Zа-яA-Я0-9_\-]+'
 
                     route:
                       type: select
                       label: PLUGIN_ADMIN.PARENT
                       classes: fancy
-                      '@data-options': '\Grav\Common\Page\Pages::parents'
-                      '@data-default': '\Grav\Plugin\admin::route'
+                      data-options@: '\Grav\Common\Page\Pages::parentsRawRoutes'
+                      data-default@: '\Grav\Plugin\Admin\Admin::rawRoute'
                       options:
                         '/': PLUGIN_ADMIN.DEFAULT_OPTION_ROOT
 
@@ -150,7 +150,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
@@ -178,6 +178,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
@@ -203,7 +216,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
@@ -212,13 +225,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,12 +293,9 @@ form:
                     type: bool
 
                 header.template:
-                  type: select
+                  type: text
                   toggleable: true
-                  classes: fancy
                   label: PLUGIN_ADMIN.DISPLAY_TEMPLATE
-                  default: default
-                  '@data-options': '\Grav\Common\Page\Pages::types'
 
                 header.append_url_extension:
                   type: text

system/blueprints/pages/external.yaml

@@ -0,0 +1,58 @@
+title: PLUGIN_ADMIN:EXTERNAL
+@extends:
+    type: default
+    context: blueprints://pages
+
+rules:
+  slug:
+    pattern: '[a-zа-я][a-zа-я0-9_\-]+'
+    min: 2
+    max: 80
+
+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
+
+            uploads:
+              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

@@ -18,7 +18,7 @@ form:
               label: PLUGIN_ADMIN.ITEMS
               default: '@self.modular'
               options:
-                '@self.modular': Children
+                '@self.modular': Modular Children
 
             header.content.order.by:
               type: select

system/blueprints/pages/modular_new.yaml

@@ -1,6 +1,6 @@
 rules:
   slug:
-    pattern: "[a-z][a-z0-9_\-]+"
+    pattern: '[a-z][a-z0-9_\-]+'
     min: 2
     max: 80
 
@@ -24,15 +24,14 @@ form:
       validate:
         type: slug
         required: true
+        pattern: '[a-zA-Zа-яA-Я0-9_\-]+'
 
     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
+      data-options@: '\Grav\Common\Page\Pages::parentsRawRoutes'
+      data-default@: '\Grav\Plugin\Admin\Admin::rawRoute'
       validate:
         required: true
 
@@ -42,7 +41,7 @@ form:
       label: PLUGIN_ADMIN.MODULAR_TEMPLATE
       help: PLUGIN_ADMIN.PAGE_FILE_HELP
       default: default
-      '@data-options': '\Grav\Common\Page\Pages::modularTypes'
+      data-options@: '\Grav\Common\Page\Pages::modularTypes'
       validate:
         required: true
 

system/blueprints/pages/modular_raw.yaml

@@ -1,6 +1,6 @@
 rules:
   slug:
-    pattern: "[a-z][a-z0-9_\-]+"
+    pattern: '[a-z][a-z0-9_\-]+'
     min: 2
     max: 80
 
@@ -19,13 +19,22 @@ form:
 
           fields:
             frontmatter:
-              type: frontmatter
+              classes: frontmatter
+              type: editor
               label: PLUGIN_ADMIN.FRONTMATTER
-
+              autofocus: true
+              codemirror:
+                mode: 'yaml'
+                indentUnit: 4
+                autofocus: true
+                indentWithTabs: false
+                lineNumbers: true
+                styleActiveLine: true
+                gutters: ['CodeMirror-lint-markers']
+                lint: true
 
             content:
               type: markdown
-              showPreview: true
 
             uploads:
               type: pagemedia
@@ -64,13 +73,14 @@ form:
                       validate:
                         type: slug
                         required: true
+                        pattern: '[a-zA-Zа-яA-Я0-9_\-]+'
 
                     route:
                       type: select
                       label: PLUGIN_ADMIN.PARENT
                       classes: fancy
-                      '@data-options': '\Grav\Common\Page\Pages::parents'
-                      '@data-default': '\Grav\Plugin\admin::route'
+                      data-options@: '\Grav\Common\Page\Pages::parentsRawRoutes'
+                      data-default@: '\Grav\Plugin\Admin\Admin::rawRoute'
                       options:
                         '': PLUGIN_ADMIN.DEFAULT_OPTION_SELECT
                       validate:
@@ -81,7 +91,7 @@ form:
                       classes: fancy
                       label: PLUGIN_ADMIN.MODULAR_TEMPLATE
                       default: default
-                      '@data-options': '\Grav\Common\Page\Pages::modularTypes'
+                      data-options@: '\Grav\Common\Page\Pages::modularTypes'
                       validate:
                         required: true
 

system/blueprints/pages/move.yaml

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

system/blueprints/pages/new.yaml

@@ -1,6 +1,6 @@
 rules:
   slug:
-    pattern: "[a-z][a-z0-9_\-]+"
+    pattern: '[a-z][a-z0-9_\-]+'
     min: 2
     max: 80
 
@@ -26,13 +26,14 @@ form:
       validate:
         type: slug
         required: true
+        pattern: '[a-zA-Zа-яA-Я0-9_\-]+'
 
     route:
       type: select
       label: PLUGIN_ADMIN.PARENT_PAGE
       classes: fancy
-      '@data-options': '\Grav\Common\Page\Pages::parents'
-      '@data-default': '\Grav\Plugin\admin::getLastPageRoute'
+      data-options@: '\Grav\Common\Page\Pages::parentsRawRoutes'
+      data-default@: '\Grav\Plugin\Admin\Admin::getLastPageRoute'
       options:
         '/': PLUGIN_ADMIN.DEFAULT_OPTION_ROOT
       validate:
@@ -43,8 +44,8 @@ form:
       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'
+      data-options@: '\Grav\Common\Page\Pages::types'
+      data-default@: '\Grav\Plugin\Admin\Admin::getLastPageName'
       validate:
         required: true
 

system/blueprints/pages/new_folder.yaml

@@ -0,0 +1,36 @@
+rules:
+  slug:
+    pattern: '[a-z][a-z0-9_\-]+'
+    min: 2
+    max: 80
+
+form:
+  validation: loose
+  fields:
+
+    section:
+        type: section
+        title: PLUGIN_ADMIN.ADD_FOLDER
+
+    folder:
+      type: text
+      label: PLUGIN_ADMIN.FOLDER_NAME
+      help: PLUGIN_ADMIN.FOLDER_NAME_HELP
+      validate:
+        type: slug
+        required: true
+        pattern: '[a-zA-Zа-яA-Я0-9_\-]+'
+
+    route:
+      type: select
+      label: PLUGIN_ADMIN.PARENT_PAGE
+      classes: fancy
+      data-options@: '\Grav\Common\Page\Pages::parentsRawRoutes'
+      data-default@: '\Grav\Plugin\Admin\Admin::getLastPageRoute'
+      options:
+        '/': PLUGIN_ADMIN.DEFAULT_OPTION_ROOT
+      validate:
+        required: true
+
+    blueprint:
+      type: blueprint

system/blueprints/pages/raw.yaml

@@ -1,6 +1,6 @@
 rules:
   slug:
-    pattern: "[a-z][a-z0-9_\-]+"
+    pattern: '[a-z][a-z0-9_\-]+'
     min: 2
     max: 80
 
@@ -19,13 +19,22 @@ form:
 
           fields:
             frontmatter:
-              type: frontmatter
+              classes: frontmatter
+              type: editor
               label: PLUGIN_ADMIN.FRONTMATTER
               autofocus: true
+              codemirror:
+                mode: 'yaml'
+                indentUnit: 4
+                autofocus: true
+                indentWithTabs: false
+                lineNumbers: true
+                styleActiveLine: true
+                gutters: ['CodeMirror-lint-markers']
+                lint: true
 
             content:
               type: markdown
-              showPreview: true
 
             uploads:
               type: pagemedia
@@ -64,13 +73,14 @@ form:
                       validate:
                         type: slug
                         required: true
+                        pattern: '[a-zA-Zа-яA-Я0-9_\-]+'
 
                     route:
                       type: select
                       label: PLUGIN_ADMIN.PARENT
                       classes: fancy
-                      '@data-options': '\Grav\Common\Page\Pages::parents'
-                      '@data-default': '\Grav\Plugin\admin::route'
+                      data-options@: '\Grav\Common\Page\Pages::parentsRawRoutes'
+                      data-default@: '\Grav\Plugin\Admin\Admin::rawRoute'
                       options:
                         '/': PLUGIN_ADMIN.DEFAULT_OPTION_ROOT
 
@@ -80,7 +90,7 @@ form:
                       label: PLUGIN_ADMIN.DISPLAY_TEMPLATE
                       help: PLUGIN_ADMIN.DISPLAY_TEMPLATE_HELP
                       default: default
-                      '@data-options': '\Grav\Common\Page\Pages::types'
+                      data-options@: '\Grav\Common\Page\Pages::types'
                       validate:
                         required: true
 

system/blueprints/user/account.yaml

@@ -1,85 +1,85 @@
-title: Site
+title: Account
 form:
     validation: loose
+
     fields:
 
-        content:
-            type: section
-            title: PLUGIN_ADMIN.ACCOUNT
+            info:
+                type: userinfo
+                size: large
 
-            fields:
-                username:
-                    type: text
-                    size: large
-                    label: PLUGIN_ADMIN.USERNAME
-                    disabled: true
-                    readonly: true
+            content:
+                type: section
+                title: PLUGIN_ADMIN.ACCOUNT
+                underline: true
 
-                email:
-                    type: email
-                    size: large
-                    label: PLUGIN_ADMIN.EMAIL
-                    validate:
-                      type: email
-                      message: PLUGIN_ADMIN.EMAIL_VALIDATION_MESSAGE
-                      required: true
 
-                password:
-                    type: password
-                    size: large
-                    label: PLUGIN_ADMIN.PASSWORD
-                    validate:
-                      required: false
-                      message: PLUGIN_ADMIN.PASSWORD_VALIDATION_MESSAGE
-                      pattern: '(?=.*\d)(?=.*[a-z])(?=.*[A-Z]).{8,}'
+            username:
+                type: text
+                size: large
+                label: PLUGIN_ADMIN.USERNAME
+                disabled: true
+                readonly: true
 
-                fullname:
-                    type: text
-                    size: large
-                    label: PLUGIN_ADMIN.FULL_NAME
-                    validate:
-                      required: true
+            email:
+                type: email
+                size: large
+                label: PLUGIN_ADMIN.EMAIL
+                validate:
+                  type: email
+                  message: PLUGIN_ADMIN.EMAIL_VALIDATION_MESSAGE
+                  required: true
 
-                title:
-                    type: text
-                    size: large
-                    label: PLUGIN_ADMIN.TITLE
+            password:
+                type: password
+                size: large
+                label: PLUGIN_ADMIN.PASSWORD
+                validate:
+                  required: false
+                  message: PLUGIN_ADMIN.PASSWORD_VALIDATION_MESSAGE
+                  pattern: '(?=.*\d)(?=.*[a-z])(?=.*[A-Z]).{8,}'
 
-                language:
-                    type: select
-                    label: PLUGIN_ADMIN.LANGUAGE
-                    size: medium
-                    classes: fancy
-                    '@data-options': '\Grav\Plugin\admin::adminLanguages'
-                    default: 'en'
-                    help: PLUGIN_ADMIN.LANGUAGE_HELP
+            fullname:
+                type: text
+                size: large
+                label: PLUGIN_ADMIN.FULL_NAME
+                validate:
+                  required: true
 
-                security:
-                    title: Security
-                    type: section
-                    security: admin.super
+            title:
+                type: text
+                size: large
+                label: PLUGIN_ADMIN.TITLE
 
-                    fields:
-                        groups:
-                            type: selectize
-                            size: large
-                            label: PLUGIN_ADMIN.GROUPS
-                            '@data-options': '\Grav\User\Groups::groups'
-                            classes: fancy
-                            help: PLUGIN_ADMIN.GROUPS_HELP
-                            validate:
-                                type: commalist
+            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
 
-                        access.admin:
+            security:
+                title: PLUGIN_ADMIN.ACCESS_LEVELS
+                type: section
+                security: admin.super
+                underline: true
+
+                fields:
+                    groups:
+                        type: selectize
+                        size: large
+                        label: PLUGIN_ADMIN.GROUPS
+                        data-options@: '\Grav\User\Groups::groups'
+                        classes: fancy
+                        help: PLUGIN_ADMIN.GROUPS_HELP
+                        validate:
+                            type: commalist
+
+                    access:
+                        type: permissions
+                        label: PLUGIN_ADMIN.PERMISSIONS
+                        ignore_empty: true
+                        validate:
                             type: array
-                            label: PLUGIN_ADMIN.ADMIN_ACCESS
-                            multiple: false
-                            validate:
-                                type: array
-
-                        access.site:
-                            type: array
-                            label: PLUGIN_ADMIN.SITE_ACCESS
-                            multiple: false
-                            validate:
-                                type: array

system/blueprints/user/group.yaml

@@ -29,16 +29,9 @@ form:
             size: small
             label: PLUGIN_ADMIN_PRO.ICON
 
-        access.admin:
-            type: array
-            label: PLUGIN_ADMIN.ADMIN_ACCESS
-            multiple: false
+        access:
+            type: permissions
+            label: PLUGIN_ADMIN.PERMISSIONS
+            ignore_empty: true
             validate:
                 type: array
-
-        access.site:
-            type: array
-            label: PLUGIN_ADMIN.SITE_ACCESS
-            multiple: false
-            validate:
-                type: array

system/config/media.yaml

@@ -1,190 +1,206 @@
-defaults:
-  type: file
-  thumb: media/thumb.png
-  mime: application/octet-stream
-  image:
-    filters:
-      default:
-        - enableProgressive
+types:
+  defaults:
+    type: file
+    thumb: media/thumb.png
+    mime: application/octet-stream
+    image:
+      filters:
+        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
+  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
+  svg:
+    type: vector
+    thumb: media/thumb.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
+  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: video
+    thumb: media/thumb.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
-  mime: audio/aiff
-aif:
-  type: audio
-  mime: audio/aif
+  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
+  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
+  xlsm:
+    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
+  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
+  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
+  7z:
+    type: file
+    thumb: media/thumb-7zip.png
+    mime: application/x-7z-compressed
+  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
 

system/config/site.yaml

@@ -1,4 +1,5 @@
 title: Grav                                 # Name of the site
+default_lang: en                            # Default language for site (potentially used by theme)
 
 author:
   name: John Appleseed                      # Default author name
@@ -16,12 +17,12 @@ summary:
   delimiter: ===                            # The summary delimiter
 
 redirects:
-  /redirect-test: /                         # Redirect test goes to home page
-  /old/(.*): /new/$1                        # Would redirect /old/my-page to /new/my-page
+#  '/redirect-test': '/'                         # Redirect test goes to home page
+#  '/old/(.*)': '/new/$1'                        # Would redirect /old/my-page to /new/my-page
 
 routes:
-  /something/else: '/blog/sample-3'         # Alias for /blog/sample-3
-  /new/(.*): '/blog/$1'                     # Regex any /new/my-page URL to /blog/my-page Route
+#  '/something/else': '/blog/sample-3'         # Alias for /blog/sample-3
+#  '/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/system.yaml

@@ -3,6 +3,9 @@ timezone: ''                                # Valid values: http://php.net/manua
 default_locale:                             # Default locale (defaults to system)
 param_sep: ':'                              # Parameter separator, use ';' for Apache on windows
 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)
+custom_base_url: ''                         # Set the base_url manually
 
 languages:
   supported: []                             # List of languages supported. eg: [en, fr, de]
@@ -15,6 +18,7 @@ languages:
 
 home:
   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)
@@ -31,9 +35,11 @@ pages:
   process:
     markdown: true                          # Process Markdown
     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
-    twig: true                              # Enable twig level events
+    twig: true                              # Enable Twig level events
   markdown:
     extra: false                            # Enable support for Markdown Extra support (GFM by default)
     auto_line_breaks: false                 # Enable automatic line breaks
@@ -55,19 +61,25 @@ pages:
   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
   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
   prefix: 'g'                               # Cache prefix string (prevents cache conflicts)
   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
-  debug: false                              # Enable Twig debug
+  cache: true                               # Set to true to enable Twig caching
+  debug: true                               # Enable Twig debug
   auto_reload: true                         # Refresh cache on changes
   autoescape: false                         # Autoescape Twig vars
   undefined_functions: true                 # Allow undefined functions
@@ -76,17 +88,21 @@ twig:
 
 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_include_externals: true      # Include external URLs in the pipeline by default
+  css_pipeline_before_excludes: true        # Render the pipeline before any excluded files
   css_minify: true                          # Minify the CSS during pipelining
   css_minify_windows: false                 # Minify Override for Windows platforms. False by default due to ThreadStackSize
   css_rewrite: true                         # Rewrite any CSS relative URLs during pipelining
   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
 
 debugger:
@@ -97,8 +113,9 @@ debugger:
 images:
   default_image_quality: 85                 # Default image quality to use when resampling images (85%)
   cache_all: false                          # Cache all image by default
-  cache_perms: 0755                         # Default cache folder perms. Usually 0755 or 0775 depending on setup
+  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
@@ -110,5 +127,13 @@ session:
   enabled: true                             # Enable Session support
   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:
 
-
+gpm:
+  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.

system/defines.php

@@ -1,9 +1,17 @@
 <?php
+/**
+ * @package    Grav.Core
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
 
 // Some standard defines
 define('GRAV', true);
-define('GRAV_VERSION', '1.0.2');
+define('GRAV_VERSION', '1.1.15');
+define('GRAV_TESTING', false);
 define('DS', '/');
+define('GRAV_PHP_MIN', '5.5.9');
 
 // Directories and Paths
 if (!defined('GRAV_ROOT')) {
@@ -12,9 +20,7 @@ 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('CACHE_DIR', ROOT_DIR . 'cache/');
-define('LOG_DIR', ROOT_DIR .'logs/');
 
 // DEPRECATED: Do not use!
 define('ASSETS_DIR', ROOT_DIR . 'assets/');
@@ -22,10 +28,12 @@ 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

system/languages/ar.yaml

@@ -0,0 +1,75 @@
+---
+FRONTMATTER_ERROR_PAGE: |
+  ---
+  العنوان: %1$s
+  ---
+  # خطأ: مادة أمامية غير صحيحة
+  
+  مسار: '%2$s'
+  
+  **%3$s**
+  
+  , , ,
+  
+  %4$s
+  , , ,
+NICETIME:
+  NO_DATE_PROVIDED: لم يتم تقديم التاريخ
+  BAD_DATE: تاريخ خاطئ
+  AGO: من قبل
+  FROM_NOW: من الآن
+  SECOND: ثانية
+  MINUTE: دقيقة
+  HOUR: ساعة
+  DAY: يوم
+  WEEK: أسبوع
+  MONTH: شهر
+  YEAR: سنة
+  DECADE: عقد
+  SEC: ثانية
+  MIN: دقيقة
+  HR: ساعة
+  WK: أسبوع
+  MO: شهر
+  YR: سنة
+  DEC: عقد
+  SECOND_PLURAL: ثواني
+  MINUTE_PLURAL: ‮دقائق
+  HOUR_PLURAL: ساعات
+  DAY_PLURAL: أيام
+  WEEK_PLURAL: أسابيع
+  MONTH_PLURAL: أشهر
+  YEAR_PLURAL: سنوات
+  DECADE_PLURAL: عقود
+  SEC_PLURAL: ثواني
+  MIN_PLURAL: دقائق
+  HR_PLURAL: ساعات
+  WK_PLURAL: أسابيع
+  MO_PLURAL: أشهر
+  YR_PLURAL: سنوات
+  DEC_PLURAL: عقود
+FORM:
+  VALIDATION_FAIL: '<b>فشل التحقق من صحة:</b>'
+  INVALID_INPUT: إدخال غير صحيح في
+  MISSING_REQUIRED_FIELD: 'حقل مطلوب مفقود:'
+MONTHS_OF_THE_YEAR:
+  - كانون الثاني
+  - شباط
+  - آذار/ مارس
+  - نيسان
+  - أيار
+  - حزيران
+  - تموز
+  - آب
+  - أيلول
+  - تشرين الأول
+  - تشرين الثاني
+  - كانون الأول
+DAYS_OF_THE_WEEK:
+  - الاثنين
+  - الثلاثاء
+  - الأربعاء
+  - الخميس
+  - الجمعة
+  - السبت
+  - الأحد

system/languages/ca.yaml

@@ -0,0 +1,75 @@
+---
+FRONTMATTER_ERROR_PAGE: |
+  ---
+  title: %1$s
+  ---
+  
+  # S'ha produït un error: Frontmatter invàlid
+  
+  Ruta: `%2$s`
+  
+  **%3$s**
+  
+  ```
+  %4$s
+  ```
+NICETIME:
+  NO_DATE_PROVIDED: "No s'ha proporcionat data"
+  BAD_DATE: Data invàlida
+  AGO: abans
+  FROM_NOW: "des d'ara"
+  SECOND: segon
+  MINUTE: minut
+  HOUR: hora
+  DAY: dia
+  WEEK: setmana
+  MONTH: mes
+  YEAR: any
+  DECADE: dècada
+  SEC: s
+  MIN: min
+  HR: h
+  WK: setm.
+  MO: m.
+  YR: a.
+  DEC: dèc.
+  SECOND_PLURAL: segons
+  MINUTE_PLURAL: minuts
+  HOUR_PLURAL: hores
+  DAY_PLURAL: dies
+  WEEK_PLURAL: setmanes
+  MONTH_PLURAL: mesos
+  YEAR_PLURAL: anys
+  DECADE_PLURAL: dècades
+  SEC_PLURAL: s
+  MIN_PLURAL: min
+  HR_PLURAL: h
+  WK_PLURAL: setm.
+  MO_PLURAL: mesos
+  YR_PLURAL: anys
+  DEC_PLURAL: dèc.
+FORM:
+  VALIDATION_FAIL: '<b>Ha fallat la validació:</b>'
+  INVALID_INPUT: Entrada no vàlida a
+  MISSING_REQUIRED_FIELD: 'Falta camp obligatori:'
+MONTHS_OF_THE_YEAR:
+  - Gener
+  - Febrer
+  - Març
+  - Abril
+  - Maig
+  - Juny
+  - Juliol
+  - Agost
+  - Setembre
+  - Octubre
+  - Novembre
+  - Desembre
+DAYS_OF_THE_WEEK:
+  - Dilluns
+  - Dimarts
+  - Dimecres
+  - Dijous
+  - Divendres
+  - Dissabte
+  - Diumenge

system/languages/cs.yaml

@@ -1,37 +1,81 @@
+---
+INFLECTOR_UNCOUNTABLE:
+  - vybavení
+  - informace
+  - rýže
+  - peníze
+  - druhy
+  - série
+  - ryba
+  - ovce
+INFLECTOR_IRREGULAR:
+  person: lidé
+  man: muži
+  child: děti
+  sex: pohlaví
+  move: pohyby
+INFLECTOR_ORDINALS:
+  default: '.'
+  first: '.'
+  second: '.'
+  third: '.'
 NICETIME:
-    NO_DATE_PROVIDED: Datum nebylo vloženo
-    BAD_DATE: Chybné datum
-    AGO: zpět
-    FROM_NOW: od teď
-    SECOND: sekunda
-    MINUTE: minuta
-    HOUR: hodina
-    DAY: den
-    WEEK: týden
-    MONTH: měsíc
-    YEAR: rok
-    DECADE: dekáda
-    SEC: sek
-    MIN: min
-    HR: hod
-    DAY: den
-    WK: t
-    MO: m
-    YR: r
-    DEC: dek
-    SECOND_PLURAL: sekundy
-    MINUTE_PLURAL: minuty
-    HOUR_PLURAL: hodiny
-    DAY_PLURAL: dny
-    WEEK_PLURAL: týdny
-    MONTH_PLURAL: měsíce
-    YEAR_PLURAL: roky
-    DECADE_PLURAL: dekády
-    SEC_PLURAL: sek
-    MIN_PLURAL: min
-    HR_PLURAL: hod
-    DAY_PLURAL: dny
-    WK_PLURAL: t
-    MO_PLURAL: m
-    YR_PLURAL: r
-    DEC_PLURAL: dek
+  NO_DATE_PROVIDED: Datum nebylo vloženo
+  BAD_DATE: Chybné datum
+  AGO: zpět
+  FROM_NOW: od teď
+  SECOND: sekunda
+  MINUTE: minuta
+  HOUR: hodina
+  DAY: den
+  WEEK: týden
+  MONTH: měsíc
+  YEAR: rok
+  DECADE: dekáda
+  SEC: sek
+  MIN: min
+  HR: hod
+  WK: t
+  MO: m
+  YR: r
+  DEC: dek
+  SECOND_PLURAL: sekundy
+  MINUTE_PLURAL: minuty
+  HOUR_PLURAL: hodiny
+  DAY_PLURAL: dny
+  WEEK_PLURAL: týdny
+  MONTH_PLURAL: měsíce
+  YEAR_PLURAL: roky
+  DECADE_PLURAL: dekády
+  SEC_PLURAL: sek
+  MIN_PLURAL: min
+  HR_PLURAL: hod
+  WK_PLURAL: t
+  MO_PLURAL: m
+  YR_PLURAL: r
+  DEC_PLURAL: dek
+FORM:
+  VALIDATION_FAIL: '<b>Ověření se nezdařilo:</b>'
+  INVALID_INPUT: Neplatný vstup v
+  MISSING_REQUIRED_FIELD: 'Chybí požadované pole:'
+MONTHS_OF_THE_YEAR:
+  - ledna
+  - února
+  - března
+  - dubna
+  - května
+  - června
+  - července
+  - srpna
+  - září
+  - října
+  - listopadu
+  - prosince
+DAYS_OF_THE_WEEK:
+  - Pondělí
+  - Úterý
+  - Středa
+  - Čtvrtek
+  - Pátek
+  - Sobota
+  - Neděle

system/languages/da.yaml

@@ -0,0 +1,75 @@
+---
+FRONTMATTER_ERROR_PAGE: |
+  ---
+  Titel: %1$s
+  ---
+  
+  # Fejl: Ugyldigt frontmatter
+  
+  Sti: `%2$s`
+  
+  **%3$s**
+  
+  ```
+  %4$s
+  ```
+NICETIME:
+  NO_DATE_PROVIDED: Ingen dato angivet
+  BAD_DATE: Ugyldig dato
+  AGO: siden
+  FROM_NOW: fra nu
+  SECOND: sekund
+  MINUTE: minut
+  HOUR: time
+  DAY: dag
+  WEEK: uge
+  MONTH: måned
+  YEAR: år
+  DECADE: årti
+  SEC: sek
+  MIN: min
+  HR: t
+  WK: u
+  MO: md
+  YR: år
+  DEC: årti
+  SECOND_PLURAL: sekunder
+  MINUTE_PLURAL: minutter
+  HOUR_PLURAL: timer
+  DAY_PLURAL: dage
+  WEEK_PLURAL: uger
+  MONTH_PLURAL: måneder
+  YEAR_PLURAL: år
+  DECADE_PLURAL: årtier
+  SEC_PLURAL: sek
+  MIN_PLURAL: min
+  HR_PLURAL: timer
+  WK_PLURAL: uger
+  MO_PLURAL: mdr
+  YR_PLURAL: år
+  DEC_PLURAL: årtier
+FORM:
+  VALIDATION_FAIL: '<b>Validering mislykkedes:</b>'
+  INVALID_INPUT: Ugyldigt input i
+  MISSING_REQUIRED_FIELD: 'Mangler obligatorisk felt:'
+MONTHS_OF_THE_YEAR:
+  - Januar
+  - Februar
+  - Marts
+  - April
+  - Maj
+  - Juni
+  - Juli
+  - August
+  - September
+  - Oktober
+  - November
+  - December
+DAYS_OF_THE_WEEK:
+  - Mandag
+  - Tirsdag
+  - Onsdag
+  - Torsdag
+  - Fredag
+  - Lørdag
+  - Søndag

system/languages/de.yaml

@@ -1,43 +1,89 @@
+---
+FRONTMATTER_ERROR_PAGE: |
+  ---
+  title: %1$s
+  ---
+  # Fehler: Frontmatter enthält Fehler
+  
+  Pfad: `%2$s`
+  
+  **%3$s ** 
+  
+  ```
+  %4$s
+  ```
+INFLECTOR_UNCOUNTABLE:
+  1: Informationen
+  2: Reis
+  3: Geld
 INFLECTOR_IRREGULAR:
-    'person': 'Personen'
-    'man': 'Menschen'
-    'child': 'Kinder'
-    'sex': 'Geschlecht'
-    'move': 'Züge'
+  person: Personen
+  man: Menschen
+  child: Kinder
+  sex: Geschlecht
+  move: Züge
+INFLECTOR_ORDINALS:
+  default: '.'
+  first: '.'
+  second: '.'
+  third: '.'
 NICETIME:
-    NO_DATE_PROVIDED: Keine Daten vorhanden
-    BAD_DATE: Falsches Datum
-    AGO: her
-    FROM_NOW: ab jetzt
-    SECOND: Sekunde
-    MINUTE: Minute
-    HOUR: Stunde
-    DAY: Tag
-    WEEK: Woche
-    MONTH: Monat
-    YEAR: Jahr
-    DECADE: Dekade
-    SEC: sek
-    MIN: min
-    HR: std
-    DAY: Tag
-    WK: wo
-    MO: mo
-    YR: yh
-    DEC: dec
-    SECOND_PLURAL: Sekunden
-    MINUTE_PLURAL: Minuten
-    HOUR_PLURAL: Stunden
-    DAY_PLURAL: Tage
-    WEEK_PLURAL: Wochen
-    MONTH_PLURAL: Monate
-    YEAR_PLURAL: Jahre
-    DECADE_PLURAL: Dekaden
-    SEC_PLURAL: Sekunden
-    MIN_PLURAL: Minuten
-    HR_PLURAL: Stunden
-    DAY_PLURAL: Tage
-    WK_PLURAL: Wochen
-    MO_PLURAL: Monate
-    YR_PLURAL: Jahre
-    DEC_PLURAL: Dekaden
+  NO_DATE_PROVIDED: Kein Datum angegeben
+  BAD_DATE: Falsches Datum
+  AGO: her
+  FROM_NOW: ab jetzt
+  SECOND: Sekunde
+  MINUTE: Minute
+  HOUR: Stunde
+  DAY: Tag
+  WEEK: Woche
+  MONTH: Monat
+  YEAR: Jahr
+  DECADE: Jahrzehnt
+  SEC: Sek.
+  MIN: Min.
+  HR: Std.
+  WK: Wo.
+  MO: Mo.
+  YR: J.
+  DEC: Dek.
+  SECOND_PLURAL: Sekunden
+  MINUTE_PLURAL: Minuten
+  HOUR_PLURAL: Stunden
+  DAY_PLURAL: Tage
+  WEEK_PLURAL: Wochen
+  MONTH_PLURAL: Monate
+  YEAR_PLURAL: Jahre
+  DECADE_PLURAL: Jahrzehnte
+  SEC_PLURAL: Sekunden
+  MIN_PLURAL: Minuten
+  HR_PLURAL: Stunden
+  WK_PLURAL: Wochen
+  MO_PLURAL: Monate
+  YR_PLURAL: Jahre
+  DEC_PLURAL: Jahrzehnten
+FORM:
+  VALIDATION_FAIL: '<b>Überprüfung fehlgeschlagen:</b>'
+  INVALID_INPUT: Ungültige Eingabe in
+  MISSING_REQUIRED_FIELD: 'Erforderliches Feld fehlt:'
+MONTHS_OF_THE_YEAR:
+  - Januar
+  - Februar
+  - März
+  - April
+  - Mai
+  - Juni
+  - Juli
+  - August
+  - September
+  - Oktober
+  - November
+  - Dezember
+DAYS_OF_THE_WEEK:
+  - Montag
+  - Dienstag
+  - Mittwoch
+  - Donnerstag
+  - Freitag
+  - Samstag
+  - Sonntag

system/languages/el.yaml

@@ -0,0 +1,22 @@
+---
+MONTHS_OF_THE_YEAR:
+  - Ιανουάριος
+  - Φεβρουάριος
+  - Μάρτιος
+  - Απρίλιος
+  - Μάιος
+  - Ιούνιος
+  - Ιούλιος
+  - Αύγουστος
+  - Σεπτέμβριος
+  - Οκτώβριος
+  - Νοέμβριος
+  - Δεκέμβριος
+DAYS_OF_THE_WEEK:
+  - Δευτέρα
+  - Τρίτη
+  - Τετάρτη
+  - Πέμπτη
+  - Παρασκευή
+  - Σάββατο
+  - Κυριακή

system/languages/en.yaml

@@ -96,3 +96,5 @@ FORM:
     VALIDATION_FAIL: <b>Validation failed:</b>
     INVALID_INPUT: Invalid input in
     MISSING_REQUIRED_FIELD: Missing required field:
+MONTHS_OF_THE_YEAR: ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December']
+DAYS_OF_THE_WEEK: ['Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday', 'Sunday']

system/languages/es.yaml

@@ -1,42 +1,90 @@
+---
+FRONTMATTER_ERROR_PAGE: |
+  ---
+  title: %1$s
+  ---
+  
+  # Error: Frontmatter Inválido
+  
+  Ruta: `%2$s`
+  
+  **%3$s**
+  
+  ```
+  %4$s
+  ```
+INFLECTOR_UNCOUNTABLE:
+  0: equipo
+  1: información
+  3: dinero
+  5: series
+  6: pescado
+  7: oveja
+INFLECTOR_IRREGULAR:
+  man: hombres
+  child: niños
+  sex: sexos
+INFLECTOR_ORDINALS:
+  first: ro
+  second: do
+  third: ro
 NICETIME:
-    NO_DATE_PROVIDED: No se proporcionó fecha
-    BAD_DATE: Fecha erronea
-    AGO: antes
-    FROM_NOW: desde ahora
-    SECOND: segundo
-    MINUTE: minuto
-    HOUR: hora
-    DAY: dia
-    WEEK: semana
-    MONTH: mes
-    YEAR: año
-    DECADE: decada
-    SEC: seg
-    MIN: min
-    HR: hr
-    DAY: dia
-    WK: sem
-    MO: mes
-    YR: yr
-    DEC: dec
-    SECOND_PLURAL: segundos
-    MINUTE_PLURAL: minutos
-    HOUR_PLURAL: horas
-    DAY_PLURAL: días
-    WEEK_PLURAL: semanas
-    MONTH_PLURAL: meses
-    YEAR_PLURAL: años
-    DECADE_PLURAL: decadas
-    SEC_PLURAL: segs
-    MIN_PLURAL: mins
-    HR_PLURAL: hrs
-    DAY_PLURAL: dias
-    WK_PLURAL: sem
-    MO_PLURAL: mes
-    YR_PLURAL: años
-    DEC_PLURAL: decs
+  NO_DATE_PROVIDED: No se proporcionó fecha
+  BAD_DATE: Fecha erronea
+  AGO: antes
+  FROM_NOW: desde ahora
+  SECOND: segundo
+  MINUTE: minuto
+  HOUR: hora
+  DAY: día
+  WEEK: semana
+  MONTH: mes
+  YEAR: año
+  DECADE: década
+  SEC: seg
+  MIN: min
+  HR: h
+  WK: sem
+  MO: mes
+  YR: año
+  DEC: dec
+  SECOND_PLURAL: segundos
+  MINUTE_PLURAL: minutos
+  HOUR_PLURAL: horas
+  DAY_PLURAL: días
+  WEEK_PLURAL: semanas
+  MONTH_PLURAL: meses
+  YEAR_PLURAL: años
+  DECADE_PLURAL: décadas
+  SEC_PLURAL: segs
+  MIN_PLURAL: mins
+  HR_PLURAL: hs
+  WK_PLURAL: sem
+  MO_PLURAL: mes
+  YR_PLURAL: años
+  DEC_PLURAL: décadas
 FORM:
-    VALIDATION_FAIL: <b>Falló la validación. </b>
-    INVALID_INPUT: "Dato inválido en: "
-    MISSING_REQUIRED_FIELD: "Falta el campo requerido: "
-
+  VALIDATION_FAIL: '<b>Falló la validación. </b>'
+  INVALID_INPUT: 'Dato inválido en: '
+  MISSING_REQUIRED_FIELD: 'Falta el campo requerido: '
+MONTHS_OF_THE_YEAR:
+  - Enero
+  - Febrero
+  - Marzo
+  - Abril
+  - Mayo
+  - Junio
+  - Julio
+  - Agosto
+  - Septiembre
+  - Octubre
+  - Noviembre
+  - Diciembre
+DAYS_OF_THE_WEEK:
+  - Lunes
+  - Martes
+  - Miércoles
+  - Jueves
+  - Viernes
+  - Sábado
+  - Domingo

system/languages/fi.yaml

@@ -0,0 +1,60 @@
+---
+NICETIME:
+  NO_DATE_PROVIDED: Päivämäärää ei annettu
+  BAD_DATE: Virheellinen päivämäärä
+  AGO: sitten
+  FROM_NOW: tästä lähtien
+  SECOND: sekunti
+  MINUTE: minuutti
+  HOUR: tunti
+  DAY: päivä
+  WEEK: viikko
+  MONTH: kuukausi
+  YEAR: vuosi
+  DECADE: vuosikymmen
+  SEC: sek
+  MIN: min
+  HR: h
+  WK: vk
+  MO: kk
+  YR: v
+  DEC: vuosikymmen
+  SECOND_PLURAL: sekuntia
+  MINUTE_PLURAL: minuuttia
+  HOUR_PLURAL: tuntia
+  DAY_PLURAL: päivää
+  WEEK_PLURAL: viikkoa
+  MONTH_PLURAL: kuukautta
+  YEAR_PLURAL: vuotta
+  DECADE_PLURAL: vuosikymmentä
+  SEC_PLURAL: sek
+  MIN_PLURAL: min
+  HR_PLURAL: h
+  WK_PLURAL: v
+  MO_PLURAL: kk
+  YR_PLURAL: v
+  DEC_PLURAL: vuosikymmentä
+FORM:
+  VALIDATION_FAIL: '<b>Vahvistus epäonnistui:</b>'
+  MISSING_REQUIRED_FIELD: 'Puuttuva pakollinen kenttä:'
+MONTHS_OF_THE_YEAR:
+  - Tammikuu
+  - Helmikuu
+  - Maaliskuu
+  - Huhtikuu
+  - Toukokuu
+  - Kesäkuuta
+  - Heinäkuu
+  - Elokuu
+  - Syyskuu
+  - Lokakuu
+  - Marraskuu
+  - Joulukuu
+DAYS_OF_THE_WEEK:
+  - Maanantai
+  - Tiistai
+  - Keskiviikko
+  - Torstai
+  - Perjantai
+  - Lauantai
+  - Sunnuntai

system/languages/fr.yaml

@@ -1,98 +1,138 @@
-FRONTMATTER_ERROR_PAGE: "---\ntitle: %1$s\n---\n\n# Erreur : Frontmatter invalide\n\nPath: `%2$s`\n\n**%3$s**\n\n```\n%4$s\n```"
+---
+FRONTMATTER_ERROR_PAGE: |
+  ---
+  title: %1$s
+  ---
+  
+  # Erreur : Frontmatter invalide
+  
+  Path: `%2$s`
+  
+  **%3$s**
+  
+  ```
+  %4$s
+  ```
 INFLECTOR_PLURALS:
-    '/(quiz)$/i': '\1zes'
-    '/^(ox)$/i': '\1en'
-    '/([m|l])ouse$/i': '\1ice'
-    '/(matr|vert|ind)ix|ex$/i': '\1ices'
-    '/(x|ch|ss|sh)$/i': '\1es'
-    '/([^aeiouy]|qu)ies$/i': '\1y'
-    '/([^aeiouy]|qu)y$/i': '\1ies'
-    '/(hive)$/i': '\1s'
-    '/(?:([^f])fe|([lr])f)$/i': '\1\2ves'
-    '/sis$/i': 'ses'
-    '/([ti])um$/i': '\1a'
-    '/(buffal|tomat)o$/i': '\1oes'
-    '/(bu)s$/i': '\1ses'
-    '/(alias|status)/i': '\1es'
-    '/(octop|vir)us$/i': '\1i'
-    '/(ax|test)is$/i': '\1es'
-    '/s$/i': 's'
-    '/$/': 's'
+  /(quiz)$/i: '\1zes'
+  /^(ox)$/i: '\1en'
+  "/([m|l])ouse$/i": '\1ice'
+  /(matr|vert|ind)ix|ex$/i: '\1ices'
+  /(x|ch|ss|sh)$/i: '\1es'
+  "/([^aeiouy]|qu)ies$/i": '\1y'
+  "/([^aeiouy]|qu)y$/i": '\1ies'
+  /(hive)$/i: '\1s'
+  "/(?:([^f])fe|([lr])f)$/i": '\1\2ves'
+  /sis$/i: ses
+  "/([ti])um$/i": '\1a'
+  /(buffal|tomat)o$/i: '\1oes'
+  /(bu)s$/i: '\1ses'
+  /(alias|status)/i: '\1es'
+  /(octop|vir)us$/i: '\1i'
+  /(ax|test)is$/i: '\1es'
+  /s$/i: s
+  /$/: s
 INFLECTOR_SINGULAR:
-    '/(quiz)zes$/i': '\1'
-    '/(matr)ices$/i': '\1ix'
-    '/(vert|ind)ices$/i': '\1ex'
-    '/^(ox)en/i': '\1'
-    '/(alias|status)es$/i': '\1'
-    '/([octop|vir])i$/i': '\1us'
-    '/(cris|ax|test)es$/i': '\1is'
-    '/(shoe)s$/i': '\1'
-    '/(o)es$/i': '\1'
-    '/(bus)es$/i': '\1'
-    '/([m|l])ice$/i': '\1ouse'
-    '/(x|ch|ss|sh)es$/i': '\1'
-    '/(m)ovies$/i': '\1ovie'
-    '/(s)eries$/i': '\1eries'
-    '/([^aeiouy]|qu)ies$/i': '\1y'
-    '/([lr])ves$/i': '\1f'
-    '/(tive)s$/i': '\1'
-    '/(hive)s$/i': '\1'
-    '/([^f])ves$/i': '\1fe'
-    '/(^analy)ses$/i': '\1sis'
-    '/((a)naly|(b)a|(d)iagno|(p)arenthe|(p)rogno|(s)ynop|(t)he)ses$/i': '\1\2sis'
-    '/([ti])a$/i': '\1um'
-    '/(n)ews$/i': '\1ews'
-    '/s$/i': ''
-INFLECTOR_UNCOUNTABLE: ['équipment', 'information', 'riz', 'argent', 'espèces', 'séries', 'poisson', 'mouton']
+  /(quiz)zes$/i: '\1'
+  /(matr)ices$/i: '\1ix'
+  /(vert|ind)ices$/i: '\1ex'
+  /^(ox)en/i: '\1'
+  /(alias|status)es$/i: '\1'
+  "/([octop|vir])i$/i": '\1us'
+  /(cris|ax|test)es$/i: '\1is'
+  /(shoe)s$/i: '\1'
+  /(o)es$/i: '\1'
+  /(bus)es$/i: '\1'
+  "/([m|l])ice$/i": '\1ouse'
+  /(x|ch|ss|sh)es$/i: '\1'
+  /(m)ovies$/i: '\1ovie'
+  /(s)eries$/i: '\1eries'
+  "/([^aeiouy]|qu)ies$/i": '\1y'
+  "/([lr])ves$/i": '\1f'
+  /(tive)s$/i: '\1'
+  /(hive)s$/i: '\1'
+  "/([^f])ves$/i": '\1fe'
+  /(^analy)ses$/i: '\1sis'
+  /((a)naly|(b)a|(d)iagno|(p)arenthe|(p)rogno|(s)ynop|(t)he)ses$/i: '\1\2sis'
+  "/([ti])a$/i": '\1um'
+  /(n)ews$/i: '\1ews'
+INFLECTOR_UNCOUNTABLE:
+  - équipement
+  - informations
+  - riz
+  - argent
+  - espèces
+  - séries
+  - poisson
+  - mouton
 INFLECTOR_IRREGULAR:
-    'person': 'personnes'
-    'man': 'Hommes'
-    'child': 'enfants'
-    'sex': 'sexes'
-    'move': 'déplacemements'
+  person: personnes
+  man: hommes
+  child: enfants
+  sex: sexes
+  move: déplacements
 INFLECTOR_ORDINALS:
-    'default': 'ème'
-    'first': 'er'
-    'second': 'nd'
-    'third': 'ème'
+  default: ème
+  first: er
+  second: ème
+  third: ème
 NICETIME:
-    NO_DATE_PROVIDED: Aucune date
-    BAD_DATE: Date erronée
-    AGO: plus tôt
-    FROM_NOW: à partir de maintenant
-    SECOND: seconde
-    MINUTE: minute
-    HOUR: heure
-    DAY: jour
-    WEEK: semaine
-    MONTH: mois
-    YEAR: an
-    DECADE: décennie
-    SEC: s
-    MIN: m
-    HR: h
-    DAY: j
-    WK: s
-    MO: m
-    YR: a
-    DEC: d
-    SECOND_PLURAL: secondes
-    MINUTE_PLURAL: minutes
-    HOUR_PLURAL: heures
-    DAY_PLURAL: jours
-    WEEK_PLURAL: semaines
-    MONTH_PLURAL: mois
-    YEAR_PLURAL: années
-    DECADE_PLURAL: décennies
-    SEC_PLURAL: s
-    MIN_PLURAL: m
-    HR_PLURAL: h
-    DAY_PLURAL: j
-    WK_PLURAL: s
-    MO_PLURAL: m
-    YR_PLURAL: a
-    DEC_PLURAL: d
+  NO_DATE_PROVIDED: Aucune date fournie
+  BAD_DATE: Date erronée
+  AGO: plus tôt
+  FROM_NOW: à partir de maintenant
+  SECOND: seconde
+  MINUTE: minute
+  HOUR: heure
+  DAY: jour
+  WEEK: semaine
+  MONTH: mois
+  YEAR: année
+  DECADE: décennie
+  SEC: s
+  MIN: m
+  HR: h
+  WK: sem
+  MO: m
+  YR: an
+  DEC: déc
+  SECOND_PLURAL: secondes
+  MINUTE_PLURAL: minutes
+  HOUR_PLURAL: heures
+  DAY_PLURAL: jours
+  WEEK_PLURAL: semaines
+  MONTH_PLURAL: mois
+  YEAR_PLURAL: années
+  DECADE_PLURAL: décennies
+  SEC_PLURAL: s
+  MIN_PLURAL: m
+  HR_PLURAL: h
+  WK_PLURAL: sem
+  MO_PLURAL: mois
+  YR_PLURAL: a
+  DEC_PLURAL: décs
 FORM:
-    VALIDATION_FAIL: <b>La validation a échoué :</b>
-    INVALID_INPUT: Saisie non valide
-    MISSING_REQUIRED_FIELD: Champ obligatoire manquant :
+  VALIDATION_FAIL: '<b>La validation a échoué :</b>'
+  INVALID_INPUT: Saisie non valide
+  MISSING_REQUIRED_FIELD: 'Champ obligatoire manquant :'
+MONTHS_OF_THE_YEAR:
+  - Janvier
+  - Février
+  - Mars
+  - Avril
+  - Mai
+  - Juin
+  - Juillet
+  - Août
+  - Septembre
+  - Octobre
+  - Novembre
+  - Décembre
+DAYS_OF_THE_WEEK:
+  - Lundi
+  - Mardi
+  - Mercredi
+  - Jeudi
+  - Vendredi
+  - Samedi
+  - Dimanche

system/languages/hr.yaml

@@ -1,52 +1,75 @@
+---
+INFLECTOR_UNCOUNTABLE:
+  - oprema
+  - informacije
+  - riža
+  - novac
+  - vrsta
+  - serija
+  - riba
+  - ovca
 INFLECTOR_IRREGULAR:
-    'person': 'Osoba'
-    'man': 'Čovjek'
-    'child': 'Dijete'
-    'sex': 'Spol'
-    'move': 'Pomakni'
+  person: osobe
+  man: ljudi
+  child: djeca
+  sex: spolovi
+  move: Pomakni
 NICETIME:
-    NO_DATE_PROVIDED: Datum nije upisan
-    BAD_DATE: Pogrešan datum
-    AGO: prije
-    FROM_NOW: od sad
-    SECOND: sekundi
-    MINUTE: minuta
-    HOUR: godina
-    DAY: dan
-    WEEK: tjedan
-    MONTH: mjesec
-    YEAR: godina
-    DECADE: desetljeće
-    SEC: sek
-    MIN: min
-    HR: sat
-    DAY: dan
-    WK: t
-    MO: m
-    YR: g
-    DEC: des
-    SECOND_PLURAL: sekundi
-    SECOND_PLURAL_MORE_THAN_TWO: sekunde
-    MINUTE_PLURAL: minuta
-    MINUTE_PLURAL_MORE_THAN_TWO: minute
-    HOUR_PLURAL: sati
-    HOUR_PLURAL_MORE_THAN_TWO: sata
-    DAY_PLURAL: dana
-    WEEK_PLURAL: tjedana
-    WEEK_PLURAL_MORE_THAN_TWO: tjedna
-    MONTH_PLURAL: mjeseci
-    MONTH_PLURAL_MORE_THAN_TWO: mjeseca
-    YEAR_PLURAL: godina
-    YEAR_PLURAL_MORE_THAN_TWO: godine
-    DECADE_PLURAL: desetljeća
-    SEC_PLURAL: sek
-    MIN_PLURAL: min
-    HR_PLURAL: sat
-    DAY_PLURAL: dan
-    WK_PLURAL: t
-    MO_PLURAL: m
-    YR_PLURAL: g
-    DEC_PLURAL: des
+  NO_DATE_PROVIDED: Datum nije upisan
+  BAD_DATE: Pogrešan datum
+  AGO: prije
+  FROM_NOW: od sada
+  SECOND: sekunda
+  MINUTE: minuta
+  HOUR: sat
+  DAY: dan
+  WEEK: tjedan
+  MONTH: mjesec
+  YEAR: godina
+  DECADE: desetljeće
+  SEC: sek
+  HR: sat
+  WK: t
+  MO: m
+  YR: g
+  DEC: des
+  SECOND_PLURAL: sekundi
+  MINUTE_PLURAL: minuta
+  HOUR_PLURAL: sati
+  DAY_PLURAL: dan
+  WEEK_PLURAL: tjedana
+  MONTH_PLURAL: mjeseci
+  YEAR_PLURAL: godina
+  DECADE_PLURAL: desetljeća
+  SEC_PLURAL: sek
+  MIN_PLURAL: min
+  HR_PLURAL: sat
+  WK_PLURAL: t
+  MO_PLURAL: m
+  YR_PLURAL: g
+  DEC_PLURAL: des
 FORM:
-    VALIDATION_FAIL: <b>Validacija nije uspjela:</b>
-    INVALID_INPUT: Unos nije valjan
+  VALIDATION_FAIL: '<b>Validacija nije uspjela:</b>'
+  INVALID_INPUT: Pogrešan unos u
+  MISSING_REQUIRED_FIELD: 'Nedostaje obavezno polje:'
+MONTHS_OF_THE_YEAR:
+  - Siječanj
+  - Veljača
+  - Ožujak
+  - Travanj
+  - Svibanj
+  - Lipanj
+  - Srpanj
+  - Kolovoz
+  - Rujan
+  - Listopad
+  - Studeni
+  - Prosinac
+DAYS_OF_THE_WEEK:
+  - Ponedjeljak
+  - Utorak
+  - Srijeda
+  - Četvrtak
+  - Petak
+  - Subota
+  - Nedjelja

system/languages/hu.yaml

@@ -1,53 +1,138 @@
-FRONTMATTER_ERROR_PAGE: "---\ncím: %1$s\n---\n\n# Hiba: Érvénytelen Frontmatter\n\nElérési út: `%2$s`\n\n**%3$s**\n\n```\n%4$s\n```"
+---
+FRONTMATTER_ERROR_PAGE: |
+  ---
+  cím: %1$s
+  ---
+  
+  # Hiba: Érvénytelen Frontmatter
+  
+  Elérési út: `%2$s`
+  
+  **%3$s**
+  
+  ```
+  %4$s
+  ```
+INFLECTOR_PLURALS:
+  /(quiz)$/i: '\1zes'
+  /^(ox)$/i: '\1en'
+  "/([m|l])ouse$/i": '\1ice'
+  /(matr|vert|ind)ix|ex$/i: '\1ices'
+  /(x|ch|ss|sh)$/i: '\1es'
+  "/([^aeiouy]|qu)ies$/i": '\1y'
+  "/([^aeiouy]|qu)y$/i": '\1ies'
+  /(hive)$/i: '\1s'
+  "/(?:([^f])fe|([lr])f)$/i": '\1\2ves'
+  /sis$/i: ses
+  "/([ti])um$/i": '\1a'
+  /(buffal|tomat)o$/i: '\1oes'
+  /(bu)s$/i: '\1ses'
+  /(alias|status)/i: '\1es'
+  /(octop|vir)us$/i: '\1i'
+  /(ax|test)is$/i: '\1es'
+  /s$/i: s
+  /$/: s
+INFLECTOR_SINGULAR:
+  /(quiz)zes$/i: '\1'
+  /(matr)ices$/i: '\1ix'
+  /(vert|ind)ices$/i: '\1ex'
+  /^(ox)en/i: '\1'
+  /(alias|status)es$/i: '\1'
+  "/([octop|vir])i$/i": '\1us'
+  /(cris|ax|test)es$/i: '\1is'
+  /(shoe)s$/i: '\1'
+  /(o)es$/i: '\1'
+  /(bus)es$/i: '\1'
+  "/([m|l])ice$/i": '\1ouse'
+  /(x|ch|ss|sh)es$/i: '\1'
+  /(m)ovies$/i: '\1ovie'
+  /(s)eries$/i: '\1eries'
+  "/([^aeiouy]|qu)ies$/i": '\1y'
+  "/([lr])ves$/i": '\1f'
+  /(tive)s$/i: '\1'
+  /(hive)s$/i: '\1'
+  "/([^f])ves$/i": '\1fe'
+  /(^analy)ses$/i: '\1sis'
+  /((a)naly|(b)a|(d)iagno|(p)arenthe|(p)rogno|(s)ynop|(t)he)ses$/i: '\1\2sis'
+  "/([ti])a$/i": '\1um'
+  /(n)ews$/i: '\1ews'
+INFLECTOR_UNCOUNTABLE:
+  - felszerelés
+  - információ
+  - rizs
+  - pénz
+  - fajok
+  - sorozat
+  - hal
+  - juh
 INFLECTOR_IRREGULAR:
-    'person': 'személyek'
-    'man': 'férfiak'
-    'child': 'gyerekek'
-    'sex': 'nemek'
-    'move': 'lépések'
+  person: személyek
+  man: férfiak
+  child: gyerekek
+  sex: nemek
+  move: lépések
 INFLECTOR_ORDINALS:
-    'default': '.'
-    'first': '.'
-    'second': '.'
-    'third': '.'
+  default: '.'
+  first: '.'
+  second: '.'
+  third: '.'
 NICETIME:
-    NO_DATE_PROVIDED: Nincs dátum megadva
-    BAD_DATE: Hibás dátum
-    AGO: elteltével
-    FROM_NOW: mostantól
-    SECOND: másodperc
-    MINUTE: perc
-    HOUR: óra
-    DAY: nap
-    WEEK: hét
-    MONTH: hónap
-    YEAR: év
-    DECADE: évtized
-    SEC: mp
-    MIN: p
-    HR: ó
-    DAY: nap
-    WK: hét
-    MO: hó
-    YR: év
-    DEC: évt
-    SECOND_PLURAL: másodperc
-    MINUTE_PLURAL: perc
-    HOUR_PLURAL: óra
-    DAY_PLURAL: nap
-    WEEK_PLURAL: hét
-    MONTH_PLURAL: hónap
-    YEAR_PLURAL: év
-    DECADE_PLURAL: évtized
-    SEC_PLURAL: mp
-    MIN_PLURAL: perc
-    HR_PLURAL: ó
-    DAY_PLURAL: nap
-    WK_PLURAL: hét
-    MO_PLURAL: hó
-    YR_PLURAL: év
-    DEC_PLURAL: évt
+  NO_DATE_PROVIDED: Nincs dátum megadva
+  BAD_DATE: Hibás dátum
+  AGO: elteltével
+  FROM_NOW: mostantól
+  SECOND: másodperc
+  MINUTE: perc
+  HOUR: óra
+  DAY: nap
+  WEEK: hét
+  MONTH: hónap
+  YEAR: év
+  DECADE: évtized
+  SEC: mp
+  MIN: p
+  HR: ó
+  WK: hét
+  MO: hó
+  YR: év
+  DEC: évt
+  SECOND_PLURAL: másodperc
+  MINUTE_PLURAL: perc
+  HOUR_PLURAL: óra
+  DAY_PLURAL: nap
+  WEEK_PLURAL: hét
+  MONTH_PLURAL: hónap
+  YEAR_PLURAL: év
+  DECADE_PLURAL: évtized
+  SEC_PLURAL: mp
+  MIN_PLURAL: perc
+  HR_PLURAL: ó
+  WK_PLURAL: hét
+  MO_PLURAL: hó
+  YR_PLURAL: év
+  DEC_PLURAL: évt
 FORM:
-    VALIDATION_FAIL: <b>A validáció hibát talált:</b>
-    INVALID_INPUT: Az itt megadott érték érvénytelen:
-    MISSING_REQUIRED_FIELD: Ez a kötelező mező nincs kitöltve:
+  VALIDATION_FAIL: '<b>A validáció hibát talált:</b>'
+  INVALID_INPUT: 'Az itt megadott érték érvénytelen:'
+  MISSING_REQUIRED_FIELD: 'Ez a kötelező mező nincs kitöltve:'
+MONTHS_OF_THE_YEAR:
+  - január
+  - február
+  - március
+  - április
+  - május
+  - június
+  - július
+  - augusztus
+  - szeptember
+  - október
+  - november
+  - december
+DAYS_OF_THE_WEEK:
+  - hétfő
+  - kedd
+  - szerda
+  - csütörtök
+  - péntek
+  - szombat
+  - vasárnap

system/languages/it.yaml

@@ -1,25 +1,62 @@
+---
+FRONTMATTER_ERROR_PAGE: "---Titolo: %1$s---# Errore: Frontmatter non valido: '%2$s' * *%3$s * * ' '%4$s ' '"
 NICETIME:
-    NO_DATE_PROVIDED: Nessuna data fornita
-    BAD_DATE: Data errata
-    AGO: fa
-    FROM_NOW: da adesso
-    SECOND: secondo
-    MINUTE: minuto
-    HOUR: ora
-    DAY: giorno
-    WEEK: settimana
-    MONTH: mese
-    YEAR: anno
-    DECADE: decade
-    SECOND_PLURAL: secondi
-    MINUTE_PLURAL: minuti
-    HOUR_PLURAL: ore
-    DAY_PLURAL: giorni
-    WEEK_PLURAL: settimane
-    MONTH_PLURAL: mesi
-    YEAR_PLURAL: anni
-    DECADE_PLURAL: decadi
+  NO_DATE_PROVIDED: Nessuna data fornita
+  BAD_DATE: Data non valida
+  AGO: fa
+  FROM_NOW: da adesso
+  SECOND: secondo
+  MINUTE: minuto
+  HOUR: ora
+  DAY: giorno
+  WEEK: settimana
+  MONTH: mese
+  YEAR: anno
+  DECADE: decennio
+  SEC: sec
+  MIN: min
+  HR: ora
+  WK: settimana
+  MO: mese
+  YR: anno
+  DEC: decennio
+  SECOND_PLURAL: secondi
+  MINUTE_PLURAL: minuti
+  HOUR_PLURAL: ore
+  DAY_PLURAL: giorni
+  WEEK_PLURAL: settimane
+  MONTH_PLURAL: mesi
+  YEAR_PLURAL: anni
+  DECADE_PLURAL: decadi
+  SEC_PLURAL: secondi
+  MIN_PLURAL: minuti
+  HR_PLURAL: ore
+  WK_PLURAL: settimane
+  MO_PLURAL: mesi
+  YR_PLURAL: anni
+  DEC_PLURAL: decenni
 FORM:
-    VALIDATION_FAIL: <b>Validazione fallita:</b>
-    INVALID_INPUT: Input invalido in
-    MISSING_REQUIRED_FIELD: Campo richiesto mancante:
+  VALIDATION_FAIL: '<b>Validazione fallita:</b>'
+  INVALID_INPUT: Input non valido in
+  MISSING_REQUIRED_FIELD: 'Campo richiesto mancante:'
+MONTHS_OF_THE_YEAR:
+  - Gennaio
+  - Febbraio
+  - Marzo
+  - Aprile
+  - Maggio
+  - Giugno
+  - Luglio
+  - Agosto
+  - Settembre
+  - Ottobre
+  - Novembre
+  - Dicembre
+DAYS_OF_THE_WEEK:
+  - Lunedì
+  - Martedì
+  - Mercoledì
+  - Giovedì
+  - Venerdì
+  - Sabato
+  - Domenica

system/languages/ja.yaml

@@ -0,0 +1,59 @@
+FRONTMATTER_ERROR_PAGE: "---\ntitle: %1$s\n---\n\n# Error: Invalid Frontmatter\n\nPath: `%2$s`\n\n**%3$s**\n\n```\n%4$s\n```"
+INFLECTOR_PLURALS: []
+
+INFLECTOR_SINGULAR: []
+
+INFLECTOR_UNCOUNTABLE: []
+
+INFLECTOR_IRREGULAR:
+    'person': 'みんな'
+    'man': '人'
+    'child': '子供'
+    'sex': '性別'
+    'move': '移動'
+    
+INFLECTOR_ORDINALS: []
+
+NICETIME:
+    NO_DATE_PROVIDED: 日付が設定されていません
+    BAD_DATE: 不正な日付
+    AGO: 前
+    FROM_NOW: from now
+    SECOND: 秒
+    MINUTE: 分
+    HOUR: 時
+    DAY: 日
+    WEEK: 週
+    MONTH: 月
+    YEAR: 年
+    DECADE: 10年
+    SEC: 秒
+    MIN: 分
+    HR: 時
+    DAY: 日
+    WK: 週
+    MO: 月
+    YR: 年
+    DEC: dec
+    SECOND_PLURAL: 秒
+    MINUTE_PLURAL: 分
+    HOUR_PLURAL: 時
+    DAY_PLURAL: 日
+    WEEK_PLURAL: 週
+    MONTH_PLURAL: 月
+    YEAR_PLURAL: 年
+    DECADE_PLURAL: 10年
+    SEC_PLURAL: 秒
+    MIN_PLURAL: 分
+    HR_PLURAL: 時
+    DAY_PLURAL: 日
+    WK_PLURAL: 週
+    MO_PLURAL: 月
+    YR_PLURAL: 年
+    DEC_PLURAL: 10年
+FORM:
+    VALIDATION_FAIL: <b>バリデーション失敗 :</b>
+    INVALID_INPUT: 不正な入力：
+    MISSING_REQUIRED_FIELD: 必須項目が入力されていません:
+MONTHS_OF_THE_YEAR: ['1月', '2月', '3月', '4月', '5月', '6月', '7月', '8月', '9月', '10月', '11月', '12月']
+DAYS_OF_THE_WEEK: ['月', '火', '水', '木', '金', '土', '日']

system/languages/lt.yaml

@@ -0,0 +1,69 @@
+---
+INFLECTOR_UNCOUNTABLE:
+  2: ryžiai
+  3: pinigai
+  4: prieskoniai
+  5: serijos
+  6: žuvis
+  7: avis
+INFLECTOR_IRREGULAR:
+  person: žmonės
+  man: žmogus
+  child: vaikai
+  sex: lytys
+  move: juda
+NICETIME:
+  NO_DATE_PROVIDED: Nenurodyta data
+  BAD_DATE: Neteisinga data
+  AGO: prieš
+  FROM_NOW: nuo dabar
+  SECOND: sekundė
+  MINUTE: minutė
+  HOUR: valanda
+  DAY: diena
+  WEEK: savaitė
+  MONTH: mėnuo
+  YEAR: metai
+  DECADE: dešimtmetis
+  SEC: sek
+  MIN: min
+  HR: val
+  WK: sav
+  MO: mėn
+  YR: m
+  MINUTE_PLURAL: minutės
+  HOUR_PLURAL: valandos
+  DAY_PLURAL: dienos
+  WEEK_PLURAL: savaitės
+  MONTH_PLURAL: mėnesiai
+  YEAR_PLURAL: metai
+  DECADE_PLURAL: dešimtmečiai
+  SEC_PLURAL: sek
+  MIN_PLURAL: min
+  HR_PLURAL: val
+  WK_PLURAL: sav
+  MO_PLURAL: mėn
+  YR_PLURAL: m
+FORM:
+  MISSING_REQUIRED_FIELD: 'Būtina užpildyti laukelį:'
+MONTHS_OF_THE_YEAR:
+  - Sausis
+  - Vasaris
+  - Kovas
+  - Balandis
+  - Gegužė
+  - Birželis
+  - Liepa
+  - Rugpjūtis
+  - Rugsėjis
+  - Spalis
+  - Lakpritis
+  - Gruodis
+DAYS_OF_THE_WEEK:
+  - Pirmadienis
+  - Antradienis
+  - Trečiadienis
+  - Ketvirtadienis
+  - Penktadienis
+  - Šeštadienis
+  - Sekmadienis

system/languages/nb.yaml

@@ -0,0 +1,2 @@
+MONTHS_OF_THE_YEAR: ['januar', 'februar', 'mars', 'april', 'mai', 'juni', 'juli', 'august', 'september', 'oktober', 'november', 'desember']
+DAYS_OF_THE_WEEK: ['mandag', 'tirsdag', 'onsdag', 'torsdag', 'fredag', 'lørdag', 'søndag']

system/languages/nl.yaml

@@ -1,43 +1,64 @@
+---
 INFLECTOR_IRREGULAR:
-    'person': 'personen'
-    'man': 'mensen'
-    'child': 'kinderen'
-    'sex': 'geslacht'
-    'move': 'verplaatsen'
+  person: personen
+  man: mensen
+  child: kinderen
+  sex: geslacht
+  move: verplaatsen
 NICETIME:
-    NO_DATE_PROVIDED: geen datum opgegeven
-    BAD_DATE: Datumformaat onjuist
-    AGO: geleden
-    FROM_NOW: vanaf nu
-    SECOND: seconde
-    MINUTE: minuut
-    HOUR: uur
-    DAY: dag
-    WEEK: week
-    MONTH: maand
-    YEAR: jaar
-    DECADE: decenium
-    SEC: sec
-    MIN: min
-    HR: hr
-    DAY: dag
-    WK: wk
-    MO: ma
-    YR: yr
-    DEC: dec
-    SECOND_PLURAL: seconden
-    MINUTE_PLURAL: minuten
-    HOUR_PLURAL: uren
-    DAY_PLURAL: dagen
-    WEEK_PLURAL: weken
-    MONTH_PLURAL: maanden
-    YEAR_PLURAL: jaren
-    DECADE_PLURAL: decennia
-    SEC_PLURAL: seconden
-    MIN_PLURAL: minuten
-    HR_PLURAL: uren
-    DAY_PLURAL: dagen
-    WK_PLURAL: weken
-    MO_PLURAL: maanden
-    YR_PLURAL: jaren
-    DEC_PLURAL: decs
+  NO_DATE_PROVIDED: geen datum opgegeven
+  BAD_DATE: Datumformaat onjuist
+  AGO: geleden
+  FROM_NOW: vanaf nu
+  SECOND: seconde
+  MINUTE: minuut
+  HOUR: uur
+  DAY: dag
+  WEEK: week
+  MONTH: maand
+  YEAR: jaar
+  DECADE: decenium
+  SEC: s
+  MIN: min
+  HR: u
+  MO: ma
+  YR: j
+  SECOND_PLURAL: seconden
+  MINUTE_PLURAL: minuten
+  HOUR_PLURAL: uren
+  DAY_PLURAL: dagen
+  WEEK_PLURAL: weken
+  MONTH_PLURAL: maanden
+  YEAR_PLURAL: jaren
+  DECADE_PLURAL: decennia
+  SEC_PLURAL: seconden
+  MIN_PLURAL: minuten
+  HR_PLURAL: uren
+  WK_PLURAL: weken
+  MO_PLURAL: maanden
+  YR_PLURAL: jaren
+FORM:
+  VALIDATION_FAIL: '<b>Validatie mislukt:</b>'
+  INVALID_INPUT: Ongeldige invoer in
+  MISSING_REQUIRED_FIELD: 'Verplicht veld ontbreekt:'
+MONTHS_OF_THE_YEAR:
+  - Januari
+  - Februari
+  - Maart
+  - april
+  - Mei
+  - Juni
+  - Juli
+  - Augustus
+  - september
+  - Oktober
+  - november
+  - december
+DAYS_OF_THE_WEEK:
+  - Maandag
+  - Dinsdag
+  - Woensdag
+  - Donderdag
+  - Vrijdag
+  - Zaterdag
+  - Zondag

system/languages/no.yaml

@@ -0,0 +1,93 @@
+---
+FRONTMATTER_ERROR_PAGE: |
+  ---
+  Tittel: %1$s
+  ---
+  
+  # Feilmelding: Ugyldig Frontmatter
+  
+  Pane: '%2$s'
+  
+  **%3$s **
+  
+  ```
+  %4$s
+  ```
+INFLECTOR_PLURALS:
+  /(quiz)$/i: '\1zes'
+  /^(ox)$/i: '\1en'
+INFLECTOR_UNCOUNTABLE:
+  - utstyr
+  - informasjon
+  - ris
+  - penger
+  - arter
+  - serier
+  - fisk
+  - sau
+INFLECTOR_IRREGULAR:
+  person: folk
+  man: menn
+  child: barn
+  sex: kjønn
+  move: trekk
+NICETIME:
+  NO_DATE_PROVIDED: Ingen dato gitt
+  BAD_DATE: Dårlig dato
+  AGO: siden
+  FROM_NOW: fra nå
+  SECOND: sekund
+  MINUTE: minutt
+  HOUR: time
+  DAY: dag
+  WEEK: uke
+  MONTH: måned
+  YEAR: år
+  DECADE: tiår
+  SEC: sek
+  MIN: min
+  HR: t
+  WK: uke
+  MO: må
+  YR: år
+  DEC: des
+  SECOND_PLURAL: sekunder
+  MINUTE_PLURAL: minutter
+  HOUR_PLURAL: timer
+  DAY_PLURAL: dager
+  WEEK_PLURAL: uker
+  MONTH_PLURAL: måneder
+  YEAR_PLURAL: år
+  DECADE_PLURAL: tiår
+  SEC_PLURAL: sek
+  MIN_PLURAL: min
+  HR_PLURAL: timer
+  WK_PLURAL: uker
+  MO_PLURAL: mdr
+  YR_PLURAL: år
+  DEC_PLURAL: årtier
+FORM:
+  VALIDATION_FAIL: '<b>Validering mislyktes:</b>'
+  INVALID_INPUT: Ugyldig innhold i
+  MISSING_REQUIRED_FIELD: 'Mangler påkrevd felt:'
+MONTHS_OF_THE_YEAR:
+  - januar
+  - februar
+  - mars
+  - april
+  - mai
+  - juni
+  - juli
+  - august
+  - september
+  - oktober
+  - november
+  - desember
+DAYS_OF_THE_WEEK:
+  - mandag
+  - tirsdag
+  - onsdag
+  - torsdag
+  - fredag
+  - lørdag
+  - søndag

system/languages/pl.yaml

@@ -0,0 +1,75 @@
+---
+FRONTMATTER_ERROR_PAGE: |
+  ---
+  title: %1$s
+  ---
+  
+  # Error: Nieprawidłowy Frontmatter
+  
+  Path: `%2$s`
+  
+  **%3$s**
+  
+  ```
+  %4$s
+  ```
+NICETIME:
+  NO_DATE_PROVIDED: Nie podano daty
+  BAD_DATE: Zła data
+  AGO: temu
+  FROM_NOW: od teraz
+  SECOND: sekunda
+  MINUTE: minuta
+  HOUR: godzina
+  DAY: dzień
+  WEEK: tydzień
+  MONTH: miesiąc
+  YEAR: rok
+  DECADE: dekada
+  SEC: sek
+  MIN: min
+  HR: godz
+  WK: tydz
+  MO: m-c
+  YR: rok
+  DEC: dekada
+  SECOND_PLURAL: sekund
+  MINUTE_PLURAL: minut
+  HOUR_PLURAL: godzin
+  DAY_PLURAL: dni
+  WEEK_PLURAL: tygodnie
+  MONTH_PLURAL: miesięcy
+  YEAR_PLURAL: lat
+  DECADE_PLURAL: dekad
+  SEC_PLURAL: sek
+  MIN_PLURAL: min
+  HR_PLURAL: godz
+  WK_PLURAL: tyg
+  MO_PLURAL: m-ce
+  YR_PLURAL: lat
+  DEC_PLURAL: dekad
+FORM:
+  VALIDATION_FAIL: '<b>Weryfikacja nie powiodła się:</b>'
+  INVALID_INPUT: Nieprawidłowe dane wejściowe
+  MISSING_REQUIRED_FIELD: 'Opuszczono wymagane pole:'
+MONTHS_OF_THE_YEAR:
+  - Styczeń
+  - Luty
+  - Marzec
+  - Kwiecień
+  - Maj
+  - Czerwiec
+  - Lipiec
+  - Sierpień
+  - Wrzesień
+  - Październik
+  - Listopad
+  - Grudzień
+DAYS_OF_THE_WEEK:
+  - Poniedziałek
+  - Wtorek
+  - Środa
+  - Czwartek
+  - Piątek
+  - Sobota
+  - Niedziela

system/languages/pt.yaml

@@ -0,0 +1,79 @@
+---
+FRONTMATTER_ERROR_PAGE: |
+  ---
+  título: %1$s
+  ---
+  
+  # Erro: Frontmatter inválida
+  
+  Caminho: `%2$s`
+  
+  **%3$s**
+  
+  ```
+  %4$s
+  ```
+INFLECTOR_UNCOUNTABLE:
+  1: informação
+  2: arroz
+  3: dinheiro
+INFLECTOR_IRREGULAR:
+  man: homens
+  sex: sexos
+NICETIME:
+  NO_DATE_PROVIDED: Não foi fornecida data
+  BAD_DATE: Data inválida
+  AGO: atrás
+  FROM_NOW: a partir de agora
+  SECOND: segundo
+  MINUTE: minuto
+  HOUR: hora
+  DAY: dia
+  WEEK: semana
+  MONTH: mês
+  YEAR: ano
+  DECADE: década
+  SEC: seg
+  MIN: mín
+  HR: h
+  WK: sem
+  MO: m
+  YR: a
+  DEC: dec
+  SECOND_PLURAL: segundos
+  MINUTE_PLURAL: minutos
+  HOUR_PLURAL: horas
+  DAY_PLURAL: dias
+  WEEK_PLURAL: semanas
+  MONTH_PLURAL: meses
+  YEAR_PLURAL: anos
+  DECADE_PLURAL: décadas
+  SEC_PLURAL: seg
+  MIN_PLURAL: mins
+  HR_PLURAL: hrs
+  WK_PLURAL: sems
+  YR_PLURAL: anos
+FORM:
+  VALIDATION_FAIL: '<b>Validação falhada: </b>'
+  MISSING_REQUIRED_FIELD: 'Campo obrigatório ausente:'
+MONTHS_OF_THE_YEAR:
+  - Janeiro
+  - Fevereiro
+  - Março
+  - Abril
+  - Maio
+  - Junho
+  - Julho
+  - Agosto
+  - Setembro
+  - Outubro
+  - Novembro
+  - Dezembro
+DAYS_OF_THE_WEEK:
+  - Segunda
+  - Terça
+  - Quarta
+  - Quinta
+  - Sexta
+  - Sábado
+  - Domingo

system/languages/ro.yaml

@@ -0,0 +1,101 @@
+---
+FRONTMATTER_ERROR_PAGE: |
+  ---
+  Titlu: %1$s
+  ---
+  # Eroare: Frontmatter este invalid
+  
+  Calea: `%2$s`
+  
+  **%3$s**
+  
+  ```
+  %4$s
+INFLECTOR_PLURALS:
+  /(quiz)$/i: '\1zes'
+  /^(ox)$/i: '\1en'
+  "/([m|l])ouse$/i": '\1ice'
+  /(matr|vert|ind)ix|ex$/i: '\1ices'
+  /(x|ch|ss|sh)$/i: '\1es'
+  "/([^aeiouy]|qu)ies$/i": '\1y'
+  "/([^aeiouy]|qu)y$/i": '\1ies'
+  /(hive)$/i: '\1s'
+  "/(?:([^f])fe|([lr])f)$/i": '\1\2ves'
+  /sis$/i: ses
+  "/([ti])um$/i": '\1a'
+  /(buffal|tomat)o$/i: '\1oes'
+INFLECTOR_UNCOUNTABLE:
+  - echipament
+  - informaţie
+  - orez
+  - bani
+  - specii
+  - serii
+  - peşte
+  - oaie
+INFLECTOR_IRREGULAR:
+  person: persoane
+  man: bărbați
+  child: copii
+  sex: sexe
+  move: mutări
+NICETIME:
+  NO_DATE_PROVIDED: Nu există o dată prevăzută
+  BAD_DATE: Dată incorectă
+  AGO: în urmă
+  FROM_NOW: de acum
+  SECOND: secundă
+  MINUTE: minut
+  HOUR: oră
+  DAY: zi
+  WEEK: săptămână
+  MONTH: lună
+  YEAR: an
+  DECADE: decadă
+  SEC: sec
+  MIN: min
+  HR: oră
+  WK: săpt
+  MO: lună
+  YR: an
+  DEC: decadă
+  SECOND_PLURAL: secunde
+  MINUTE_PLURAL: minute
+  HOUR_PLURAL: ore
+  DAY_PLURAL: zile
+  WEEK_PLURAL: săptămâni
+  MONTH_PLURAL: luni
+  YEAR_PLURAL: ani
+  DECADE_PLURAL: decade
+  SEC_PLURAL: sec
+  MIN_PLURAL: min
+  HR_PLURAL: ore
+  WK_PLURAL: săpt
+  MO_PLURAL: luni
+  YR_PLURAL: ani
+  DEC_PLURAL: decenii
+FORM:
+  VALIDATION_FAIL: '<b>Validare nereușită</b>'
+  INVALID_INPUT: Date incorecte în
+  MISSING_REQUIRED_FIELD: 'Câmp obligatoriu lipsă:'
+MONTHS_OF_THE_YEAR:
+  - Ianuarie
+  - Februarie
+  - Martie
+  - Aprilie
+  - Mai
+  - Iunie
+  - Iulie
+  - August
+  - Septembrie
+  - Octombrie
+  - Noiembrie
+  - Decembrie
+DAYS_OF_THE_WEEK:
+  - Luni
+  - Marți
+  - Miercuri
+  - Joi
+  - Vineri
+  - Sâmbătă
+  - Duminică

system/languages/ru.yaml

@@ -1,43 +1,81 @@
+---
+FRONTMATTER_ERROR_PAGE: |
+  ---
+  title: %1$s
+  ---
+  
+  # Ошибка: Недопустимое содержимое
+  
+  Path: `%2$s`
+  
+  **%3$s**
+  
+  ```
+  %4$s
+  ```
 INFLECTOR_IRREGULAR:
-    'person': 'люди'
-    'man': 'человек'
-    'child': 'ребенок'
-    'sex': 'пол'
-    'move': 'движется'
+  person: люди
+  man: человек
+  child: ребенок
+  sex: пол
+  move: движется
 NICETIME:
-    NO_DATE_PROVIDED: Дата не указана
-    BAD_DATE: Неверная дата
-    AGO: назад
-    FROM_NOW: теперь
-    SECOND: секунда
-    MINUTE: минута
-    HOUR: час
-    DAY: день
-    WEEK: неделя
-    MONTH: месяц
-    YEAR: год
-    DECADE: десятилетие
-    SEC: с
-    MIN: мин
-    HR: ч
-    DAY: д
-    WK: нед
-    MO: мес
-    YR: г.
-    DEC: гг.
-    SECOND_PLURAL: секунды
-    MINUTE_PLURAL: минуты
-    HOUR_PLURAL: часы
-    DAY_PLURAL: дни
-    WEEK_PLURAL: недели
-    MONTH_PLURAL: месяцы
-    YEAR_PLURAL: годы
-    DECADE_PLURAL: десятилетия
-    SEC_PLURAL: с
-    MIN_PLURAL: мин
-    HR_PLURAL: ч
-    DAY_PLURAL: д
-    WK_PLURAL: нед
-    MO_PLURAL: мес
-    YR_PLURAL: г.
-    DEC_PLURAL: гг.
+  NO_DATE_PROVIDED: Дата не указана
+  BAD_DATE: Неверная дата
+  AGO: назад
+  FROM_NOW: теперь
+  SECOND: секунда
+  MINUTE: минута
+  HOUR: час
+  DAY: д
+  WEEK: неделя
+  MONTH: месяц
+  YEAR: год
+  DECADE: десятилетие
+  SEC: с
+  MIN: мин
+  HR: ч
+  WK: нед.
+  MO: мес.
+  YR: г.
+  DEC: гг.
+  SECOND_PLURAL: секунды
+  MINUTE_PLURAL: минуты
+  HOUR_PLURAL: часы
+  DAY_PLURAL: д
+  WEEK_PLURAL: недели
+  MONTH_PLURAL: месяцы
+  YEAR_PLURAL: годы
+  DECADE_PLURAL: десятилетия
+  SEC_PLURAL: с
+  MIN_PLURAL: мин
+  HR_PLURAL: ч
+  WK_PLURAL: нед
+  MO_PLURAL: мес
+  YR_PLURAL: г.
+  DEC_PLURAL: гг.
+FORM:
+  VALIDATION_FAIL: '<b>Проверка не удалась:</b>'
+  INVALID_INPUT: Неверный ввод в
+  MISSING_REQUIRED_FIELD: 'Отсутствует необходимое поле:'
+MONTHS_OF_THE_YEAR:
+  - Январь
+  - Февраль
+  - Март
+  - Апрель
+  - Май
+  - Июнь
+  - Июль
+  - Август
+  - Сентябрь
+  - Октябрь
+  - Ноябрь
+  - Декабрь
+DAYS_OF_THE_WEEK:
+  - Понедельник
+  - Вторник
+  - Среда
+  - Четверг
+  - Пятница
+  - Суббота
+  - Воскресенье

system/languages/sk.yaml

@@ -0,0 +1,42 @@
+---
+NICETIME:
+  NO_DATE_PROVIDED: Neposkytnutý žiaden dátum
+  BAD_DATE: Nesprávny dátum
+  AGO: pred
+  FROM_NOW: odteraz
+  SECOND: sekunda
+  MINUTE: minúta
+  HOUR: hodina
+  DAY: deň
+  WEEK: týždeň
+  MONTH: mesiac
+  YEAR: rok
+  DECADE: desaťročie
+  SEC: sek
+  MIN: min
+  HR: hod
+FORM:
+  VALIDATION_FAIL: '<b>Overenie zlyhalo:</b>'
+  INVALID_INPUT: Neplatný vstup v
+  MISSING_REQUIRED_FIELD: 'Chýba vyžadované pole:'
+MONTHS_OF_THE_YEAR:
+  - Január
+  - Február
+  - Marec
+  - Apríl
+  - Máj
+  - Jún
+  - Júl
+  - August
+  - September
+  - Október
+  - November
+  - December
+DAYS_OF_THE_WEEK:
+  - Pondelok
+  - Utorok
+  - Streda
+  - Štvrtok
+  - Piatok
+  - Sobota
+  - Nedeľa

system/languages/sv.yaml

@@ -0,0 +1,62 @@
+---
+FRONTMATTER_ERROR_PAGE: '--- titel: %1$s --- # Fel: Ogiltig Frontmatter-sökväg: `%2$s` **%3$s** ``` %4$s ```'
+NICETIME:
+  NO_DATE_PROVIDED: Inget datum har angivits
+  BAD_DATE: Ogiltigt datum
+  AGO: sedan
+  FROM_NOW: från nu
+  SECOND: sekund
+  MINUTE: minut
+  HOUR: timme
+  DAY: dag
+  WEEK: vecka
+  MONTH: månad
+  YEAR: år
+  DECADE: årtionde
+  SEC: sek
+  MIN: min
+  HR: t
+  WK: v
+  MO: m
+  YR: år
+  DEC: dec
+  SECOND_PLURAL: sekunder
+  MINUTE_PLURAL: minuter
+  HOUR_PLURAL: timmar
+  DAY_PLURAL: dagar
+  WEEK_PLURAL: veckor
+  MONTH_PLURAL: månader
+  YEAR_PLURAL: år
+  DECADE_PLURAL: årtionden
+  SEC_PLURAL: sek
+  MIN_PLURAL: min
+  HR_PLURAL: t
+  WK_PLURAL: v
+  MO_PLURAL: må
+  YR_PLURAL: år
+  DEC_PLURAL: dec
+FORM:
+  VALIDATION_FAIL: '<b>Kontrollen misslyckades:</b>'
+  INVALID_INPUT: Ogiltig indata i
+  MISSING_REQUIRED_FIELD: 'Obligatoriskt fält måste fyllas i:'
+MONTHS_OF_THE_YEAR:
+  - Januari
+  - Februrari
+  - Mars
+  - April
+  - Maj
+  - Juni
+  - Juli
+  - Augusti
+  - September
+  - Oktober
+  - November
+  - December
+DAYS_OF_THE_WEEK:
+  - Måndag
+  - Tisdag
+  - Onsdag
+  - Torsdag
+  - Fredag
+  - Lördag
+  - Söndag

system/languages/th.yaml

@@ -0,0 +1,75 @@
+---
+FRONTMATTER_ERROR_PAGE: |
+  ---
+  ชื่อเรื่อง: %1$s
+  ---
+  
+  # ข้อผิดพลาด: Invalid Frontmatter
+  
+  Path: `%2$s`
+  
+  **%3$s**
+  
+  ```
+  %4$s
+  ```
+NICETIME:
+  NO_DATE_PROVIDED: ไม่มีวันที่ให้
+  BAD_DATE: รูปแบบวันที่ผิด
+  AGO: ที่ผ่านมา
+  FROM_NOW: จากตอนนี้
+  SECOND: วินาที
+  MINUTE: นาที
+  HOUR: ชั่วโมง
+  DAY: วัน
+  WEEK: สัปดาห์
+  MONTH: เดือน
+  YEAR: ปี
+  DECADE: ทศวรรษที่ผ่านมา
+  SEC: วิ
+  MIN: นาที
+  HR: ชม.
+  WK: wk
+  MO: mo
+  YR: yr
+  DEC: dec
+  SECOND_PLURAL: วินาที
+  MINUTE_PLURAL: นาที
+  HOUR_PLURAL: ชั่วโมง
+  DAY_PLURAL: วัน
+  WEEK_PLURAL: สัปดาห์
+  MONTH_PLURAL: เดือน
+  YEAR_PLURAL: ปี
+  DECADE_PLURAL: ทศวรรษที่ผ่านมา
+  SEC_PLURAL: วินาที
+  MIN_PLURAL: นาที
+  HR_PLURAL: ชั่วโมง
+  WK_PLURAL: wks
+  MO_PLURAL: mos
+  YR_PLURAL: ปี
+  DEC_PLURAL: decs
+FORM:
+  VALIDATION_FAIL: '<b>ตรวจสอบล้มเหลว: </b>'
+  INVALID_INPUT: ป้อนข้อมูลไม่ถูกต้องใน
+  MISSING_REQUIRED_FIELD: 'ขาดข้อมูลที่จำเป็น:'
+MONTHS_OF_THE_YEAR:
+  - มกราคม
+  - กุมภาพันธ์
+  - มีนาคม
+  - เมษายน
+  - พฤษภาคม
+  - มิถุนายน
+  - กรกฏาคม
+  - สิงหาคม
+  - กันยายน
+  - ตุลาคม
+  - พฤศจิกายน
+  - ธันวาคม
+DAYS_OF_THE_WEEK:
+  - จันทร์
+  - อังคาร
+  - พุธ
+  - พฤหัสบดี
+  - ศุกร์
+  - เสาร์
+  - อาทิตย์

system/languages/tr.yaml

@@ -1,37 +1,59 @@
+---
 NICETIME:
-    NO_DATE_PROVIDED: Tarih yok
-    BAD_DATE: Yanlış tarih
-    AGO: önce
-    FROM_NOW: (şimdiden)
-    SECOND: saniye
-    MINUTE: dakika
-    HOUR: saat
-    DAY: gün
-    WEEK: hafta
-    MONTH: ay
-    YEAR: yıl
-    DECADE: onyıl
-    SEC: sn
-    MIN: dk
-    HR: sa
-    DAY: gün
-    WK: hft
-    MO: ay
-    YR: yl
-    DEC: onyl
-    SECOND_PLURAL: saniye
-    MINUTE_PLURAL: dakika
-    HOUR_PLURAL: saat
-    DAY_PLURAL: gün
-    WEEK_PLURAL: hafta
-    MONTH_PLURAL: ay
-    YEAR_PLURAL: yıl
-    DECADE_PLURAL: onyıl
-    SEC_PLURAL: sn
-    MIN_PLURAL: dk
-    HR_PLURAL: sa
-    DAY_PLURAL: gün
-    WK_PLURAL: hft
-    MO_PLURAL: ay
-    YR_PLURAL: yl
-    DEC_PLURAL: onyl
+  NO_DATE_PROVIDED: Tarih yok
+  BAD_DATE: Yanlış tarih
+  AGO: önce
+  FROM_NOW: (şimdiden)
+  SECOND: saniye
+  MINUTE: dakika
+  HOUR: saat
+  DAY: gün
+  WEEK: hafta
+  MONTH: ay
+  YEAR: yıl
+  DECADE: onyıl
+  SEC: sn
+  MIN: dk
+  HR: sa
+  WK: hft
+  MO: ay
+  YR: yl
+  DEC: onyl
+  SECOND_PLURAL: saniye
+  MINUTE_PLURAL: dakika
+  HOUR_PLURAL: saat
+  DAY_PLURAL: gün
+  WEEK_PLURAL: hafta
+  MONTH_PLURAL: ay
+  YEAR_PLURAL: yıl
+  DECADE_PLURAL: onyıl
+  SEC_PLURAL: sn
+  MIN_PLURAL: dk
+  HR_PLURAL: sa
+  WK_PLURAL: hft
+  MO_PLURAL: ay
+  YR_PLURAL: yl
+  DEC_PLURAL: onyl
+FORM:
+  VALIDATION_FAIL: '<b>Doğrulama başarısız:</b>'
+MONTHS_OF_THE_YEAR:
+  - Ocak
+  - Şubat
+  - Mart
+  - Nisan
+  - Mayıs
+  - Haziran
+  - Temmuz
+  - Ağustos
+  - Eylül
+  - Ekim
+  - Kasım
+  - Aralık
+DAYS_OF_THE_WEEK:
+  - Pazartesi
+  - Salı
+  - Çarşamba
+  - Perşembe
+  - Cuma
+  - Cumartesi
+  - Pazar

system/languages/uk.yaml

@@ -0,0 +1,75 @@
+---
+FRONTMATTER_ERROR_PAGE: |
+  ---
+  title: %1$s
+  ---
+  
+  # Помилка: Недопустимий вміст
+  
+  Path: `%2$s`
+  
+  **%3$s**
+  
+  ```
+  %4$s
+  ```
+NICETIME:
+  NO_DATE_PROVIDED: Не вказана дата
+  BAD_DATE: Невірна дата
+  AGO: назад
+  FROM_NOW: відтепер
+  SECOND: секунда
+  MINUTE: хвилина
+  HOUR: година
+  DAY: день
+  WEEK: тиждень
+  MONTH: місяць
+  YEAR: рік
+  DECADE: десятиріччя
+  SEC: с
+  MIN: хв
+  HR: год
+  WK: тиж.
+  MO: міс.
+  YR: р.
+  DEC: рр.
+  SECOND_PLURAL: секунди
+  MINUTE_PLURAL: хвилини
+  HOUR_PLURAL: години
+  DAY_PLURAL: дні
+  WEEK_PLURAL: тижні
+  MONTH_PLURAL: місяці
+  YEAR_PLURAL: роки
+  DECADE_PLURAL: десятиріччя
+  SEC_PLURAL: с
+  MIN_PLURAL: хв
+  HR_PLURAL: год
+  WK_PLURAL: тиж.
+  MO_PLURAL: міс.
+  YR_PLURAL: рр.
+  DEC_PLURAL: рр.
+FORM:
+  VALIDATION_FAIL: '<b>Перевірка не вдалася:</b>'
+  INVALID_INPUT: Невірне введення в
+  MISSING_REQUIRED_FIELD: 'Відсутнє необхідне поле:'
+MONTHS_OF_THE_YEAR:
+  - Січень
+  - Лютий
+  - Березень
+  - Квітень
+  - Травень
+  - Червень
+  - Липень
+  - Серпень
+  - Вересень
+  - Жовтень
+  - Листопад
+  - Грудень
+DAYS_OF_THE_WEEK:
+  - Понеділок
+  - Вівторок
+  - Середа
+  - Четвер
+  - "П'ятниця"
+  - Субота
+  - Неділя

system/languages/vi.yaml

@@ -0,0 +1,75 @@
+---
+FRONTMATTER_ERROR_PAGE: |
+  ---
+  title: %1$s
+  ---
+  
+  # Error: Invalid Frontmatter
+  
+  Path: `%2$s`
+  
+  **%3$s**
+  
+  ```
+  %4$s
+  ```
+NICETIME:
+  NO_DATE_PROVIDED: Không có ngày được cung cấp
+  BAD_DATE: Ngày không hợp lệ
+  AGO: cách đây
+  FROM_NOW: từ bây giờ
+  SECOND: giây
+  MINUTE: phút
+  HOUR: giờ
+  DAY: ngày
+  WEEK: tuần
+  MONTH: tháng
+  YEAR: năm
+  DECADE: thập kỷ
+  SEC: giây
+  MIN: phút
+  HR: giờ
+  WK: tuần
+  MO: tháng
+  YR: năm
+  DEC: thập kỷ
+  SECOND_PLURAL: giây
+  MINUTE_PLURAL: phút
+  HOUR_PLURAL: giờ
+  DAY_PLURAL: ngày
+  WEEK_PLURAL: tuần
+  MONTH_PLURAL: tháng
+  YEAR_PLURAL: năm
+  DECADE_PLURAL: thập kỷ
+  SEC_PLURAL: giây
+  MIN_PLURAL: phút
+  HR_PLURAL: giờ
+  WK_PLURAL: tuần
+  MO_PLURAL: tháng
+  YR_PLURAL: năm
+  DEC_PLURAL: thập kỷ
+FORM:
+  VALIDATION_FAIL: '<b>Xác nhận thất bại:</b>'
+  INVALID_INPUT: Dữ liệu nhập không hợp lệ cho
+  MISSING_REQUIRED_FIELD: 'Thiếu trường bắt buộc:'
+MONTHS_OF_THE_YEAR:
+  - Tháng 1
+  - Tháng 2
+  - Tháng 3
+  - Tháng 4
+  - Tháng 5
+  - Tháng 6
+  - Tháng 7
+  - Tháng 8
+  - Tháng 9
+  - Tháng 10
+  - Tháng Mười 11
+  - Tháng 12
+DAYS_OF_THE_WEEK:
+  - Thứ 2
+  - Thứ 3
+  - Thứ 4
+  - Thứ 5
+  - Thứ 6
+  - Thứ 7
+  - Chủ Nhật

system/pages/notfound.md

@@ -0,0 +1,5 @@
+---
+title: Not Found
+routable: false
+notfound: true
+---

system/router.php

@@ -0,0 +1,26 @@
+<?php
+/**
+ * @package    Grav.Core
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+if (PHP_SAPI !== 'cli-server') {
+    exit('This script cannot be run from browser. Run it from a CLI.');
+}
+
+$_SERVER['PHP_CLI_ROUTER'] = true;
+
+if (is_file($_SERVER['DOCUMENT_ROOT'] . DIRECTORY_SEPARATOR . $_SERVER['SCRIPT_NAME'])) {
+    return false;
+}
+
+$_SERVER = array_merge($_SERVER, $_ENV);
+$_SERVER['SCRIPT_FILENAME'] = $_SERVER['DOCUMENT_ROOT'] . DIRECTORY_SEPARATOR . 'index.php';
+$_SERVER['SCRIPT_NAME'] = DIRECTORY_SEPARATOR . 'index.php';
+$_SERVER['PHP_SELF'] = DIRECTORY_SEPARATOR . 'index.php';
+
+require 'index.php';
+
+error_log(sprintf('%s:%d [%d]: %s', $_SERVER['REMOTE_ADDR'], $_SERVER['REMOTE_PORT'], http_response_code(), $_SERVER['REQUEST_URI']), 4);

system/src/Grav/Common/Backup/ZipBackup.php

@@ -1,46 +1,53 @@
 <?php
+/**
+ * @package    Grav.Common.Backup
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 namespace Grav\Common\Backup;
 
-use Grav\Common\GravTrait;
-use Grav\Common\Filesystem\Folder;
+use Grav\Common\Grav;
 use Grav\Common\Inflector;
 
-/**
- * The ZipBackup class lets you create simple zip-backups of a grav site
- *
- * @author RocketTheme
- * @license MIT
- */
 class ZipBackup
 {
-    use GravTrait;
-
     protected static $ignorePaths = [
         'backup',
         'cache',
         'images',
-        'logs'
+        'logs',
+        'tmp'
     ];
 
     protected static $ignoreFolders = [
         '.git',
         '.svn',
         '.hg',
-        '.idea'
+        '.idea',
+        'node_modules'
     ];
 
+    /**
+     * Backup
+     *
+     * @param null          $destination
+     * @param callable|null $messager
+     *
+     * @return null|string
+     */
     public static function backup($destination = null, callable $messager = null)
     {
         if (!$destination) {
-            $destination = self::getGrav()['locator']->findResource('backup://', true);
+            $destination = Grav::instance()['locator']->findResource('backup://', true);
 
-            if (!$destination)
+            if (!$destination) {
                 throw new \RuntimeException('The backup folder is missing.');
-
-            Folder::mkdir($destination);
+            }
         }
 
-        $name = self::getGrav()['config']->get('site.title', basename(GRAV_ROOT));
+        $name = substr(strip_tags(Grav::instance()['config']->get('site.title', basename(GRAV_ROOT))), 0, 20);
 
         $inflector = new Inflector();
 
@@ -64,6 +71,8 @@ class ZipBackup
         $zip = new \ZipArchive();
         $zip->open($destination, \ZipArchive::CREATE);
 
+        $max_execution_time = ini_set('max_execution_time', 600);
+
         static::folderToZip(GRAV_ROOT, $zip, strlen(rtrim(GRAV_ROOT, DS) . DS), $messager);
 
         $messager && $messager([
@@ -85,6 +94,10 @@ class ZipBackup
 
         $zip->close();
 
+        if ($max_execution_time !== false) {
+            ini_set('max_execution_time', $max_execution_time);
+        }
+
         return $destination;
     }
 

system/src/Grav/Common/Browser.php

@@ -1,14 +1,23 @@
 <?php
+/**
+ * @package    Grav.Common
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 namespace Grav\Common;
 
 /**
- * Simple wrapper for the very simple parse_user_agent() function
+ * Internally uses the PhpUserAgent package https://github.com/donatj/PhpUserAgent
  */
 class Browser
 {
-
     protected $useragent = [];
 
+    /**
+     * Browser constructor.
+     */
     public function __construct()
     {
         try {
@@ -18,29 +27,99 @@ class Browser
         }
     }
 
+    /**
+     * Get the current browser identifier
+     *
+     * Currently detected browsers:
+     *
+     * Android Browser
+     * BlackBerry Browser
+     * Camino
+     * Kindle / Silk
+     * Firefox / Iceweasel
+     * Safari
+     * Internet Explorer
+     * IEMobile
+     * Chrome
+     * Opera
+     * Midori
+     * Vivaldi
+     * TizenBrowser
+     * Lynx
+     * Wget
+     * Curl
+     *
+     * @return string the lowercase browser name
+     */
     public function getBrowser()
     {
         return strtolower($this->useragent['browser']);
     }
 
+    /**
+     * Get the current platform identifier
+     *
+     * Currently detected platforms:
+     *
+     * Desktop
+     *   -> Windows
+     *   -> Linux
+     *   -> Macintosh
+     *   -> Chrome OS
+     * Mobile
+     *   -> Android
+     *   -> iPhone
+     *   -> iPad / iPod Touch
+     *   -> Windows Phone OS
+     *   -> Kindle
+     *   -> Kindle Fire
+     *   -> BlackBerry
+     *   -> Playbook
+     *   -> Tizen
+     * Console
+     *   -> Nintendo 3DS
+     *   -> New Nintendo 3DS
+     *   -> Nintendo Wii
+     *   -> Nintendo WiiU
+     *   -> PlayStation 3
+     *   -> PlayStation 4
+     *   -> PlayStation Vita
+     *   -> Xbox 360
+     *   -> Xbox One
+     *
+     * @return string the lowercase platform name
+     */
     public function getPlatform()
     {
         return strtolower($this->useragent['platform']);
     }
 
+    /**
+     * Get the current full version identifier
+     *
+     * @return string the browser full version identifier
+     */
     public function getLongVersion()
     {
         return $this->useragent['version'];
     }
 
+    /**
+     * Get the current major version identifier
+     *
+     * @return string the browser major version identifier
+     */
     public function getVersion()
     {
         $version = explode('.', $this->getLongVersion());
+
         return intval($version[0]);
     }
 
     /**
      * Determine if the request comes from a human, or from a bot/crawler
+     *
+     * @return bool
      */
     public function isHuman()
     {

system/src/Grav/Common/Cache.php

@@ -1,9 +1,17 @@
 <?php
+/**
+ * @package    Grav.Common
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 namespace Grav\Common;
 
-use \Doctrine\Common\Cache\Cache as DoctrineCache;
+use \Doctrine\Common\Cache as DoctrineCache;
 use Grav\Common\Config\Config;
 use Grav\Common\Filesystem\Folder;
+use RocketTheme\Toolbox\Event\Event;
 
 /**
  * The GravCache object is used throughout Grav to store and retrieve cached data.
@@ -15,14 +23,9 @@ use Grav\Common\Filesystem\Folder;
  * MemCache
  * MemCacheD
  * FileSystem
- *
- * @author RocketTheme
- * @license MIT
  */
 class Cache extends Getters
 {
-    use GravTrait;
-
     /**
      * @var string Cache key.
      */
@@ -31,15 +34,18 @@ class Cache extends Getters
     protected $lifetime;
     protected $now;
 
+    /** @var Config $config */
     protected $config;
 
     /**
-     * @var DoctrineCache
+     * @var DoctrineCache\CacheProvider
      */
     protected $driver;
 
     protected $driver_name;
 
+    protected $driver_setting;
+
     /**
      * @var bool
      */
@@ -59,7 +65,8 @@ class Cache extends Getters
     protected static $all_remove = [
         'cache://',
         'cache://images',
-        'asset://'
+        'asset://',
+        'tmp://'
     ];
 
     protected static $assets_remove = [
@@ -74,10 +81,14 @@ class Cache extends Getters
         'cache://'
     ];
 
+    protected static $tmp_remove = [
+        'tmp://'
+    ];
+
     /**
      * Constructor
      *
-     * @params Grav $grav
+     * @param Grav $grav
      */
     public function __construct(Grav $grav)
     {
@@ -88,6 +99,7 @@ class Cache extends Getters
      * Initialization that sets a base key and the driver based on configuration settings
      *
      * @param  Grav $grav
+     *
      * @return void
      */
     public function init(Grav $grav)
@@ -103,19 +115,50 @@ class Cache extends Getters
 
         $prefix = $this->config->get('system.cache.prefix');
 
-        $this->enabled = (bool) $this->config->get('system.cache.enabled');
+        if (is_null($this->enabled)) {
+            $this->enabled = (bool)$this->config->get('system.cache.enabled');
+        }
 
         // Cache key allows us to invalidate all cache on configuration changes.
-        $this->key = ($prefix ? $prefix : 'g') . '-' . substr(md5($uri->rootUrl(true) . $this->config->key() . GRAV_VERSION), 2, 8);
+        $this->key = ($prefix ? $prefix : 'g') . '-' . substr(md5($uri->rootUrl(true) . $this->config->key() . GRAV_VERSION),
+                2, 8);
+
+        $this->driver_setting = $this->config->get('system.cache.driver');
 
         $this->driver = $this->getCacheDriver();
 
         // Set the cache namespace to our unique key
         $this->driver->setNamespace($this->key);
+    }
 
-        // Dump Cache state
-        $grav['debugger']->addMessage('Cache: [' . ($this->enabled ? 'true' : 'false') . '] Driver: [' . $this->driver_name . ']');
+    /**
+     * Public accessor to set the enabled state of the cache
+     *
+     * @param $enabled
+     */
+    public function setEnabled($enabled)
+    {
+        $this->enabled = (bool) $enabled;
+    }
 
+    /**
+     * Returns the current enabled state
+     *
+     * @return bool
+     */
+    public function getEnabled()
+    {
+        return $this->enabled;
+    }
+
+    /**
+     * Get cache state
+     *
+     * @return string
+     */
+    public function getCacheStatus()
+    {
+        return 'Cache: [' . ($this->enabled ? 'true' : 'false') . '] Setting: [' . $this->driver_setting . '] Driver: [' . $this->driver_name . ']';
     }
 
     /**
@@ -123,15 +166,17 @@ class Cache extends Getters
      * If there is no config option for $driver in the config, or it's set to 'auto', it will
      * pick the best option based on which cache extensions are installed.
      *
-     * @return DoctrineCacheDriver  The cache driver to use
+     * @return DoctrineCache\CacheProvider  The cache driver to use
      */
     public function getCacheDriver()
     {
-        $setting = $this->config->get('system.cache.driver');
+        $setting = $this->driver_setting;
         $driver_name = 'file';
 
         if (!$setting || $setting == 'auto') {
-            if (extension_loaded('apc')) {
+            if (extension_loaded('apcu')) {
+                $driver_name = 'apcu';
+            } elseif (extension_loaded('apc')) {
                 $driver_name = 'apc';
             } elseif (extension_loaded('wincache')) {
                 $driver_name = 'wincache';
@@ -146,36 +191,54 @@ class Cache extends Getters
 
         switch ($driver_name) {
             case 'apc':
-                $driver = new \Doctrine\Common\Cache\ApcCache();
+                $driver = new DoctrineCache\ApcCache();
+                break;
+
+            case 'apcu':
+                $driver = new DoctrineCache\ApcuCache();
                 break;
 
             case 'wincache':
-                $driver = new \Doctrine\Common\Cache\WinCacheCache();
+                $driver = new DoctrineCache\WinCacheCache();
                 break;
 
             case 'xcache':
-                $driver = new \Doctrine\Common\Cache\XcacheCache();
+                $driver = new DoctrineCache\XcacheCache();
                 break;
 
             case 'memcache':
                 $memcache = new \Memcache();
-                $memcache->connect($this->config->get('system.cache.memcache.server','localhost'),
-                                   $this->config->get('system.cache.memcache.port', 11211));
-                $driver = new \Doctrine\Common\Cache\MemcacheCache();
+                $memcache->connect($this->config->get('system.cache.memcache.server', 'localhost'),
+                    $this->config->get('system.cache.memcache.port', 11211));
+                $driver = new DoctrineCache\MemcacheCache();
                 $driver->setMemcache($memcache);
                 break;
 
+            case 'memcached':
+                $memcached = new \Memcached();
+                $memcached->addServer($this->config->get('system.cache.memcached.server', 'localhost'),
+                    $this->config->get('system.cache.memcached.port', 11211));
+                $driver = new DoctrineCache\MemcachedCache();
+                $driver->setMemcached($memcached);
+                break;
+
             case 'redis':
                 $redis = new \Redis();
-                $redis->connect($this->config->get('system.cache.redis.server','localhost'),
-                                $this->config->get('system.cache.redis.port', 6379));
+                $socket = $this->config->get('system.cache.redis.socket', false);
 
-                $driver = new \Doctrine\Common\Cache\RedisCache();
+                if ($socket) {
+                    $redis->connect($socket);
+                } else {
+                    $redis->connect($this->config->get('system.cache.redis.server', 'localhost'),
+                    $this->config->get('system.cache.redis.port', 6379));
+                }
+
+                $driver = new DoctrineCache\RedisCache();
                 $driver->setRedis($redis);
                 break;
 
             default:
-                $driver = new \Doctrine\Common\Cache\FilesystemCache($this->cache_dir);
+                $driver = new DoctrineCache\FilesystemCache($this->cache_dir);
                 break;
         }
 
@@ -186,6 +249,7 @@ class Cache extends Getters
      * Gets a cached entry if it exists based on an id. If it does not exist, it returns false
      *
      * @param  string $id the id of the cached entry
+     *
      * @return object     returns the cached entry, can be any type, or false if doesn't exist
      */
     public function fetch($id)
@@ -200,9 +264,9 @@ class Cache extends Getters
     /**
      * Stores a new cached entry.
      *
-     * @param  string $id       the id of the cached entry
+     * @param  string       $id       the id of the cached entry
      * @param  array|object $data     the data for the cached entry to store
-     * @param  int $lifetime    the lifetime to store the entry in seconds
+     * @param  int          $lifetime the lifetime to store the entry in seconds
      */
     public function save($id, $data, $lifetime = null)
     {
@@ -214,6 +278,34 @@ class Cache extends Getters
         }
     }
 
+    /**
+     * Deletes an item in the cache based on the id
+     *
+     * @param string $id    the id of the cached data entry
+     * @return bool         true if the item was deleted successfully
+     */
+    public function delete($id)
+    {
+        if ($this->enabled) {
+            return $this->driver->delete($id);
+        }
+        return false;
+    }
+
+    /**
+     * Returns a boolean state of whether or not the item exists in the cache based on id key
+     *
+     * @param string $id    the id of the cached data entry
+     * @return bool         true if the cached items exists
+     */
+    public function contains($id)
+    {
+        if ($this->enabled) {
+            return $this->driver->contains(($id));
+        }
+        return false;
+    }
+
     /**
      * Getter method to get the cache key
      */
@@ -222,20 +314,29 @@ class Cache extends Getters
         return $this->key;
     }
 
+    /**
+     * Setter method to set key (Advanced)
+     */
+    public function setKey($key)
+    {
+        $this->key = $key;
+        $this->driver->setNamespace($this->key);
+    }
+
     /**
      * Helper method to clear all Grav caches
      *
-     * @param string $remove    standard|all|assets-only|images-only|cache-only
+     * @param string $remove standard|all|assets-only|images-only|cache-only
      *
      * @return array
      */
     public static function clearCache($remove = 'standard')
     {
-        $locator = self::getGrav()['locator'];
+        $locator = Grav::instance()['locator'];
         $output = [];
         $user_config = USER_DIR . 'config/system.yaml';
 
-        switch($remove) {
+        switch ($remove) {
             case 'all':
                 $remove_paths = self::$all_remove;
                 break;
@@ -248,38 +349,47 @@ class Cache extends Getters
             case 'cache-only':
                 $remove_paths = self::$cache_remove;
                 break;
+            case 'tmp-only':
+                $remove_paths = self::$tmp_remove;
+                break;
             default:
                 $remove_paths = self::$standard_remove;
         }
 
+        // Clearing cache event to add paths to clear
+        Grav::instance()->fireEvent('onBeforeCacheClear', new Event(['remove' => $remove, 'paths' => &$remove_paths]));
 
         foreach ($remove_paths as $stream) {
 
             // Convert stream to a real path
-            $path = $locator->findResource($stream, true, true);
-            // Make sure path exists before proceeding, otherwise we would wipe ROOT_DIR
-            if (!$path)
-                throw new \RuntimeException("Stream '{$stream}' not found", 500);
+            try {
+                $path = $locator->findResource($stream, true, true);
 
-            $anything = false;
-            $files = glob($path . '/*');
+                $anything = false;
+                $files = glob($path . '/*');
 
-            if (is_array($files)) {
-                foreach ($files as $file) {
-                    if (is_file($file)) {
-                        if (@unlink($file)) {
-                            $anything = true;
-                        }
-                    } elseif (is_dir($file)) {
-                        if (@Folder::delete($file)) {
-                            $anything = true;
+                if (is_array($files)) {
+                    foreach ($files as $file) {
+                        if (is_link($file)) {
+                            $output[] = '<yellow>Skipping symlink:  </yellow>' . $file;
+                        } elseif (is_file($file)) {
+                            if (@unlink($file)) {
+                                $anything = true;
+                            }
+                        } elseif (is_dir($file)) {
+                            if (Folder::delete($file)) {
+                                $anything = true;
+                            }
                         }
                     }
                 }
-            }
 
-            if ($anything) {
-                $output[] = '<red>Cleared:  </red>' . $path . '/*';
+                if ($anything) {
+                    $output[] = '<red>Cleared:  </red>' . $path . '/*';
+                }
+            } catch (\Exception $e) {
+                // stream not found or another error while deleting files.
+                $output[] = '<red>ERROR: </red>' . $e->getMessage();
             }
         }
 

system/src/Grav/Common/Composer.php

@@ -1,13 +1,13 @@
 <?php
+/**
+ * @package    Grav.Common
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
 
 namespace Grav\Common;
 
-/**
- * Offers composer helper methods.
- *
- * @author  eschmar
- * @license MIT
- */
 class Composer
 {
     /** @const Default composer location */
@@ -35,6 +35,11 @@ class Composer
         return $path;
     }
 
+    /**
+     * Return the composer executable file path
+     *
+     * @return string
+     */
     public static function getComposerExecutor()
     {
         $executor = PHP_BINARY . ' ';

system/src/Grav/Common/Config/CompiledBase.php

@@ -1,11 +1,15 @@
 <?php
+/**
+ * @package    Grav.Common.Config
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 namespace Grav\Common\Config;
 
 use RocketTheme\Toolbox\File\PhpFile;
 
-/**
- * The Compiled base class.
- */
 abstract class CompiledBase
 {
     /**
@@ -193,6 +197,8 @@ abstract class CompiledBase
 
         $this->createObject($cache['data']);
 
+        $this->finalizeObject();
+
         return true;
     }
 
@@ -224,7 +230,7 @@ abstract class CompiledBase
             'timestamp' => time(),
             'checksum' => $this->checksum(),
             'files' => $this->files,
-            'data' => $this->object->toArray()
+            'data' => $this->getState()
         ];
 
         $file->save($cache);
@@ -233,4 +239,9 @@ abstract class CompiledBase
 
         $this->modified();
     }
+
+    protected function getState()
+    {
+        return $this->object->toArray();
+    }
 }

system/src/Grav/Common/Config/CompiledBlueprints.php

@@ -1,24 +1,44 @@
 <?php
+/**
+ * @package    Grav.Common.Config
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
 namespace Grav\Common\Config;
 
-use Grav\Common\File\CompiledYamlFile;
-use RocketTheme\Toolbox\Blueprints\Blueprints;
+use Grav\Common\Data\Blueprint;
+use Grav\Common\Data\BlueprintSchema;
+use Grav\Common\Grav;
 
-/**
- * The Compiled Blueprints class.
- */
 class CompiledBlueprints extends CompiledBase
 {
     /**
      * @var int Version number for the compiled file.
      */
-    public $version = 1;
+    public $version = 2;
 
     /**
-     * @var Blueprints  Blueprints object.
+     * @var BlueprintSchema  Blueprints object.
      */
     protected $object;
 
+    /**
+     * Returns checksum from the configuration files.
+     *
+     * You can set $this->checksum = false to disable this check.
+     *
+     * @return bool|string
+     */
+    public function checksum()
+    {
+        if (!isset($this->checksum)) {
+            $this->checksum = md5(json_encode($this->files) . json_encode($this->getTypes()) . $this->version);
+        }
+
+        return $this->checksum;
+    }
+
     /**
      * Create configuration object.
      *
@@ -26,24 +46,70 @@ class CompiledBlueprints extends CompiledBase
      */
     protected function createObject(array $data = [])
     {
-        $this->object = new Blueprints($data);
+        $this->object = (new BlueprintSchema($data))->setTypes($this->getTypes());
+    }
+
+    /**
+     * Get list of form field types.
+     *
+     * @return array
+     */
+    protected function getTypes()
+    {
+        return Grav::instance()['plugins']->formFieldTypes ?: [];
     }
 
     /**
      * Finalize configuration object.
      */
-    protected function finalizeObject() {}
+    protected function finalizeObject()
+    {
+    }
 
     /**
      * Load single configuration file and append it to the correct position.
      *
      * @param  string  $name  Name of the position.
-     * @param  string  $filename  File to be loaded.
+     * @param  array   $files  Files to be loaded.
      */
-    protected function loadFile($name, $filename)
+    protected function loadFile($name, $files)
     {
-        $file = CompiledYamlFile::instance($filename);
-        $this->object->embed($name, $file->content(), '/');
-        $file->free();
+        // Load blueprint file.
+        $blueprint = new Blueprint($files);
+
+        $this->object->embed($name, $blueprint->load()->toArray(), '/', true);
+    }
+
+    /**
+     * Load and join all configuration files.
+     *
+     * @return bool
+     * @internal
+     */
+    protected function loadFiles()
+    {
+        $this->createObject();
+
+        // Convert file list into parent list.
+        $list = [];
+        foreach ($this->files as $files) {
+            foreach ($files as $name => $item) {
+                $list[$name][] = $this->path . $item['file'];
+            }
+        }
+
+        // Load files.
+        foreach ($list as $name => $files) {
+            $this->loadFile($name, $files);
+        }
+
+        $this->finalizeObject();
+
+        return true;
+    }
+
+    protected function getState()
+    {
+        return $this->object->getState();
     }
 }

system/src/Grav/Common/Config/CompiledConfig.php

@@ -1,11 +1,15 @@
 <?php
+/**
+ * @package    Grav.Common.Config
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 namespace Grav\Common\Config;
 
 use Grav\Common\File\CompiledYamlFile;
 
-/**
- * The Compiled Configuration class.
- */
 class CompiledConfig extends CompiledBase
 {
     /**

system/src/Grav/Common/Config/CompiledLanguages.php

@@ -1,11 +1,15 @@
 <?php
+/**
+ * @package    Grav.Common.Config
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 namespace Grav\Common\Config;
 
 use Grav\Common\File\CompiledYamlFile;
 
-/**
- * The Compiled Languages class.
- */
 class CompiledLanguages extends CompiledBase
 {
     /**

system/src/Grav/Common/Config/Config.php

@@ -1,4 +1,11 @@
 <?php
+/**
+ * @package    Grav.Common.Config
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 namespace Grav\Common\Config;
 
 use Grav\Common\Debugger;
@@ -6,12 +13,6 @@ use Grav\Common\Grav;
 use Grav\Common\Data\Data;
 use Grav\Common\Service\ConfigServiceProvider;
 
-/**
- * The Config class contains configuration information.
- *
- * @author RocketTheme
- * @license MIT
- */
 class Config extends Data
 {
     protected $checksum;

system/src/Grav/Common/Config/ConfigFileFinder.php

@@ -1,11 +1,15 @@
 <?php
+/**
+ * @package    Grav.Common.Config
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 namespace Grav\Common\Config;
 
 use Grav\Common\Filesystem\Folder;
 
-/**
- * The Configuration & Blueprints Finder class.
- */
 class ConfigFileFinder
 {
     protected $base = '';

system/src/Grav/Common/Config/Languages.php

@@ -1,14 +1,15 @@
 <?php
+/**
+ * @package    Grav.Common.Config
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 namespace Grav\Common\Config;
 
 use Grav\Common\Data\Data;
 
-/**
- * The Languages class contains configuration rules.
- *
- * @author RocketTheme
- * @license MIT
- */
 class Languages extends Data
 {
     public function checksum($checksum = null)

system/src/Grav/Common/Config/Setup.php

@@ -1,20 +1,24 @@
 <?php
+/**
+ * @package    Grav.Common.Config
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 namespace Grav\Common\Config;
 
 use Grav\Common\File\CompiledYamlFile;
 use Grav\Common\Data\Data;
 use Grav\Common\Utils;
+use Pimple\Container;
 use RocketTheme\Toolbox\File\YamlFile;
 use RocketTheme\Toolbox\ResourceLocator\UniformResourceLocator;
 
-/**
- * The Config class contains configuration information.
- *
- * @author RocketTheme
- * @license MIT
- */
 class Setup extends Data
 {
+    public static $environment;
+
     protected $streams = [
         'system' => [
             'type' => 'ReadOnlyStream',
@@ -24,6 +28,7 @@ class Setup extends Data
         ],
         'user' => [
             'type' => 'ReadOnlyStream',
+            'force' => true,
             'prefixes' => [
                 '' => ['user'],
             ]
@@ -76,6 +81,7 @@ class Setup extends Data
         ],
         'cache' => [
             'type' => 'Stream',
+            'force' => true,
             'prefixes' => [
                 '' => ['cache'],
                 'images' => ['images']
@@ -83,16 +89,25 @@ class Setup extends Data
         ],
         'log' => [
             'type' => 'Stream',
+            'force' => true,
             'prefixes' => [
                 '' => ['logs']
             ]
         ],
         'backup' => [
             'type' => 'Stream',
+            'force' => true,
             'prefixes' => [
                 '' => ['backup']
             ]
         ],
+        'tmp' => [
+            'type' => 'Stream',
+            'force' => true,
+            'prefixes' => [
+                '' => ['tmp']
+            ]
+        ],
         'image' => [
             'type' => 'ReadOnlyStream',
             'prefixes' => [
@@ -113,12 +128,12 @@ class Setup extends Data
         ],
     ];
 
+    /**
+     * @param Container|array $container
+     */
     public function __construct($container)
     {
-        $environment = $container['uri']->environment();
-        if (!$environment) {
-            $environment = 'localhost';
-        }
+        $environment = isset(static::$environment) ? static::$environment : ($container['uri']->environment() ?: 'localhost');
 
         // Pre-load setup.php which contains our initial configuration.
         // Configuration may contain dynamic parts, which is why we need to always load it.
@@ -135,8 +150,8 @@ class Setup extends Data
         parent::__construct($setup);
 
         // Set up environment.
-        $this->def('environment', $environment);
-        $this->def('streams.schemes.environment.prefixes', ['' => ["user://{$this->environment}"]]);
+        $this->def('environment', $environment ?: 'cli');
+        $this->def('streams.schemes.environment.prefixes', ['' => ($environment ? ["user://{$this->environment}"] : [])]);
     }
 
     /**
@@ -158,7 +173,7 @@ class Setup extends Data
             }
 
             // Update streams.
-            foreach ($files as $path) {
+            foreach (array_reverse($files) as $path) {
                 $file = CompiledYamlFile::instance($path);
                 $content = $file->content();
                 if (!empty($content['schemes'])) {
@@ -192,9 +207,13 @@ class Setup extends Data
             if (isset($config['paths'])) {
                 $locator->addPath($scheme, '', $config['paths']);
             }
+
+            $override = isset($config['override']) ? $config['override'] : false;
+            $force = isset($config['force']) ? $config['force'] : false;
+
             if (isset($config['prefixes'])) {
                 foreach ($config['prefixes'] as $prefix => $paths) {
-                    $locator->addPath($scheme, $prefix, $paths);
+                    $locator->addPath($scheme, $prefix, $paths, $override, $force);
                 }
             }
         }

system/src/Grav/Common/Data/Blueprint.php

@@ -1,87 +1,57 @@
 <?php
+/**
+ * @package    Grav.Common.Data
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 namespace Grav\Common\Data;
 
-use Grav\Common\GravTrait;
-use RocketTheme\Toolbox\ArrayTraits\Export;
-use RocketTheme\Toolbox\ArrayTraits\ExportInterface;
-use RocketTheme\Toolbox\ArrayTraits\NestedArrayAccessWithGetters;
+use Grav\Common\File\CompiledYamlFile;
+use Grav\Common\Grav;
+use RocketTheme\Toolbox\Blueprints\BlueprintForm;
+use RocketTheme\Toolbox\ResourceLocator\UniformResourceLocator;
 
-/**
- * Blueprint handles the inside logic of blueprints.
- *
- * @author RocketTheme
- * @license MIT
- */
-class Blueprint implements \ArrayAccess, ExportInterface
+class Blueprint extends BlueprintForm
 {
-    use Export, NestedArrayAccessWithGetters, GravTrait;
-
-    public $name;
-
-    public $initialized = false;
-
-    protected $items;
-    protected $context;
-    protected $fields;
-    protected $rules = array();
-    protected $nested = array();
-    protected $filter = ['validation' => 1];
-
     /**
-     * @param string $name
-     * @param array  $data
-     * @param Blueprints $context
+     * @var string
      */
-    public function __construct($name, array $data = array(), Blueprints $context = null)
-    {
-        $this->name = $name;
-        $this->items = $data;
-        $this->context = $context;
-    }
+    protected $context = 'blueprints://';
 
     /**
-     * Set filter for inherited properties.
+     * @var BlueprintSchema
+     */
+    protected $blueprintSchema;
+
+    /**
+     * Set default values for field types.
      *
-     * @param array $filter     List of field names to be inherited.
+     * @param array $types
+     * @return $this
      */
-    public function setFilter(array $filter)
+    public function setTypes(array $types)
     {
-        $this->filter = array_flip($filter);
+        $this->initInternals();
+
+        $this->blueprintSchema->setTypes($types);
+
+        return $this;
     }
 
     /**
-     * Return all form fields.
+     * Get nested structure containing default values defined in the blueprints.
+     *
+     * Fields without default value are ignored in the list.
      *
      * @return array
      */
-    public function fields()
+    public function getDefaults()
     {
-        if (!isset($this->fields)) {
-            $this->fields = [];
-            $this->embed('', $this->items);
-        }
+        $this->initInternals();
 
-        return $this->fields;
-    }
-
-    /**
-     * Validate data against blueprints.
-     *
-     * @param  array $data
-     * @throws \RuntimeException
-     */
-    public function validate(array $data)
-    {
-        // Initialize data
-        $this->fields();
-
-        try {
-            $this->validateArray($data, $this->nested);
-        } catch (\RuntimeException $e) {
-            $language = self::getGrav()['language'];
-            $message = sprintf($language->translate('FORM.VALIDATION_FAIL', null, true) . ' %s', $e->getMessage());
-            throw new \RuntimeException($message);
-        }
+        return $this->blueprintSchema->getDefaults();
     }
 
     /**
@@ -89,26 +59,15 @@ class Blueprint implements \ArrayAccess, ExportInterface
      *
      * @param  array $data1
      * @param  array $data2
+     * @param  string $name         Optional
+     * @param  string $separator    Optional
      * @return array
      */
-    public function mergeData(array $data1, array $data2)
+    public function mergeData(array $data1, array $data2, $name = null, $separator = '.')
     {
-        // Initialize data
-        $this->fields();
-        return $this->mergeArrays($data1, $data2, $this->nested);
-    }
+        $this->initInternals();
 
-    /**
-     * Filter data by using blueprints.
-     *
-     * @param  array $data
-     * @return array
-     */
-    public function filter(array $data)
-    {
-        // Initialize data
-        $this->fields();
-        return $this->filterArray($data, $this->nested);
+        return $this->blueprintSchema->mergeData($data1, $data2, $name, $separator);
     }
 
     /**
@@ -120,355 +79,176 @@ class Blueprint implements \ArrayAccess, ExportInterface
      */
     public function extra(array $data, $prefix = '')
     {
-        // Initialize data
-        $this->fields();
-        $rules = $this->nested;
+        $this->initInternals();
 
-        // Drill down to prefix level
-        if (!empty($prefix)) {
-            $parts = explode('.', trim($prefix, '.'));
-            foreach ($parts as $part) {
-                $rules = isset($rules[$part]) ? $rules[$part] : [];
-            }
-        }
-
-        return $this->extraArray($data, $rules, $prefix);
+        return $this->blueprintSchema->extra($data, $prefix);
     }
 
     /**
-     * Extend blueprint with another blueprint.
+     * Validate data against blueprints.
      *
-     * @param Blueprint $extends
-     * @param bool $append
-     */
-    public function extend(Blueprint $extends, $append = false)
-    {
-        $blueprints = $append ? $this->items : $extends->toArray();
-        $appended = $append ? $extends->toArray() : $this->items;
-
-        $bref_stack = array(&$blueprints);
-        $head_stack = array($appended);
-
-        do {
-            end($bref_stack);
-
-            $bref = &$bref_stack[key($bref_stack)];
-            $head = array_pop($head_stack);
-
-            unset($bref_stack[key($bref_stack)]);
-
-            foreach (array_keys($head) as $key) {
-                if (isset($key, $bref[$key]) && is_array($bref[$key]) && is_array($head[$key])) {
-                    $bref_stack[] = &$bref[$key];
-                    $head_stack[] = $head[$key];
-                } else {
-                    $bref = array_merge($bref, array($key => $head[$key]));
-                }
-            }
-        } while (count($head_stack));
-
-        $this->items = $blueprints;
-    }
-
-    /**
-     * Convert object into an array.
-     *
-     * @return array
-     */
-    public function getState()
-    {
-        return ['name' => $this->name, 'items' => $this->items, 'rules' => $this->rules, 'nested' => $this->nested];
-    }
-
-    /**
-     * Embed an array to the blueprint.
-     *
-     * @param $name
-     * @param array $value
-     * @param string $separator
-     */
-    public function embed($name, array $value, $separator = '.')
-    {
-
-        if (!isset($value['form']['fields']) || !is_array($value['form']['fields'])) {
-            return;
-        }
-        // Initialize data
-        $this->fields();
-        $prefix = $name ? strtr($name, $separator, '.') . '.' : '';
-        $params = array_intersect_key($this->filter, $value);
-        $this->parseFormFields($value['form']['fields'], $params, $prefix, $this->fields);
-    }
-
-    /**
-     * @param array $data
-     * @param array $rules
+     * @param  array $data
      * @throws \RuntimeException
-     * @internal
      */
-    protected function validateArray(array $data, array $rules)
+    public function validate(array $data)
     {
-        $this->checkRequired($data, $rules);
+        $this->initInternals();
 
-        foreach ($data as $key => $field) {
-            $val = isset($rules[$key]) ? $rules[$key] : null;
-            $rule = is_string($val) ? $this->rules[$val] : null;
-
-            if ($rule) {
-                // Item has been defined in blueprints.
-                Validation::validate($field, $rule);
-            } elseif (is_array($field) && is_array($val)) {
-                // Array has been defined in blueprints.
-                $this->validateArray($field, $val);
-            } elseif (isset($this->items['form']['validation']) && $this->items['form']['validation'] == 'strict') {
-                 // Undefined/extra item.
-                 throw new \RuntimeException(sprintf('%s is not defined in blueprints', $key));
-            }
-        }
+        $this->blueprintSchema->validate($data);
     }
 
     /**
-     * @param array $data
-     * @param array $rules
-     * @return array
-     * @internal
-     */
-    protected function filterArray(array $data, array $rules)
-    {
-        $results = array();
-        foreach ($data as $key => $field) {
-            $val = isset($rules[$key]) ? $rules[$key] : null;
-            $rule = is_string($val) ? $this->rules[$val] : null;
-
-            if ($rule) {
-                // Item has been defined in blueprints.
-                $field = Validation::filter($field, $rule);
-            } elseif (is_array($field) && is_array($val)) {
-                // Array has been defined in blueprints.
-                $field = $this->filterArray($field, $val);
-            } elseif (isset($this->items['form']['validation']) && $this->items['form']['validation'] == 'strict') {
-                $field = null;
-            }
-
-            if (isset($field) && (!is_array($field) || !empty($field))) {
-                $results[$key] = $field;
-            }
-        }
-
-        return $results;
-    }
-
-    /**
-     * @param array $data1
-     * @param array $data2
-     * @param array $rules
-     * @return array
-     * @internal
-     */
-    protected function mergeArrays(array $data1, array $data2, array $rules)
-    {
-        foreach ($data2 as $key => $field) {
-            $val = isset($rules[$key]) ? $rules[$key] : null;
-            $rule = is_string($val) ? $this->rules[$val] : null;
-
-            if (!$rule && array_key_exists($key, $data1) && is_array($field) && is_array($val)) {
-                // Array has been defined in blueprints.
-                $data1[$key] = $this->mergeArrays($data1[$key], $field, $val);
-            } else {
-                // Otherwise just take value from the data2.
-                $data1[$key] = $field;
-            }
-        }
-
-        return $data1;
-    }
-
-    /**
-     * @param array $data
-     * @param array $rules
-     * @param string $prefix
-     * @return array
-     * @internal
-     */
-    protected function extraArray(array $data, array $rules, $prefix)
-    {
-        $array = array();
-        foreach ($data as $key => $field) {
-            $val = isset($rules[$key]) ? $rules[$key] : null;
-            $rule = is_string($val) ? $this->rules[$val] : null;
-
-            if ($rule) {
-                // Item has been defined in blueprints.
-            } elseif (is_array($field) && is_array($val)) {
-                // Array has been defined in blueprints.
-                $array += $this->ExtraArray($field, $val, $prefix . $key . '.');
-            } else {
-                // Undefined/extra item.
-                $array[$prefix.$key] = $field;
-            }
-        }
-        return $array;
-    }
-
-    /**
-	 * Gets all field definitions from the blueprints.
-	 *
-	 * @param array $fields
-	 * @param array $params
-	 * @param string $prefix
-	 * @param array $current
-	 * @internal
-	 */
-	protected function parseFormFields(array &$fields, $params, $prefix, array &$current)
-	{
-		// Go though all the fields in current level.
-		foreach ($fields as $key => &$field) {
-			$current[$key] = &$field;
-			// Set name from the array key.
-			$field['name'] = $prefix . $key;
-			$field += $params;
-
-			if (isset($field['fields']) && (!isset($field['type']) || $field['type'] !== 'list')) {
-				// Recursively get all the nested fields.
-				$newParams = array_intersect_key($this->filter, $field);
-				$this->parseFormFields($field['fields'], $newParams, $prefix, $current[$key]['fields']);
-			} else if ($field['type'] !== 'ignore') {
-                $this->rules[$prefix . $key] = &$field;
-                $this->addProperty($prefix . $key);
-
-                if ($field['type'] === 'list') {
-                    // we loop through list to get the actual field
-                    foreach($field['fields'] as $subName => &$subField) {
-                        $this->parseFormField($subField);
-                    }
-                } else {
-                    $this->parseFormField($field);
-                }
-
-                if (isset($field['validate']['rule']) && $field['type'] !== 'ignore') {
-                    $field['validate'] += $this->getRule($field['validate']['rule']);
-                }
-            }
-		}
-	}
-	/**
-	 * Parses individual field definition
-	 *
-	 * @param array $field
-	 * @internal
-	 */
-	protected function parseFormField(&$field) {
-		foreach ($field as $name => $value) {
-			// Support nested blueprints.
-			if ($this->context && $name == '@import') {
-				$values = (array) $value;
-				if (!isset($field['fields'])) {
-					$field['fields'] = array();
-				}
-				foreach ($values as $bname) {
-					$b = $this->context->get($bname);
-					$field['fields'] = array_merge($field['fields'], $b->fields());
-				}
-			}
-
-			// Support for callable data values.
-			elseif (substr($name, 0, 6) == '@data-') {
-				$property = substr($name, 6);
-				if (is_array($value)) {
-					$func = array_shift($value);
-				} else {
-					$func = $value;
-					$value = array();
-				}
-				list($o, $f) = preg_split('/::/', $func);
-				if (!$f && function_exists($o)) {
-					$data = call_user_func_array($o, $value);
-				} elseif ($f && method_exists($o, $f)) {
-					$data = call_user_func_array(array($o, $f), $value);
-				}
-
-				// If function returns a value,
-				if (isset($data)) {
-					if (isset($field[$property]) && is_array($field[$property]) && is_array($data)) {
-						// Combine field and @data-field together.
-						$field[$property] += $data;
-					} else {
-						// Or create/replace field with @data-field.
-						$field[$property] = $data;
-					}
-				}
-			}
-
-			elseif (substr($name, 0, 8) == '@config-') {
-				$property = substr($name, 8);
-				$default = isset($field[$property]) ? $field[$property] : null;
-				$config = self::getGrav()['config']->get($value, $default);
-
-				if (!is_null($config)) {
-					$field[$property] = $config;
-				}
-			}
-		}
-	}
-
-    /**
-     * Add property to the definition.
+     * Filter data by using blueprints.
      *
-     * @param  string  $path  Comma separated path to the property.
-     * @internal
-     */
-    protected function addProperty($path)
-    {
-        $parts = explode('.', $path);
-        $item = array_pop($parts);
-
-        $nested = &$this->nested;
-        foreach ($parts as $part) {
-            if (!isset($nested[$part])) {
-                $nested[$part] = array();
-            }
-            $nested = &$nested[$part];
-        }
-
-        if (!isset($nested[$item])) {
-            $nested[$item] = $path;
-        }
-    }
-
-    /**
-     * @param $rule
+     * @param  array $data
      * @return array
-     * @internal
      */
-    protected function getRule($rule)
+    public function filter(array $data)
     {
-        if (isset($this->items['rules'][$rule]) && is_array($this->items['rules'][$rule])) {
-            return $this->items['rules'][$rule];
-        }
-        return array();
+        $this->initInternals();
+
+        return $this->blueprintSchema->filter($data);
     }
 
     /**
-     * @param array $data
-     * @param array $fields
-     * @throws \RuntimeException
-     * @internal
+     * Return blueprint data schema.
+     *
+     * @return BlueprintSchema
      */
-    protected function checkRequired(array $data, array $fields)
+    public function schema()
     {
-        foreach ($fields as $name => $field) {
-            if (!is_string($field)) {
-                continue;
+        $this->initInternals();
+
+        return $this->blueprintSchema;
+    }
+
+    /**
+     * Initialize validator.
+     */
+    protected function initInternals()
+    {
+        if (!isset($this->blueprintSchema)) {
+            $types = Grav::instance()['plugins']->formFieldTypes;
+
+            $this->blueprintSchema = new BlueprintSchema;
+            if ($types) {
+                $this->blueprintSchema->setTypes($types);
             }
-            $field = $this->rules[$field];
-            if (isset($field['validate']['required'])
-                && $field['validate']['required'] === true
-                && empty($data[$name])) {
-                $value = isset($field['label']) ? $field['label'] : $field['name'];
-                $language = self::getGrav()['language'];
-                $message  = sprintf($language->translate('FORM.MISSING_REQUIRED_FIELD', null, true) . ' %s', $value);
-                throw new \RuntimeException($message);
+            $this->blueprintSchema->embed('', $this->items);
+            $this->blueprintSchema->init();
+        }
+    }
+
+    /**
+     * @param string $filename
+     * @return string
+     */
+    protected function loadFile($filename)
+    {
+        $file = CompiledYamlFile::instance($filename);
+        $content = $file->content();
+        $file->free();
+
+        return $content;
+    }
+
+    /**
+     * @param string|array $path
+     * @param string $context
+     * @return array
+     */
+    protected function getFiles($path, $context = null)
+    {
+        /** @var UniformResourceLocator $locator */
+        $locator = Grav::instance()['locator'];
+
+        if (is_string($path) && !$locator->isStream($path)) {
+            // Find path overrides.
+            $paths = isset($this->overrides[$path]) ? (array) $this->overrides[$path] : [];
+
+            // Add path pointing to default context.
+            if ($context === null) {
+                $context = $this->context;
             }
+            if ($context && $context[strlen($context)-1] !== '/') {
+                $context .= '/';
+            }
+            $path = $context . $path;
+
+            if (!preg_match('/\.yaml$/', $path)) {
+                $path .= '.yaml';
+            }
+
+            $paths[] = $path;
+        } else {
+            $paths = (array) $path;
+        }
+
+        $files = [];
+        foreach ($paths as $lookup) {
+            if (is_string($lookup) && strpos($lookup, '://')) {
+                $files = array_merge($files, $locator->findResources($lookup));
+            } else {
+                $files[] = $lookup;
+            }
+        }
+
+        return array_values(array_unique($files));
+    }
+
+    /**
+     * @param array $field
+     * @param string $property
+     * @param array $call
+     */
+    protected function dynamicData(array &$field, $property, array &$call)
+    {
+        $params = $call['params'];
+
+        if (is_array($params)) {
+            $function = array_shift($params);
+        } else {
+            $function = $params;
+            $params = [];
+        }
+
+        list($o, $f) = preg_split('/::/', $function, 2);
+        if (!$f) {
+            if (function_exists($o)) {
+                $data = call_user_func_array($o, $params);
+            }
+        } else {
+            if (method_exists($o, $f)) {
+                $data = call_user_func_array(array($o, $f), $params);
+            }
+        }
+
+        // If function returns a value,
+        if (isset($data)) {
+            if (isset($field[$property]) && is_array($field[$property]) && is_array($data)) {
+                // Combine field and @data-field together.
+                $field[$property] += $data;
+            } else {
+                // Or create/replace field with @data-field.
+                $field[$property] = $data;
+            }
+        }
+    }
+
+    /**
+     * @param array $field
+     * @param string $property
+     * @param array $call
+     */
+    protected function dynamicConfig(array &$field, $property, array &$call)
+    {
+        $value = $call['params'];
+
+        $default = isset($field[$property]) ? $field[$property] : null;
+        $config = Grav::instance()['config']->get($value, $default);
+
+        if (!is_null($config)) {
+            $field[$property] = $config;
         }
     }
 }

system/src/Grav/Common/Data/BlueprintSchema.php

@@ -0,0 +1,171 @@
+<?php
+/**
+ * @package    Grav.Common.Data
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Common\Data;
+
+use Grav\Common\Grav;
+use RocketTheme\Toolbox\ArrayTraits\Export;
+use RocketTheme\Toolbox\ArrayTraits\ExportInterface;
+use RocketTheme\Toolbox\Blueprints\BlueprintSchema as BlueprintSchemaBase;
+
+class BlueprintSchema extends BlueprintSchemaBase implements ExportInterface
+{
+    use Export;
+
+    protected $ignoreFormKeys = [
+        'title' => true,
+        'help' => true,
+        'placeholder' => true,
+        'placeholder_key' => true,
+        'placeholder_value' => true,
+        'fields' => true
+    ];
+
+    /**
+     * Validate data against blueprints.
+     *
+     * @param  array $data
+     * @throws \RuntimeException
+     */
+    public function validate(array $data)
+    {
+        try {
+            $messages = $this->validateArray($data, $this->nested);
+
+        } catch (\RuntimeException $e) {
+            throw (new ValidationException($e->getMessage(), $e->getCode(), $e))->setMessages();
+        }
+
+        if (!empty($messages)) {
+            throw (new ValidationException())->setMessages($messages);
+        }
+    }
+
+    /**
+     * Filter data by using blueprints.
+     *
+     * @param  array $data
+     * @return array
+     */
+    public function filter(array $data)
+    {
+        return $this->filterArray($data, $this->nested);
+    }
+
+    /**
+     * @param array $data
+     * @param array $rules
+     * @returns array
+     * @throws \RuntimeException
+     * @internal
+     */
+    protected function validateArray(array $data, array $rules)
+    {
+        $messages = $this->checkRequired($data, $rules);
+
+        foreach ($data as $key => $field) {
+            $val = isset($rules[$key]) ? $rules[$key] : (isset($rules['*']) ? $rules['*'] : null);
+            $rule = is_string($val) ? $this->items[$val] : null;
+
+            if ($rule) {
+                // Item has been defined in blueprints.
+                $messages += Validation::validate($field, $rule);
+            } elseif (is_array($field) && is_array($val)) {
+                // Array has been defined in blueprints.
+                $messages += $this->validateArray($field, $val);
+            } elseif (isset($rules['validation']) && $rules['validation'] == 'strict') {
+                // Undefined/extra item.
+                throw new \RuntimeException(sprintf('%s is not defined in blueprints', $key));
+            }
+        }
+
+        return $messages;
+    }
+
+    /**
+     * @param array $data
+     * @param array $rules
+     * @return array
+     * @internal
+     */
+    protected function filterArray(array $data, array $rules)
+    {
+        $results = array();
+        foreach ($data as $key => $field) {
+            $val = isset($rules[$key]) ? $rules[$key] : (isset($rules['*']) ? $rules['*'] : null);
+            $rule = is_string($val) ? $this->items[$val] : null;
+
+            if ($rule) {
+                // Item has been defined in blueprints.
+                $field = Validation::filter($field, $rule);
+            } elseif (is_array($field) && is_array($val)) {
+                // Array has been defined in blueprints.
+                $field = $this->filterArray($field, $val);
+            } elseif (isset($rules['validation']) && $rules['validation'] == 'strict') {
+                $field = null;
+            }
+
+            if (isset($field) && (!is_array($field) || !empty($field))) {
+                $results[$key] = $field;
+            }
+        }
+
+        return $results;
+    }
+
+    /**
+     * @param array $data
+     * @param array $fields
+     * @return array
+     */
+    protected function checkRequired(array $data, array $fields)
+    {
+        $messages = [];
+
+        foreach ($fields as $name => $field) {
+            if (!is_string($field)) {
+                continue;
+            }
+            $field = $this->items[$field];
+            if (isset($field['validate']['required'])
+                && $field['validate']['required'] === true) {
+
+                if (isset($data[$name])) {
+                    continue;
+                }
+                if ($field['type'] == 'file' && isset($data['data']['name'][$name])) { //handle case of file input fields required
+                    continue;
+                }
+
+                $value = isset($field['label']) ? $field['label'] : $field['name'];
+                $language = Grav::instance()['language'];
+                $message  = sprintf($language->translate('FORM.MISSING_REQUIRED_FIELD', null, true) . ' %s', $language->translate($value));
+                $messages[$field['name']][] = $message;
+            }
+        }
+
+        return $messages;
+    }
+
+    /**
+     * @param array $field
+     * @param string $property
+     * @param array $call
+     */
+    protected function dynamicConfig(array &$field, $property, array &$call)
+    {
+        $value = $call['params'];
+
+        $default = isset($field[$property]) ? $field[$property] : null;
+        $config = Grav::instance()['config']->get($value, $default);
+
+        if (!is_null($config)) {
+            $field[$property] = $config;
+        }
+    }
+}

system/src/Grav/Common/Data/Blueprints.php

@@ -1,28 +1,26 @@
 <?php
+/**
+ * @package    Grav.Common.Data
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 namespace Grav\Common\Data;
 
-use Grav\Common\File\CompiledYamlFile;
-use Grav\Common\GravTrait;
+use Grav\Common\Grav;
 use RocketTheme\Toolbox\ResourceLocator\UniformResourceLocator;
 
-/**
- * Blueprints class keeps track on blueprint instances.
- *
- * @author RocketTheme
- * @license MIT
- */
 class Blueprints
 {
-    use GravTrait;
-
     protected $search;
     protected $types;
-    protected $instances = array();
+    protected $instances = [];
 
     /**
      * @param  string|array  $search  Search path.
      */
-    public function __construct($search)
+    public function __construct($search = 'blueprints://')
     {
         $this->search = $search;
     }
@@ -37,73 +35,7 @@ class Blueprints
     public function get($type)
     {
         if (!isset($this->instances[$type])) {
-            $parents = [];
-            if (is_string($this->search)) {
-                $filename = $this->search . $type . YAML_EXT;
-
-                // Check if search is a stream and resolve the path.
-                if (strpos($filename, '://')) {
-                    $grav = static::getGrav();
-                    /** @var UniformResourceLocator $locator */
-                    $locator = $grav['locator'];
-                    $parents = $locator->findResources($filename);
-                    $filename = array_shift($parents);
-                }
-            } else {
-                $filename = isset($this->search[$type]) ? $this->search[$type] : '';
-            }
-
-            if ($filename && is_file($filename)) {
-                $file = CompiledYamlFile::instance($filename);
-                $blueprints = $file->content();
-            } else {
-                $blueprints = [];
-            }
-
-            $blueprint = new Blueprint($type, $blueprints, $this);
-
-            if (isset($blueprints['@extends'])) {
-                // Extend blueprint by other blueprints.
-                $extends = (array) $blueprints['@extends'];
-
-                if (is_string(key($extends))) {
-                    $extends = [ $extends ];
-                }
-
-                foreach ($extends as $extendConfig) {
-                    $extendType = !is_string($extendConfig) ? empty($extendConfig['type']) ? false : $extendConfig['type'] : $extendConfig;
-
-                    if (!$extendType) {
-                        continue;
-                    } elseif ($extendType === '@parent') {
-                        $parentFile = array_shift($parents);
-                        if (!$parentFile || !is_file($parentFile)) {
-                            continue;
-                        }
-                        $blueprints = CompiledYamlFile::instance($parentFile)->content();
-                        $parent = new Blueprint($type.'-parent', $blueprints, $this);
-                        $blueprint->extend($parent);
-                        continue;
-                    }
-
-                    if (is_string($extendConfig) || empty($extendConfig['context'])) {
-                        $context = $this;
-                    } else {
-                        // Load blueprints from external context.
-                        $array = explode('://', $extendConfig['context'], 2);
-                        $scheme = array_shift($array);
-                        $path = array_shift($array);
-                        if ($path) {
-                            $scheme .= '://';
-                            $extendType = $path ? "{$path}/{$extendType}" : $extendType;
-                        }
-                        $context = new self($scheme);
-                    }
-                    $blueprint->extend($context->get($extendType));
-                }
-            }
-
-            $this->instances[$type] = $blueprint;
+            $this->instances[$type] = $this->loadFile($type);
         }
 
         return $this->instances[$type];
@@ -119,15 +51,15 @@ class Blueprints
         if ($this->types === null) {
             $this->types = array();
 
-            // Check if search is a stream.
-            if (strpos($this->search, '://')) {
-                // Stream: use UniformResourceIterator.
-                $grav = static::getGrav();
-                /** @var UniformResourceLocator $locator */
-                $locator = $grav['locator'];
-                $iterator = $locator->getIterator($this->search, null);
+            $grav = Grav::instance();
+
+            /** @var UniformResourceLocator $locator */
+            $locator = $grav['locator'];
+
+            // Get stream / directory iterator.
+            if ($locator->isStream($this->search)) {
+                $iterator = $locator->getIterator($this->search);
             } else {
-                // Not a stream: use DirectoryIterator.
                 $iterator = new \DirectoryIterator($this->search);
             }
 
@@ -140,6 +72,29 @@ class Blueprints
                 $this->types[$name] = ucfirst(strtr($name, '_', ' '));
             }
         }
+
         return $this->types;
     }
+
+
+    /**
+     * Load blueprint file.
+     *
+     * @param  string  $name  Name of the blueprint.
+     * @return Blueprint
+     */
+    protected function loadFile($name)
+    {
+        $blueprint = new Blueprint($name);
+
+        if (is_array($this->search) || is_object($this->search)) {
+            // Page types.
+            $blueprint->setOverrides($this->search);
+            $blueprint->setContext('blueprints://pages');
+        } else {
+            $blueprint->setContext($this->search);
+        }
+
+        return $blueprint->load()->init();
+    }
 }