Merge branch 'release/1.6.22'

getgrav · Mar 5, 2020 · 152c987 · 152c987
2 parents addecbb + eec2d12
commit 152c987
Show file tree

Hide file tree

Showing 10 changed files with 125 additions and 160 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,6 +3,7 @@ php:
   - '7.1'
   - '7.2'
   - '7.3'
+  - '7.4'
 branches:
   only:
     - develop

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,15 @@
+# v1.6.22
+## 03/05/2020
+
+1. [](#new)
+    * Added `Pages::reset()` method
+1. [](#improved)
+    * Updated Negotiation library to address issues [#2513](https://github.com/getgrav/grav/issues/2513)
+1. [](#bugfix)
+    * Fixed issue with search plugins not being able to switch between page translations
+    * Fixed issues with `Pages::baseRoute()` not picking up active language reliably
+    * Reverted `validation: strict` fix as it breaks sites, see [#1273](https://github.com/getgrav/grav/issues/1273)
+
 # v1.6.21
 ## 02/11/2020
 

diff --git a/composer.json b/composer.json
@@ -52,7 +52,7 @@
         "composer/ca-bundle": "^1.0",
         "dragonmantank/cron-expression": "^1.2",
         "phive/twig-extensions-deferred": "^1.0",
-        "willdurand/negotiation": "^2.3"
+        "willdurand/negotiation": "2.x-dev"
     },
     "require-dev": {
         "codeception/codeception": "^2.4",
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,6 +3,7 @@ php: @@
       - '7.1'
       - '7.2'
       - '7.3'
+      - '7.4'
     branches:
       only:
         - develop
@@ Expand Down @@