From a8f4f23c660474e965b510ba1bb04bf7a145d5b0 Mon Sep 17 00:00:00 2001
From: bergice <andre.kiste@silverstripe.com>
Date: Tue, 27 Nov 2018 14:00:23 +1300
Subject: [PATCH 01/20] NEW: Add visibility updates to `upgrade.yml`.

This will make the `inspect` upgrader command ensure these visibilities are used
---
 .upgrade.yml | 127 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 127 insertions(+)

diff --git a/.upgrade.yml b/.upgrade.yml
index 33d42e81e..5bd8f03d3 100644
--- a/.upgrade.yml
+++ b/.upgrade.yml
@@ -1367,3 +1367,130 @@ warnings:
     'THIRDPARTY_DIR':
       message: 'Path constants have been deprecated. Use the Requirements and ModuleResourceLoader APIs'
       url: 'https://docs.silverstripe.org/en/4/changelogs/4.0.0#module-paths'
+visibilities:
+  'SilverStripe\ORM\DataObject::db':
+    visibility: private
+  'SilverStripe\ORM\DataObject::singular_name':
+    visibility: private
+  'SilverStripe\ORM\DataObject::plural_name':
+    visibility: private
+  'SilverStripe\ORM\DataObject::api_access':
+    visibility: private
+  'SilverStripe\ORM\DataObject::default_classname':
+    visibility: private
+  'SilverStripe\ORM\DataObject->destroyed':
+    visibility: public
+  'SilverStripe\ORM\DataObject->record':
+    visibility: protected
+  'SilverStripe\ORM\DataObject->joinRecord':
+    visibility: protected
+  'SilverStripe\ORM\DataObject->changed':
+    visibility: private
+  'SilverStripe\ORM\DataObject->changeForced':
+    visibility: private
+  'SilverStripe\ORM\DataObject->original':
+    visibility: protected
+  'SilverStripe\ORM\DataObject->brokenOnDelete':
+    visibility: protected
+  'SilverStripe\ORM\DataObject->brokenOnWrite':
+    visibility: protected
+  'SilverStripe\ORM\DataObject::validation_enabled':
+    visibility: private
+  'SilverStripe\ORM\DataObject::_cache_get_one':
+    visibility: protected
+  'SilverStripe\ORM\DataObject::_cache_field_labels':
+    visibility: protected
+  'SilverStripe\ORM\DataObject::fixed_fields':
+    visibility: private
+  'SilverStripe\ORM\DataObject::table_name':
+    visibility: private
+  'SilverStripe\ORM\DataObject->components':
+    visibility: protected
+  'SilverStripe\ORM\DataObject->unsavedRelations':
+    visibility: protected
+  'SilverStripe\ORM\DataObject::cascade_deletes':
+    visibility: private
+  'SilverStripe\ORM\DataObject::cascade_duplicates':
+    visibility: private
+  'SilverStripe\ORM\DataObject::sourceQueryParams':
+    visibility: private
+  'SilverStripe\ORM\DataObject::subclass_access':
+    visibility: private
+  'SilverStripe\ORM\DataObject::casting':
+    visibility: private
+  'SilverStripe\ORM\DataObject::create_table_options':
+    visibility: private
+  'SilverStripe\ORM\DataObject::indexes':
+    visibility: private
+  'SilverStripe\ORM\DataObject::defaults':
+    visibility: private
+  'SilverStripe\ORM\DataObject::default_records':
+    visibility: private
+  'SilverStripe\ORM\DataObject::has_one':
+    visibility: private
+  'SilverStripe\ORM\DataObject::belongs_to':
+    visibility: private
+  'SilverStripe\ORM\DataObject::has_many':
+    visibility: private
+  'SilverStripe\ORM\DataObject::many_many':
+    visibility: private
+  'SilverStripe\ORM\DataObject::many_many_extraFields':
+    visibility: private
+  'SilverStripe\ORM\DataObject::belongs_many_many':
+    visibility: private
+  'SilverStripe\ORM\DataObject::default_sort':
+    visibility: private
+  'SilverStripe\ORM\DataObject::searchable_fields':
+    visibility: private
+  'SilverStripe\ORM\DataObject::field_labels':
+    visibility: private
+  'SilverStripe\ORM\DataObject::summary_fields':
+    visibility: private
+  'SilverStripe\Control\Director::rules':
+    visibility: private
+  'SilverStripe\Control\Director::current_page':
+    visibility: private
+  'SilverStripe\Control\Director::alternate_base_folder':
+    visibility: private
+  'SilverStripe\Control\Director::alternate_public_dir':
+    visibility: private
+  'SilverStripe\Control\Director::default_base_url':
+    visibility: private
+  'SilverStripe\Forms\GridField\GridFieldPaginator::default_items_per_page':
+    visibility: private
+  'SilverStripe\View\SSViewer::themes':
+    visibility: private
+  'SilverStripe\View\SSViewer::current_themes':
+    visibility: protected
+  'SilverStripe\View\SSViewer::theme':
+    visibility: private
+  'SilverStripe\View\SSViewer::theme_enabled':
+    visibility: private
+  'SilverStripe\View\SSViewer::global_key':
+    visibility: private
+  'SilverStripe\View\SSViewer::source_file_comments':
+    visibility: private
+  'SilverStripe\View\SSViewer::rewrite_hash_links':
+    visibility: private
+  'SilverStripe\View\SSViewer::current_rewrite_hash_links':
+    visibility: protected
+  'SilverStripe\View\SSViewer::rewriteHashlinks':
+    visibility: protected
+  'SilverStripe\View\SSViewer::template_cache_flushed':
+    visibility: private
+  'SilverStripe\View\SSViewer::cacheblock_cache_flushed':
+    visibility: private
+  'SilverStripe\View\SSViewer::topLevel':
+    visibility: protected
+  'SilverStripe\View\SSViewer::templates':
+    visibility: protected
+  'SilverStripe\View\SSViewer::chosen':
+    visibility: protected
+  'SilverStripe\View\SSViewer::subTemplates':
+    visibility: protected
+  'SilverStripe\View\SSViewer::includeRequirements':
+    visibility: protected
+  'SilverStripe\View\SSViewer::parser':
+    visibility: protected
+  'SilverStripe\View\SSViewer::partialCacheStore':
+    visibility: protected

From 34ac228029a4609d993e8604aad16e72bd52ac9c Mon Sep 17 00:00:00 2001
From: Damian Mooyman <damian.mooyman@littlegiant.co.nz>
Date: Fri, 11 Jan 2019 11:25:44 +1300
Subject: [PATCH 02/20] BUG Fix issue with assertListEquals() ignoring field
 getters

---
 src/Dev/Constraint/ViewableDataContains.php   |  2 +-
 tests/php/Dev/ViewableDataContainsTest.php    | 11 +++++++
 .../ViewableDataContainsTest/TestObject.php   | 31 +++++++++++++++++++
 3 files changed, 43 insertions(+), 1 deletion(-)
 create mode 100644 tests/php/Dev/ViewableDataContainsTest/TestObject.php

diff --git a/src/Dev/Constraint/ViewableDataContains.php b/src/Dev/Constraint/ViewableDataContains.php
index c26084509..6665c0f46 100644
--- a/src/Dev/Constraint/ViewableDataContains.php
+++ b/src/Dev/Constraint/ViewableDataContains.php
@@ -64,7 +64,7 @@ class ViewableDataContains extends PHPUnit_Framework_Constraint implements TestO
         $success = true;
 
         foreach ($this->match as $fieldName => $value) {
-            if ($other->getField($fieldName) != $value) {
+            if ($other->$fieldName != $value) {
                 $success = false;
                 break;
             }
diff --git a/tests/php/Dev/ViewableDataContainsTest.php b/tests/php/Dev/ViewableDataContainsTest.php
index ad67051a8..fcf93c26e 100644
--- a/tests/php/Dev/ViewableDataContainsTest.php
+++ b/tests/php/Dev/ViewableDataContainsTest.php
@@ -4,6 +4,7 @@ namespace SilverStripe\Dev\Tests;
 
 use SilverStripe\Dev\Constraint\ViewableDataContains;
 use SilverStripe\Dev\SapphireTest;
+use SilverStripe\Dev\Tests\ViewableDataContainsTest\TestObject;
 use SilverStripe\Security\Member;
 use SilverStripe\View\ArrayData;
 
@@ -100,4 +101,14 @@ class ViewableDataContainsTest extends SapphireTest
 
         $this->assertFalse($constraint->evaluate($item, '', true));
     }
+
+    public function testFieldAccess()
+    {
+        $data = new TestObject(['name' => 'Damian']);
+        $constraint = new ViewableDataContains(['name' => 'Damian', 'Something' => 'something']);
+        $this->assertTrue($constraint->evaluate($data, '', true));
+
+        $constraint = new ViewableDataContains(['name' => 'Damian', 'Something' => 'notthing']);
+        $this->assertFalse($constraint->evaluate($data, '', true));
+    }
 }
diff --git a/tests/php/Dev/ViewableDataContainsTest/TestObject.php b/tests/php/Dev/ViewableDataContainsTest/TestObject.php
new file mode 100644
index 000000000..0db24f3e4
--- /dev/null
+++ b/tests/php/Dev/ViewableDataContainsTest/TestObject.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace SilverStripe\Dev\Tests\ViewableDataContainsTest;
+
+use SilverStripe\Dev\TestOnly;
+use SilverStripe\View\ViewableData;
+
+class TestObject extends ViewableData implements TestOnly
+{
+    protected $data = null;
+
+    public function __construct($data)
+    {
+        $this->data = $data;
+    }
+
+    public function hasField($name)
+    {
+        return isset($this->data[$name]);
+    }
+
+    public function getField($name)
+    {
+        return isset($this->data[$name]) ?: null;
+    }
+
+    public function getSomething()
+    {
+        return 'something';
+    }
+}

From d530bc2fb6c8c290f1f75f39bc4ec898cc326cf1 Mon Sep 17 00:00:00 2001
From: Benedikt Seidl <Benedikt.Seidl@gmx.de>
Date: Thu, 24 Jan 2019 20:51:48 +0100
Subject: [PATCH 03/20] fix user feedback when jquery could not be loaded

---
 src/Dev/Install/Installer.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Dev/Install/Installer.php b/src/Dev/Install/Installer.php
index 742922f2f..f6bb7cc20 100644
--- a/src/Dev/Install/Installer.php
+++ b/src/Dev/Install/Installer.php
@@ -549,7 +549,7 @@ TEXT;
 <li id="ModRewriteResult">Testing...</li>
 <script>
     if (typeof $ == 'undefined') {
-        document.getElemenyById('ModeRewriteResult').innerHTML = "I can't run jQuery ajax to set rewriting; I will redirect you to the homepage to see if everything is working.";
+        document.getElementById('ModeRewriteResult').innerHTML = "I can't run jQuery ajax to set rewriting; I will redirect you to the homepage to see if everything is working.";
         setTimeout(function() {
             window.location = "$destinationURL";
         }, 10000);

From 568be8e29b9a6f9205dd28a823ed5294cc95a590 Mon Sep 17 00:00:00 2001
From: Loz Calver <lozcalver@bigfork.co.uk>
Date: Fri, 25 Jan 2019 09:33:21 +0000
Subject: [PATCH 04/20] FIX: Misconfiguration for versioned cache segmentation
 (fixes #8754)

---
 _config/cache.yml                             |  9 ++--
 .../08_Performance/01_Caching.md              | 43 +++++++++++++++++++
 docs/en/04_Changelogs/4.2.0.md                |  3 +-
 3 files changed, 47 insertions(+), 8 deletions(-)

diff --git a/_config/cache.yml b/_config/cache.yml
index 48715eb4f..894048f13 100644
--- a/_config/cache.yml
+++ b/_config/cache.yml
@@ -18,17 +18,14 @@ SilverStripe\Core\Injector\Injector:
       factory: SilverStripe\Core\Cache\CacheFactory
       constructor:
         namespace: "VersionProvider_composerlock"
-        args:
-          disable-container: true
+        disable-container: true
   Psr\SimpleCache\CacheInterface.RateLimiter:
       factory: SilverStripe\Core\Cache\CacheFactory
       constructor:
         namespace: 'ratelimiter'
-        args:
-          disable-container: true
+        disable-container: true
   Psr\SimpleCache\CacheInterface.InheritedPermissions:
     factory: SilverStripe\Core\Cache\CacheFactory
     constructor:
       namespace: "InheritedPermissions"
-      args:
-        disable-container: true
\ No newline at end of file
+      disable-container: true
diff --git a/docs/en/02_Developer_Guides/08_Performance/01_Caching.md b/docs/en/02_Developer_Guides/08_Performance/01_Caching.md
index 91ebcc12b..e6e5d6591 100644
--- a/docs/en/02_Developer_Guides/08_Performance/01_Caching.md
+++ b/docs/en/02_Developer_Guides/08_Performance/01_Caching.md
@@ -39,6 +39,13 @@ SilverStripe\Core\Injector\Injector:
       namespace: "myCache"
 ```
 
+<div class="alert" markdown="1">
+Please note that if you have the `silverstripe/versioned` module installed (automatically installed by the
+`silverstripe/cms` module), caches will automatically be segmented by current “stage”. This ensures that
+any content written to the cache in the _draft_ reading mode isn’t accidentally exposed in the _live_ reading mode.
+Please read the [versioned cache segmentation](#versioned-cache-segmentation) section for more information.
+</div>
+
 Cache objects are instantiated through a [CacheFactory](SilverStripe\Core\Cache\CacheFactory),
 which determines which cache adapter is used (see "Adapters" below for details).
 This factory allows us you to globally define an adapter for all cache instances.  
@@ -209,6 +216,42 @@ SilverStripe\Core\Injector\Injector:
   SilverStripe\Core\Cache\CacheFactory: '%$MemcachedCacheFactory'
 ```
 
+## Versioned cache segmentation
+
+`SilverStripe\Core\Cache\CacheFactory` now maintains separate cache pools for each versioned stage (if you have the
+`silverstripe/versioned` module installed). This prevents developers from caching draft data and then
+accidentally exposing it on the live stage without potentially required authorisation checks. Unless you
+rely on caching across stages, you don't need to change your own code for this change to take effect. Note
+that cache keys will be internally rewritten, causing any existing cache items to become invalid when this
+change is deployed.
+
+```php
+// Before:
+$cache = Injector::inst()->get(CacheInterface::class . '.myapp');
+Versioned::set_stage(Versioned::DRAFT);
+$cache->set('my_key', 'Some draft content. Not for public viewing yet.');
+Versioned::set_stage(Versioned::LIVE);
+$cache->get('my_key'); // 'Some draft content. Not for public viewing yet'
+
+// After:
+$cache = Injector::inst()->get(CacheInterface::class . '.myapp');
+Versioned::set_stage(Versioned::DRAFT);
+$cache->set('my_key', 'Some draft content. Not for public viewing yet.');
+Versioned::set_stage(Versioned::LIVE);
+$cache->get('my_key'); // null
+```
+Data that is not content sensitive can be cached across stages by simply opting out of the segmented cache
+with the `disable-container` argument.
+
+```yaml
+SilverStripe\Core\Injector\Injector:
+  Psr\SimpleCache\CacheInterface.myapp:
+    factory: SilverStripe\Core\Cache\CacheFactory     
+    constructor:
+      namespace: "MyInsensitiveData"
+      disable-container: true 
+``` 
+
 ## Additional Caches
 
 Unfortunately not all caches are configurable via cache adapters.
diff --git a/docs/en/04_Changelogs/4.2.0.md b/docs/en/04_Changelogs/4.2.0.md
index c23c232ee..0180db32c 100644
--- a/docs/en/04_Changelogs/4.2.0.md
+++ b/docs/en/04_Changelogs/4.2.0.md
@@ -198,8 +198,7 @@ SilverStripe\Core\Injector\Injector:
     factory: SilverStripe\Core\Cache\CacheFactory     
     constructor:
       namespace: "MyInsensitiveData"
-      args:
-        disable-container: true 
+      disable-container: true 
 ``` 
 
 ### HTTP Cache Header changes

From dc9d1b9cc0d3b14929fe2675282980a2750fb4cf Mon Sep 17 00:00:00 2001
From: Robbie Averill <robbie@silverstripe.com>
Date: Mon, 28 Jan 2019 11:44:37 +0200
Subject: [PATCH 05/20] FIX GridFieldPrintButton no longer assumes that
 children of GridField would implement their own print template

---
 src/Forms/GridField/GridFieldPrintButton.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/Forms/GridField/GridFieldPrintButton.php b/src/Forms/GridField/GridFieldPrintButton.php
index 758de42c6..8e237eaf2 100644
--- a/src/Forms/GridField/GridFieldPrintButton.php
+++ b/src/Forms/GridField/GridFieldPrintButton.php
@@ -133,7 +133,10 @@ class GridFieldPrintButton implements GridField_HTMLProvider, GridField_ActionPr
         $this->extend('updatePrintData', $data);
 
         if ($data) {
-            return $data->renderWith(get_class($gridField) . "_print");
+            return $data->renderWith([
+                get_class($gridField) . '_print',
+                GridField::class . '_print',
+            ]);
         }
 
         return null;

From d00c59c383dee270c9c1753dd8b64b8cd1b15489 Mon Sep 17 00:00:00 2001
From: Robbie Averill <robbie@silverstripe.com>
Date: Thu, 24 Jan 2019 16:45:38 +0200
Subject: [PATCH 06/20] Fix tests not loading fixtures and loading themes in
 CWP recipe kitchen sink

---
 tests/php/Forms/TreeMultiselectFieldTest.php | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/tests/php/Forms/TreeMultiselectFieldTest.php b/tests/php/Forms/TreeMultiselectFieldTest.php
index 5b2f14a65..e2cc56741 100644
--- a/tests/php/Forms/TreeMultiselectFieldTest.php
+++ b/tests/php/Forms/TreeMultiselectFieldTest.php
@@ -7,11 +7,17 @@ use SilverStripe\Dev\SapphireTest;
 use SilverStripe\Forms\Form;
 use SilverStripe\Forms\FormTemplateHelper;
 use SilverStripe\Forms\TreeMultiselectField;
+use SilverStripe\ORM\Tests\HierarchyTest\TestObject;
+use SilverStripe\View\SSViewer;
 
 class TreeMultiselectFieldTest extends SapphireTest
 {
     protected static $fixture_file = 'TreeDropdownFieldTest.yml';
 
+    protected static $extra_dataobjects = [
+        TestObject::class,
+    ];
+
     protected $formId = 'TheFormID';
     protected $fieldName = 'TestTree';
 
@@ -54,6 +60,9 @@ class TreeMultiselectFieldTest extends SapphireTest
     {
         parent::setUp();
 
+        // Don't let other themes interfere with these tests
+        SSViewer::set_themes([]);
+
         $this->form = $this->buildFormMock();
         $this->field = $this->buildField($this->form);
         $this->folders = $this->loadFolders();

From 0491ca03cfcbd81690c54cc00f6234675978ef39 Mon Sep 17 00:00:00 2001
From: mikeyc7m <mikeyc7m@users.noreply.github.com>
Date: Wed, 12 Dec 2018 17:40:51 +1100
Subject: [PATCH 07/20] FIX prevent death on urls with querystrings & anchors

---
 src/View/Parsers/ShortcodeParser.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/View/Parsers/ShortcodeParser.php b/src/View/Parsers/ShortcodeParser.php
index 0a70ea089..e51cdd12e 100644
--- a/src/View/Parsers/ShortcodeParser.php
+++ b/src/View/Parsers/ShortcodeParser.php
@@ -476,7 +476,7 @@ class ShortcodeParser
 
             if ($tags) {
                 $node->nodeValue = $this->replaceTagsWithText(
-                    $node->nodeValue,
+                    htmlspecialchars($node->nodeValue),
                     $tags,
                     function ($idx, $tag) use ($parser, $extra) {
                         return $parser->getShortcodeReplacementText($tag, $extra, false);

From d116b9a8d25566b918def73c3802c6791cc2da19 Mon Sep 17 00:00:00 2001
From: Robbie Averill <robbie@silverstripe.com>
Date: Tue, 29 Jan 2019 13:14:57 +0200
Subject: [PATCH 08/20] Add test for shortcode parsing with querystring and
 anchor

---
 tests/php/View/Parsers/ShortcodeParserTest.php | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/tests/php/View/Parsers/ShortcodeParserTest.php b/tests/php/View/Parsers/ShortcodeParserTest.php
index 614d920b6..0010ddccb 100644
--- a/tests/php/View/Parsers/ShortcodeParserTest.php
+++ b/tests/php/View/Parsers/ShortcodeParserTest.php
@@ -311,6 +311,15 @@ class ShortcodeParserTest extends SapphireTest
         $this->assertEquals($this->extra['element']->tagName, 'a');
     }
 
+    public function testShortcodeWithAnchorAndQuerystring()
+    {
+        $result = $this->parser->parse('<a href="[test_shortcode]?my-string=this&thing=2#my-anchor">Link</a>');
+
+        $this->assertContains('my-string=this', $result);
+        $this->assertContains('thing=2', $result);
+        $this->assertContains('my-anchor', $result);
+    }
+
     public function testNoParseAttemptIfNoCode()
     {
         $stub = $this->getMockBuilder(ShortcodeParser::class)->setMethods(array('replaceElementTagsWithMarkers'))

From f918dcd36a177adb8abee751d27a809f25a0afab Mon Sep 17 00:00:00 2001
From: Guy Marriott <guy@scopey.co.nz>
Date: Wed, 30 Jan 2019 09:31:13 +1300
Subject: [PATCH 09/20] FIX Escape wildcard characters when matching database
 name in databaseExists

---
 src/ORM/Connect/MySQLSchemaManager.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ORM/Connect/MySQLSchemaManager.php b/src/ORM/Connect/MySQLSchemaManager.php
index 81f661ae2..52d2e7d1e 100644
--- a/src/ORM/Connect/MySQLSchemaManager.php
+++ b/src/ORM/Connect/MySQLSchemaManager.php
@@ -207,7 +207,7 @@ class MySQLSchemaManager extends DBSchemaManager
     public function databaseExists($name)
     {
         // MySQLi doesn't like parameterised queries for some queries
-        $sqlName = $this->database->quoteString($name);
+        $sqlName = addcslashes($this->database->quoteString($name), '%_');
         return !!($this->query("SHOW DATABASES LIKE $sqlName")->value());
     }
 

From 5e7402afee63822d3e4cce8c9f9fbef07423a8b8 Mon Sep 17 00:00:00 2001
From: Aaron Carlino <unclecheese@leftandmain.com>
Date: Wed, 20 Jun 2018 16:46:47 +1200
Subject: [PATCH 10/20] add behat.yml back, pathed to admin

---
 behat.yml | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 behat.yml

diff --git a/behat.yml b/behat.yml
new file mode 100644
index 000000000..77f4c17aa
--- /dev/null
+++ b/behat.yml
@@ -0,0 +1,34 @@
+# Run framework behat tests with this command (installed with silverstripe/installer)
+# Note that framework behat tests require CMS module
+# ========================================================================= #
+# vendor/bin/selenium-server-standalone -Dwebdriver.firefox.bin="/Applications/Firefox31.app/Contents/MacOS/firefox-bin"
+# vendor/bin/serve --bootstrap-file vendor/silverstripe/framework/tests/behat/serve-bootstrap.php
+# vendor/bin/behat @framework
+# ========================================================================= #
+default:
+  suites:
+    framework:
+      paths:
+        - %paths.modules.admin%/tests/behat/features
+      contexts:
+        - SilverStripe\Framework\Tests\Behaviour\FeatureContext
+        - SilverStripe\Framework\Tests\Behaviour\CmsFormsContext
+        - SilverStripe\Framework\Tests\Behaviour\CmsUiContext
+        - SilverStripe\BehatExtension\Context\BasicContext
+        - SilverStripe\BehatExtension\Context\EmailContext
+        - SilverStripe\BehatExtension\Context\LoginContext
+        -
+          SilverStripe\BehatExtension\Context\FixtureContext:
+            - %paths.modules.admin%/tests/behat/features/files/
+
+  extensions:
+    SilverStripe\BehatExtension\MinkExtension:
+      default_session: facebook_web_driver
+      javascript_session: facebook_web_driver
+      facebook_web_driver:
+        browser: chrome
+        wd_host: "http://127.0.0.1:9515" #chromedriver port
+
+    SilverStripe\BehatExtension\Extension:
+      screenshot_path: %paths.base%/artifacts/screenshots
+      bootstrap_file: "tests/behat/serve-bootstrap.php"
\ No newline at end of file

From c222b96af8ca5b5881b124243e68c047b1e2fbbd Mon Sep 17 00:00:00 2001
From: Aaron Carlino <unclecheese@leftandmain.com>
Date: Fri, 8 Feb 2019 14:12:25 +1300
Subject: [PATCH 11/20] DOCS: Fix broken lesson links, add missing lessons

---
 docs/en/01_Tutorials/index.md | 39 +++++++++++++++++++----------------
 1 file changed, 21 insertions(+), 18 deletions(-)

diff --git a/docs/en/01_Tutorials/index.md b/docs/en/01_Tutorials/index.md
index 525dd3bcd..88d0a11e5 100644
--- a/docs/en/01_Tutorials/index.md
+++ b/docs/en/01_Tutorials/index.md
@@ -10,24 +10,27 @@ These tutorials are deprecated, and have been replaced by the new [Lessons](http
 These include video screencasts, written tutorials and code examples to get you started working with SilverStripe websites.
 
 * [How to set up a local development environment in SilverStripe](https://vimeo.com/108861537)
-* [Lesson 1: Creating your first theme](http://www.silverstripe.org/learn/lessons/creating-your-first-theme)
-* [Lesson 2: Migrating static templates into your theme](http://www.silverstripe.org/learn/lessons/migrating-static-templates-into-your-theme)
-* [Lesson 3: Adding dynamic content](http://www.silverstripe.org/learn/lessons/adding-dynamic-content)
-* [Lesson 4: Working with multiple templates](http://www.silverstripe.org/learn/lessons/working-with-multiple-templates)
-* [Lesson 5: The holder/page pattern](http://www.silverstripe.org/learn/lessons/the-holderpage-pattern)
-* [Lesson 6: Adding Custom Fields to a Page](http://www.silverstripe.org/learn/lessons/adding-custom-fields-to-a-page)
-* [Lesson 7: Working with Files and Images](http://www.silverstripe.org/learn/lessons/working-with-files-and-images)
-* [Lesson 8: Introduction to the ORM](http://www.silverstripe.org/learn/lessons/introduction-to-the-orm)
-* [Lesson 9: Data Relationships - $has_many](http://www.silverstripe.org/learn/lessons/working-with-data-relationships-has-many)
-* [Lesson 10: Introduction to the ORM](http://www.silverstripe.org/learn/lessons/working-with-data-relationships-many-many)
-* [Lesson 11: Introduction to frontend forms](http://www.silverstripe.org/learn/lessons/introduction-to-frontend-forms)
-* [Lesson 12: Data Extensions and SiteConfig](http://www.silverstripe.org/learn/lessons/data-extensions-and-siteconfig)
-* [Lesson 13: Introduction to ModelAdmin](http://www.silverstripe.org/learn/lessons/introduction-to-modeladmin)
-* [Lesson 14: Controller Actions/DataObjects as Pages](http://www.silverstripe.org/learn/lessons/controller-actions-dataobjects-as-pages)
-* [Lesson 15: Building a Search Form](http://www.silverstripe.org/learn/lessons/building-a-search-form)
-* [Lesson 16: Lists and Pagination](http://www.silverstripe.org/learn/lessons/lists-and-pagination)
-* [Lesson 17: Ajax Behaviour and Viewable Data](http://www.silverstripe.org/learn/lessons/ajax-behaviour-and-viewabledata)
-* [Lesson 18: Dealing with Arbitrary Template Data](http://www.silverstripe.org/learn/lessons/dealing-with-arbitrary-template-data)
+* [Lesson 1: Creating your first project](https://www.silverstripe.org/learn/lessons/v4/creating-your-first-project)
+* [Lesson 2: Migrating static templates into your theme](https://www.silverstripe.org/learn/lessons/v4/migrating-static-templates-into-your-theme-1)
+* [Lesson 3: Adding dynamic content](https://www.silverstripe.org/learn/lessons/v4/adding-dynamic-content-1)
+* [Lesson 4: Working with multiple templates](https://www.silverstripe.org/learn/lessons/v4/working-with-multiple-templates-1)
+* [Lesson 5: The holder/page pattern](https://www.silverstripe.org/learn/lessons/v4/the-holderpage-pattern-1)
+* [Lesson 6: Adding Custom Fields to a Page](https://www.silverstripe.org/learn/lessons/v4/adding-custom-fields-to-a-page-1)
+* [Lesson 7: Working with Files and Images](https://www.silverstripe.org/learn/lessons/v4/working-with-files-and-images-1)
+* [Lesson 8: Introduction to the ORM](https://www.silverstripe.org/learn/lessons/v4/introduction-to-the-orm-1)
+* [Lesson 9: Data Relationships - $has_many](https://www.silverstripe.org/learn/lessons/v4/working-with-data-relationships-has-many-1)
+* [Lesson 10: Data Relationships - $many_many](https://www.silverstripe.org/learn/lessons/v4/working-with-data-relationships-many-many-1)
+* [Lesson 11: Introduction to frontend forms](https://www.silverstripe.org/learn/lessons/v4/introduction-to-frontend-forms-1)
+* [Lesson 12: Data Extensions and SiteConfig](https://www.silverstripe.org/learn/lessons/v4/data-extensions-and-siteconfig-1)
+* [Lesson 13: Introduction to ModelAdmin](https://www.silverstripe.org/learn/lessons/v4/introduction-to-modeladmin-1)
+* [Lesson 14: Controller Actions/DataObjects as Pages](https://www.silverstripe.org/learn/lessons/v4/controller-actions-dataobjects-as-pages-1)
+* [Lesson 15: Building a Search Form](https://www.silverstripe.org/learn/lessons/v4/building-a-search-form-1)
+* [Lesson 16: Lists and Pagination](https://www.silverstripe.org/learn/lessons/v4/lists-and-pagination-1)
+* [Lesson 17: Ajax Behaviour and Viewable Data](https://www.silverstripe.org/learn/lessons/v4/ajax-behaviour-and-viewabledata-1)
+* [Lesson 18: Dealing with Arbitrary Template Data](https://www.silverstripe.org/learn/lessons/v4/dealing-with-arbitrary-template-data-1)
+* [Lesson 19: Creating Filtered Views](https://www.silverstripe.org/learn/lessons/v4/creating-filtered-views-1)
+* [Lesson 20: Beyond the ORM: Building Custom SQL](https://www.silverstripe.org/learn/lessons/v4/beyond-the-orm-building-custom-sql-1)
+* [Lesson 21: Advanced Environment Configuration](https://www.silverstripe.org/learn/lessons/v4/advanced-environment-configuration-1)
 
 ## Help: If you get stuck
 

From 1aa98e77d306ef232184e4ca24fc16eecb652330 Mon Sep 17 00:00:00 2001
From: Aaron Carlino <unclecheese@leftandmain.com>
Date: Tue, 12 Feb 2019 16:49:43 +1300
Subject: [PATCH 12/20] Update translations

---
 lang/da.yml |  15 -------
 lang/de.yml | 127 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 lang/eo.yml |  15 -------
 lang/nl.yml |  19 +-------
 4 files changed, 129 insertions(+), 47 deletions(-)

diff --git a/lang/da.yml b/lang/da.yml
index 4fc3ade6f..e203c1876 100644
--- a/lang/da.yml
+++ b/lang/da.yml
@@ -84,7 +84,6 @@ da:
     RelationSearch: Relationssøgning
     ResetFilter: Nulstil
   SilverStripe\Forms\GridField\GridFieldDeleteAction:
-    DELETE_DESCRIPTION: Slet
     Delete: Slet
     DeletePermissionsFailure: 'Ingen slette rettigheder'
     EditPermissionsFailure: 'Ingen rettighed til at fjerne emnet'
@@ -96,23 +95,12 @@ da:
     DeletePermissionsFailure: 'Ingen slette rettigheder'
     Deleted: 'Slet {type} {name}'
     Save: Gem
-  SilverStripe\Forms\GridField\GridFieldEditButton_ss:
-    EDIT: Rediger
   SilverStripe\Forms\GridField\GridFieldGroupDeleteAction:
     UnlinkSelfFailure: 'Kan ikke fjerne dig selv fra denne gruppe, du vil miste administrator rettigheder'
   SilverStripe\Forms\GridField\GridFieldPaginator:
     OF: af
     Page: Side
     View: Vis
-  SilverStripe\Forms\GridField\GridFieldVersionedState:
-    ADDEDTODRAFTHELP: 'Elementet er endnu ikke udgivet'
-    ADDEDTODRAFTSHORT: Kladde
-    ARCHIVEDPAGEHELP: 'Elementet er fjernet fra kladde og udgivet version'
-    ARCHIVEDPAGESHORT: Arkiveret
-    MODIFIEDONDRAFTHELP: 'Elementet har ikke udgivne ændringer'
-    MODIFIEDONDRAFTSHORT: Ændret
-    ONLIVEONLYSHORT: 'Kun på udgivet version'
-    ONLIVEONLYSHORTHELP: 'Elementet er udgivet, men er slette fra kladde'
   SilverStripe\Forms\MoneyField:
     FIELDLABELAMOUNT: Beløb
     FIELDLABELCURRENCY: Valuta
@@ -331,7 +319,4 @@ da:
     LOGOUT: 'Log ud'
     LOSTPASSWORDHEADER: 'Glemt kodeord'
     NOTEPAGESECURED: 'Denne side er beskyttet. Indtast dine loginoplysninger herunder for at få adgang.'
-    NOTERESETLINKINVALID: '<p>Kodeordets nulstillingslink er ugyldigt eller udløbet.</p><p>Du kan anmode om et nyt link <a href="{link1}">her</a> eller skifte dit kodeord efter du er <a href="{link2}">logget ind</a>.</p>'
     NOTERESETPASSWORD: 'Indtast din email adresse, så sender vi dig et link som du kan nulstille dit kodeord med'
-    PASSWORDSENTHEADER: 'Link til nulstilling af kodeord er sendt til ''{email}'''
-    PASSWORDSENTTEXT: 'Tak for det! Et link til at nulstille kodeordet er sendt til ''{email}'', forudsat at en konto eksisterer med denne email adresse.'
diff --git a/lang/de.yml b/lang/de.yml
index 77e2f1584..cf8aa4518 100644
--- a/lang/de.yml
+++ b/lang/de.yml
@@ -1,10 +1,35 @@
 de:
+  SilverStripe\Admin\LeftAndMain:
+    VersionUnknown: unbekannt
+  SilverStripe\AssetAdmin\Forms\UploadField:
+    Dimensions: Dimensionen
+    EDIT: Bearbeiten
+    EDITINFO: 'Diese Datei bearbeiten'
+    REMOVE: Entfernen
+  SilverStripe\Control\ChangePasswordEmail_ss:
+    CHANGEPASSWORDTEXT1: 'Sie haben Ihr Passwort geändert für'
+    CHANGEPASSWORDTEXT3: 'Passwort ändern'
+    HELLO: Hallo
+  SilverStripe\Control\Email\ForgotPasswordEmail_ss:
+    HELLO: Hallo
+    TEXT1: 'Hier ist Ihr'
+    TEXT2: 'Link zum Zurücksetzen des Passworts'
+    TEXT3: für
+  SilverStripe\Control\RequestProcessor:
+    INVALID_REQUEST: 'Ungültige Anfrage'
+    REQUEST_ABORTED: 'Anfrage abgebrochen'
+  SilverStripe\Core\Manifest\VersionProvider:
+    VERSIONUNKNOWN: Unbekannt
   SilverStripe\Forms\CheckboxField:
     NOANSWER: Nein
     YESANSWER: Ja
+  SilverStripe\Forms\CheckboxSetField_ss:
+    NOOPTIONSAVAILABLE: 'Keine Optionen verfügbar'
   SilverStripe\Forms\ConfirmedPasswordField:
     ATLEAST: 'Passwörter müssen mindestens {min} Zeichen lang sein.'
     BETWEEN: 'Passwörter müssen zwischen {min} und {max} Zeichen lang sein.'
+    CURRENT_PASSWORD_ERROR: 'Das derzeitige Passwort ist nicht richtig.'
+    CURRENT_PASSWORD_MISSING: 'Bitte geben Sie Ihr derzeitiges Passwort ein.'
     LOGGED_IN_ERROR: 'Sie müssen eingeloggt sein, um Ihr Passwort ändern zu können!'
     MAXIMUM: 'Passwörter dürfen maximal {max} Zeichen lang sein.'
     SHOWONCLICKTITLE: 'Passwort ändern'
@@ -14,12 +39,18 @@ de:
     VALIDDATEFORMAT2: 'Bitte geben sie das Datum im korrekten Format ein ({format})'
     VALIDDATEMAXDATE: 'Ihr Datum muss vor dem erlaubtem Datum ({date}) liegen oder gleich sein'
     VALIDDATEMINDATE: 'Ihr Datum muss nach dem erlaubtem Datum ({date}) liegen oder gleich sein'
+  SilverStripe\Forms\DatetimeField:
+    VALIDDATEMAXDATETIME: 'Ihr Datum muss vor dem erlaubtem Datum ({datetime}) liegen oder gleich sein'
+    VALIDDATETIMEFORMAT: 'Bitte geben Sie ein gültiges Datums- und Zeitformat ein  ({format})'
+    VALIDDATETIMEMINDATE: 'Ihr Datum muss nach dem erlaubtem Datum ({datetime}) liegen oder gleich sein'
   SilverStripe\Forms\DropdownField:
     CHOOSE: (Auswahl)
     CHOOSE_MODEL: '({name} auswählen)'
     SOURCE_VALIDATION: 'Bitte wählen Sie aus der Liste. {value} ist kein gültiger Wert'
   SilverStripe\Forms\EmailField:
     VALIDATION: 'Bitte geben Sie eine E-Mail-Adresse ein'
+  SilverStripe\Forms\FileUploadReceiver:
+    FIELDNOTSET: 'Dateiinformation nicht gefunden'
   SilverStripe\Forms\Form:
     CSRF_EXPIRED_MESSAGE: 'Ihre Sitzung ist abgelaufen. Bitte schicken Sie das Formular erneut ab.'
     CSRF_FAILED_MESSAGE: 'Es gab ein technisches Problem. Bitte versuchen Sie es erneut, nachdem sie die vorherige Seite neu geladen haben.'
@@ -29,10 +60,14 @@ de:
     VALIDATOR: Prüfer
     VALIDCURRENCY: 'Bitte geben Sie einen korrekten Betrag ein'
   SilverStripe\Forms\FormField:
+    EXAMPLE: 'z.B. {format}'
     NONE: keine
+  SilverStripe\Forms\FormScaffolder:
+    TABMAIN: Hauptteil
   SilverStripe\Forms\GridField\GridField:
     Add: '{name} hinzufügen'
     CSVEXPORT: 'Als CSV-Datei exportieren'
+    CSVIMPORT: 'CSV importieren'
     Filter: Filter
     FilterBy: 'Filtern nach'
     Find: Suchen
@@ -58,9 +93,18 @@ de:
     DeletePermissionsFailure: 'Keine Berechtigungen zum löschen'
     Deleted: 'Gelöscht {type} {name}'
     Save: Speichern
+  SilverStripe\Forms\GridField\GridFieldEditButton:
+    EDIT: Bearbeiten
+  SilverStripe\Forms\GridField\GridFieldPaginator:
+    OF: von
+    Page: Seite
+    View: Anzeigen
   SilverStripe\Forms\MoneyField:
     FIELDLABELAMOUNT: Betrag
     FIELDLABELCURRENCY: Währung
+    INVALID_CURRENCY: 'Währung {currency} ist nicht in der Liste der erlaubten Währungen'
+  SilverStripe\Forms\MultiSelectField:
+    SOURCE_VALIDATION: 'Bitte wählen Sie aus der Liste. {value} ist ungültig.'
   SilverStripe\Forms\NullableField:
     IsNullLabel: 'ist NULL'
   SilverStripe\Forms\NumericField:
@@ -69,19 +113,45 @@ de:
     VALIDATEFORMAT: 'Bitte geben Sie die Uhrzeit im korrekten Format ein ({format})'
   SilverStripe\ORM\DataObject:
     PLURALNAME: DatenObjekte
+    PLURALS:
+      one: 'Ein DatenObjekt'
+      other: '{count} DatenObjekte'
     SINGULARNAME: DatenObjekt
   SilverStripe\ORM\FieldType\DBBoolean:
     ANY: alle
     NOANSWER: Nein
     YESANSWER: Ja
   SilverStripe\ORM\FieldType\DBDate:
+    DAYS_SHORT_PLURALS:
+      one: '{count} Tag'
+      other: '{count} Tage'
+    HOURS_SHORT_PLURALS:
+      one: '{count} Stunde'
+      other: '{count} Stunden'
     LessThanMinuteAgo: 'weniger als eine Minute'
+    MINUTES_SHORT_PLURALS:
+      one: '{count} Minute'
+      other: '{count} Minuten'
+    MONTHS_SHORT_PLURALS:
+      one: '{count} Monat'
+      other: '{count} Monate'
+    SECONDS_SHORT_PLURALS:
+      one: '{count} Sekunde'
+      other: '{count} Sekunden'
     TIMEDIFFAGO: 'vor {difference}'
     TIMEDIFFIN: 'in {difference}'
+    YEARS_SHORT_PLURALS:
+      one: '{count} Jahr'
+      other: '{count} Jahre'
   SilverStripe\ORM\FieldType\DBEnum:
     ANY: alle
+  SilverStripe\ORM\Hierarchy:
+    LIMITED_TITLE: 'Zu viele Kindelemente ({count})'
   SilverStripe\ORM\Hierarchy\Hierarchy:
     InfiniteLoopNotAllowed: 'Es wurde eine Endlosschleife innerhalb der "{type}"-Hierarchie gefunden. Bitte ändern Sie die übergeordnete Seite, um den Fehler zu beheben'
+    LIMITED_TITLE: 'Zu viele Kindelemente ({count})'
+  SilverStripe\ORM\ValidationException:
+    DEFAULT_ERROR: Validierungsfehler
   SilverStripe\Security\BasicAuth:
     ENTERINFO: 'Bitte geben Sie einen Nutzernamen und ein Passwort ein'
     ERRORNOTADMIN: 'Dieser Nutzer ist kein Administrator'
@@ -90,28 +160,46 @@ de:
     PASSWORDEXPIRED: '<p>Ihr Passwort ist abgelaufen. <a target="_top" href="{link}">Bitte wählen Sie ein neues Passwort.</a></p>'
   SilverStripe\Security\CMSSecurity:
     INVALIDUSER: '<p>Ungültiger Benutzer. <a target="_top" href="{link}">Bitte melden Sie sich hier an</a> um fortzufahren.</p>'
+    LOGIN_MESSAGE: '<p>Ihre Sitzung ist wegen Inaktivität abgelaufen.</p>'
     SUCCESS: Erfolg
     SUCCESSCONTENT: '<p>Login erfolgreich. Falls Sie nicht automatisch weitergeleitet werden, bitte <a target="_top" href="{link}">hier klicken</a></p>'
+    SUCCESS_TITLE: 'Login erfolgreich'
+  SilverStripe\Security\DefaultAdminService:
+    DefaultAdminFirstname: Standardadmin
   SilverStripe\Security\Group:
     AddRole: 'Rolle zur Gruppe hinzufügen'
     Code: 'Gruppen Code'
     DefaultGroupTitleAdministrators: Administratoren
     DefaultGroupTitleContentAuthors: Inhaltsautoren
     Description: Beschreibung
+    GROUPNAME: Gruppenname
     GroupReminder: 'Diese Gruppe übernimmt automatisch die Rollen der Elterngruppe'
     HierarchyPermsError: 'Kann Berechtigungen der Eltern-Gruppe "{group}" nicht hinzufügen (erfordert Administratorrechte)'
     Locked: 'Gesperrt?'
+    MEMBERS: Mitglieder
+    NEWGROUP: 'Neue Gruppe'
     NoRoles: 'Keine Rollen gefunden'
+    PERMISSIONS: Berechtigungen
     PLURALNAME: Gruppen
+    PLURALS:
+      one: 'Eine Gruppe'
+      other: '{count} Gruppen'
     Parent: Elterngruppe
+    ROLES: Rollen
+    ROLESDESCRIPTION: 'Hier können Sie der Gruppe Rollen zuweisen.<br />Rollen sind logische Gruppierungen von Berechtigungen.'
     RolesAddEditLink: 'Rollen hinzufügen/editieren'
     SINGULARNAME: Gruppe
     Sort: Sortierreihenfolge
     has_many_Permissions: Berechtigungen
     many_many_Members: Mitglieder
   SilverStripe\Security\LoginAttempt:
+    Email: E-Mail-Adresse
+    EmailHashed: 'E-Mail-Adresse (gehashed)'
     IP: IP-Adresse
     PLURALNAME: Loginversuche
+    PLURALS:
+      one: 'Ein Loginversuch'
+      other: '{count} Loginversuche'
     SINGULARNAME: Loginversuch
     Status: Status
   SilverStripe\Security\Member:
@@ -119,6 +207,7 @@ de:
     BUTTONCHANGEPASSWORD: 'Passwort ändern'
     BUTTONLOGIN: Einloggen
     BUTTONLOGINOTHER: 'Als jemand anderes einloggen'
+    BUTTONLOGOUT: Abmelden
     BUTTONLOSTPASSWORD: 'Ich habe mein Passwort vergessen'
     CONFIRMNEWPASSWORD: 'Neues Passwort bestätigen'
     CONFIRMPASSWORD: 'Passwort bestätigen'
@@ -139,6 +228,10 @@ de:
     PASSWORD: Passwort
     PASSWORDEXPIRED: 'Ihr Passwort ist abgelaufen. Bitte wählen Sie ein neues Passwort.'
     PLURALNAME: Benutzer
+    PLURALS:
+      one: 'Ein Mitglied'
+      other: '{count}  Mitglieder'
+    REMEMBERME: 'Für das nächste Mal merken? (für {count} Tage auf diesem Gerät)'
     SINGULARNAME: Benutzer
     SUBJECTPASSWORDCHANGED: 'Ihr Passwort wurde geändert'
     SUBJECTPASSWORDRESET: 'Ihr Link zur Passwortrücksetzung'
@@ -151,8 +244,21 @@ de:
     db_LockedOutUntil: 'Gesperrt bis'
     db_Password: Passwort
     db_PasswordExpiry: 'Ablaufdatum des Passworts'
+  SilverStripe\Security\MemberAuthenticator\CMSMemberLoginForm:
+    AUTHENTICATORNAME: 'CMS Benutzer Login Formular'
+    BUTTONFORGOTPASSWORD: 'Passwort vergessen'
+    BUTTONLOGIN: 'Wieder einloggen'
+    BUTTONLOGOUT: Abmelden
+  SilverStripe\Security\MemberAuthenticator\MemberAuthenticator:
+    ERRORWRONGCRED: 'Ihre Eingaben scheinen nicht richtig zu sein. Bitte versuchen Sie es erneut.'
+    NoPassword: 'Dieser Benutzer hat kein Passwort.'
+  SilverStripe\Security\MemberAuthenticator\MemberLoginForm:
+    AUTHENTICATORNAME: 'E-Mail & Passwort'
   SilverStripe\Security\MemberPassword:
     PLURALNAME: Benutzerpasswörter
+    PLURALS:
+      one: 'Ein Benutzerpasswort'
+      other: '{count} Benutzerpasswörter'
     SINGULARNAME: Benutzerpasswort
   SilverStripe\Security\PasswordValidator:
     LOWCHARSTRENGTH: 'Bitte erhöhen Sie die Sicherheit des Passworts, indem Sie auch einige der folgenden Zeichen verwenden: {chars}'
@@ -160,10 +266,15 @@ de:
     TOOSHORT: 'Das Passwort ist zu kurz, es muss mindestens {minimum} Zeichen lang sein'
   SilverStripe\Security\Permission:
     AdminGroup: Administrator
+    CMS_ACCESS_CATEGORY: 'CMS Zugriff'
     CONTENT_CATEGORY: Inhaltsberechtigungen
     FULLADMINRIGHTS: 'Unbeschränkte Administratorenrechte'
     FULLADMINRIGHTS_HELP: 'Schließt alle anderen verfügbaren Berechtigungen ein'
+    PERMISSIONS_CATEGORY: 'Rollen und Zugriffsberechtigungen'
     PLURALNAME: Berechtigungen
+    PLURALS:
+      one: 'Eine Berechtigung'
+      other: '{count} Berechtigungen'
     SINGULARNAME: Zugriffsberechtigung
     UserPermissionsIntro: 'Durch das Hinzufügen von Benutzern zu Gruppen, werden dessen Rechte angepasst. Mehr Informationen über die Berechtigungen der einzelnen Gruppen erhältst Du im Abschnitt Gruppen.'
   SilverStripe\Security\PermissionCheckboxSetField:
@@ -174,12 +285,24 @@ de:
   SilverStripe\Security\PermissionRole:
     OnlyAdminCanApply: 'Nur Adminstratoren können beitreten'
     PLURALNAME: Rollen
+    PLURALS:
+      one: 'Eine Rolle'
+      other: '{count} Rollen'
     SINGULARNAME: Rolle
     Title: Titel
   SilverStripe\Security\PermissionRoleCode:
     PLURALNAME: Berechtigungsrollencodes
+    PLURALS:
+      one: 'Ein Berechtigungsrollencode'
+      other: '{count} Berechtigungsrollencodes'
     PermsError: 'Kann Berechtigungen dem Code "{code}" nicht hinzufügen (erfordert Administratorrechte)'
     SINGULARNAME: Berechtigungsrollencode
+  SilverStripe\Security\RememberLoginHash:
+    PLURALNAME: 'Login Hashes'
+    PLURALS:
+      one: 'Ein Login Hash'
+      other: '{count} Login Hashes'
+    SINGULARNAME: 'Login Hash'
   SilverStripe\Security\Security:
     ALREADYLOGGEDIN: 'Sie haben keinen Zugriff auf diese Seite. Wenn Sie ein anderes Konto besitzen, mit dem Sie auf diese Seite zugreifen können, melden Sie sich bitte unten an.'
     BUTTONSEND: 'Senden Sie mir den Link zur Passwortrücksetzung'
@@ -188,6 +311,10 @@ de:
     ENTERNEWPASSWORD: 'Bitte geben Sie ein neues Passwort ein'
     ERRORPASSWORDPERMISSION: 'Sie müssen eingeloggt sein, um Ihr Passwort ändern zu können!'
     LOGIN: Anmelden
+    LOGOUT: Abmelden
     LOSTPASSWORDHEADER: 'Passwort vergessen'
     NOTEPAGESECURED: 'Diese Seite ist geschützt. Bitte melden Sie sich an und Sie werden sofort weitergeleitet.'
+    NOTERESETLINKINVALID: '<p>Der Link zum Zurücksetzen des Passworts ist entweder nicht korrekt oder abgelaufen</p><p>Sie können <a href="{link1}">einen neuen Link anfordern</a> oder Ihr Passwort nach dem <a href="{link2}">einloggen</a> ändern.</p>'
     NOTERESETPASSWORD: 'Geben Sie Ihre E-Mail-Adresse ein und wir werden Ihnen einen Link zuschicken, mit dem Sie Ihr Passwort zurücksetzen können.'
+    PASSWORDRESETSENTHEADER: 'Der Link zum Zurücksetzen des Passworts wurde gesendet'
+    PASSWORDRESETSENTTEXT: 'Vielen Dank! Wenn ein Account zu der E-Mail Adresse existiert, wurde eine E-Mail mit dem Link zum Zurücksetzen des Passworts verschickt.'
diff --git a/lang/eo.yml b/lang/eo.yml
index 206dffc1d..cc792bab4 100644
--- a/lang/eo.yml
+++ b/lang/eo.yml
@@ -84,7 +84,6 @@ eo:
     RelationSearch: 'Serĉi rilatojn'
     ResetFilter: Restartigi
   SilverStripe\Forms\GridField\GridFieldDeleteAction:
-    DELETE_DESCRIPTION: Forigi
     Delete: Forigi
     DeletePermissionsFailure: 'Mankas permeso forigi'
     EditPermissionsFailure: 'Mankas permeso malligi rikordon'
@@ -96,23 +95,12 @@ eo:
     DeletePermissionsFailure: 'Mankas permeso forigi'
     Deleted: 'Forigita {type} {name}'
     Save: Konservi
-  SilverStripe\Forms\GridField\GridFieldEditButton_ss:
-    EDIT: Redakti
   SilverStripe\Forms\GridField\GridFieldGroupDeleteAction:
     UnlinkSelfFailure: 'Ne povas forigi vin el ĉi tiu grupo; vi perdus administrajn rajtojn'
   SilverStripe\Forms\GridField\GridFieldPaginator:
     OF: de
     Page: Paĝo
     View: Vido
-  SilverStripe\Forms\GridField\GridFieldVersionedState:
-    ADDEDTODRAFTHELP: 'Ero ankoraŭ estas ne publikigita'
-    ADDEDTODRAFTSHORT: Malneto
-    ARCHIVEDPAGEHELP: 'Ero estas forigita el malneta kaj publika'
-    ARCHIVEDPAGESHORT: Enarkivigita
-    MODIFIEDONDRAFTHELP: 'Ero enhavas nepublikigitajn ŝanĝojn'
-    MODIFIEDONDRAFTSHORT: Ŝanĝita
-    ONLIVEONLYSHORT: 'Nur ĉe publika'
-    ONLIVEONLYSHORTHELP: 'Ero estas publikigita, sed ĝi estas forigita el malneto'
   SilverStripe\Forms\MoneyField:
     FIELDLABELAMOUNT: Kvanto
     FIELDLABELCURRENCY: Kurzo
@@ -331,7 +319,4 @@ eo:
     LOGOUT: Elsaluti
     LOSTPASSWORDHEADER: 'Perdis pasvorton'
     NOTEPAGESECURED: 'Tiu paĝo estas sekurigita.  Enigu viajn akreditaĵojn sube kaj vi aliros pluen.'
-    NOTERESETLINKINVALID: '<p>La pasvorta reagorda ligilo estas malvalida aŭ finiĝis.</p><p>Vi povas peti novan <a href="{link1}">ĉi tie</a> aŭ ŝanĝi vian pasvorton post <a href="{link2}">vi ensalutis</a>.</p>'
     NOTERESETPASSWORD: 'Enigu vian retpoŝtan adreson kaj ni sendos al vi ligilon per kiu vi povas reagordi vian pasvorton'
-    PASSWORDSENTHEADER: 'Pasvorta reagorda ligilo sendiĝis al ''{email}'''
-    PASSWORDSENTTEXT: 'Dankon! Reagordita ligilo sendiĝis al ''{email}'', kondiĉe ke konto ekzistas por tiu retadreso.'
diff --git a/lang/nl.yml b/lang/nl.yml
index eae378c9d..f23bc5ef1 100644
--- a/lang/nl.yml
+++ b/lang/nl.yml
@@ -84,7 +84,6 @@ nl:
     RelationSearch: 'Zoek relatie'
     ResetFilter: Resetten
   SilverStripe\Forms\GridField\GridFieldDeleteAction:
-    DELETE_DESCRIPTION: Verwijder
     Delete: Verwijder
     DeletePermissionsFailure: 'Onvoldoende rechten om te verwijderen'
     EditPermissionsFailure: 'Geen toelating om te ontkoppelen'
@@ -96,23 +95,12 @@ nl:
     DeletePermissionsFailure: 'Onvoldoende rechten om te verwijderen'
     Deleted: '{type} {name} verwijderd'
     Save: Opslaan
-  SilverStripe\Forms\GridField\GridFieldEditButton_ss:
-    EDIT: Edit
   SilverStripe\Forms\GridField\GridFieldGroupDeleteAction:
     UnlinkSelfFailure: 'U kunt uzelf niet verwijderen van deze groep, omdat u dan geen admin-rechten meer heeft.'
   SilverStripe\Forms\GridField\GridFieldPaginator:
     OF: van
     Page: Pagina
     View: Bekijk
-  SilverStripe\Forms\GridField\GridFieldVersionedState:
-    ADDEDTODRAFTHELP: 'Item is nog niet gepubliceerd'
-    ADDEDTODRAFTSHORT: Concept
-    ARCHIVEDPAGEHELP: 'Het item is verwijderd van de concept- en de live site'
-    ARCHIVEDPAGESHORT: Gearchiveerd
-    MODIFIEDONDRAFTHELP: 'Item heeft wijzigingen die nog niet gepubliceerd zijn'
-    MODIFIEDONDRAFTSHORT: Aangepast
-    ONLIVEONLYSHORT: 'Alleen op de live site'
-    ONLIVEONLYSHORTHELP: 'Item is gepubliceerd, maar verwijderd van de concept site'
   SilverStripe\Forms\MoneyField:
     FIELDLABELAMOUNT: Aantal
     FIELDLABELCURRENCY: Munteenheid
@@ -174,8 +162,8 @@ nl:
     PASSWORDEXPIRED: '<p>Uw wachtwoord is verlopen. <a target="_top" href="{link}">Kies een nieuw wachtwoord.</a></p>'
   SilverStripe\Security\CMSSecurity:
     INVALIDUSER: '<p>Ongeldige gebruiker <a target="_top" href="{link}">Log hier opnieuw in</a> om verder te gaan.</p>'
-    LOGIN_MESSAGE: 'Sessie is verlopen'
-    LOGIN_TITLE: '<p>U kunt verder met wat u aan het doen was, door opnieuw in te loggen.</p>'
+    LOGIN_MESSAGE: '<p>De browsersessie is verlopen wegens inactiviteit</p>'
+    LOGIN_TITLE: 'Log opnieuw in om verder te gaan.'
     SUCCESS: Succes
     SUCCESSCONTENT: '<p>U bent ingelogd. <a target="_top" href="{link}">Klik hier</a> als u niet automatisch wordt doorgestuurd.</p>'
     SUCCESS_TITLE: 'Inloggen is gelukt'
@@ -331,7 +319,4 @@ nl:
     LOGOUT: Uitloggen
     LOSTPASSWORDHEADER: 'Wachtwoord vergeten'
     NOTEPAGESECURED: 'Deze pagina is beveiligd. Voer uw gegevens in en u wordt automatisch doorgestuurd.'
-    NOTERESETLINKINVALID: '<p>De link om uw wachtwoord te kunnen wijzigen is niet meer geldig.</p><p>U kunt <a href="{link1}">een nieuwe link aanvragen</a> of uw wachtwoord aanpassen door <a href="{link2}">in te loggen</a>.</p>'
     NOTERESETPASSWORD: 'Voer uw e-mailadres in en we sturen een link waarmee u een nieuw wachtwoord kunt instellen.'
-    PASSWORDSENTHEADER: 'Wachtwoord herstel link verzonden naar {email}'
-    PASSWORDSENTTEXT: 'Bedankt! Er is een link verstuurd naar {email} om uw wachtwoord opnieuw in te stellen, in de veronderstelling dat er een account bestaat voor dit e-mailadres.'

From 3e78a4e851fdd36739cc837d907f24c2e0a79746 Mon Sep 17 00:00:00 2001
From: Aaron Carlino <unclecheese@leftandmain.com>
Date: Tue, 12 Feb 2019 16:49:52 +1300
Subject: [PATCH 13/20] Update translations

---
 lang/da.yml |  15 -------
 lang/de.yml | 127 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 lang/en.yml |   9 ----
 lang/eo.yml |  15 -------
 lang/nl.yml |  19 +-------
 5 files changed, 129 insertions(+), 56 deletions(-)

diff --git a/lang/da.yml b/lang/da.yml
index 4fc3ade6f..e203c1876 100644
--- a/lang/da.yml
+++ b/lang/da.yml
@@ -84,7 +84,6 @@ da:
     RelationSearch: Relationssøgning
     ResetFilter: Nulstil
   SilverStripe\Forms\GridField\GridFieldDeleteAction:
-    DELETE_DESCRIPTION: Slet
     Delete: Slet
     DeletePermissionsFailure: 'Ingen slette rettigheder'
     EditPermissionsFailure: 'Ingen rettighed til at fjerne emnet'
@@ -96,23 +95,12 @@ da:
     DeletePermissionsFailure: 'Ingen slette rettigheder'
     Deleted: 'Slet {type} {name}'
     Save: Gem
-  SilverStripe\Forms\GridField\GridFieldEditButton_ss:
-    EDIT: Rediger
   SilverStripe\Forms\GridField\GridFieldGroupDeleteAction:
     UnlinkSelfFailure: 'Kan ikke fjerne dig selv fra denne gruppe, du vil miste administrator rettigheder'
   SilverStripe\Forms\GridField\GridFieldPaginator:
     OF: af
     Page: Side
     View: Vis
-  SilverStripe\Forms\GridField\GridFieldVersionedState:
-    ADDEDTODRAFTHELP: 'Elementet er endnu ikke udgivet'
-    ADDEDTODRAFTSHORT: Kladde
-    ARCHIVEDPAGEHELP: 'Elementet er fjernet fra kladde og udgivet version'
-    ARCHIVEDPAGESHORT: Arkiveret
-    MODIFIEDONDRAFTHELP: 'Elementet har ikke udgivne ændringer'
-    MODIFIEDONDRAFTSHORT: Ændret
-    ONLIVEONLYSHORT: 'Kun på udgivet version'
-    ONLIVEONLYSHORTHELP: 'Elementet er udgivet, men er slette fra kladde'
   SilverStripe\Forms\MoneyField:
     FIELDLABELAMOUNT: Beløb
     FIELDLABELCURRENCY: Valuta
@@ -331,7 +319,4 @@ da:
     LOGOUT: 'Log ud'
     LOSTPASSWORDHEADER: 'Glemt kodeord'
     NOTEPAGESECURED: 'Denne side er beskyttet. Indtast dine loginoplysninger herunder for at få adgang.'
-    NOTERESETLINKINVALID: '<p>Kodeordets nulstillingslink er ugyldigt eller udløbet.</p><p>Du kan anmode om et nyt link <a href="{link1}">her</a> eller skifte dit kodeord efter du er <a href="{link2}">logget ind</a>.</p>'
     NOTERESETPASSWORD: 'Indtast din email adresse, så sender vi dig et link som du kan nulstille dit kodeord med'
-    PASSWORDSENTHEADER: 'Link til nulstilling af kodeord er sendt til ''{email}'''
-    PASSWORDSENTTEXT: 'Tak for det! Et link til at nulstille kodeordet er sendt til ''{email}'', forudsat at en konto eksisterer med denne email adresse.'
diff --git a/lang/de.yml b/lang/de.yml
index 77e2f1584..cf8aa4518 100644
--- a/lang/de.yml
+++ b/lang/de.yml
@@ -1,10 +1,35 @@
 de:
+  SilverStripe\Admin\LeftAndMain:
+    VersionUnknown: unbekannt
+  SilverStripe\AssetAdmin\Forms\UploadField:
+    Dimensions: Dimensionen
+    EDIT: Bearbeiten
+    EDITINFO: 'Diese Datei bearbeiten'
+    REMOVE: Entfernen
+  SilverStripe\Control\ChangePasswordEmail_ss:
+    CHANGEPASSWORDTEXT1: 'Sie haben Ihr Passwort geändert für'
+    CHANGEPASSWORDTEXT3: 'Passwort ändern'
+    HELLO: Hallo
+  SilverStripe\Control\Email\ForgotPasswordEmail_ss:
+    HELLO: Hallo
+    TEXT1: 'Hier ist Ihr'
+    TEXT2: 'Link zum Zurücksetzen des Passworts'
+    TEXT3: für
+  SilverStripe\Control\RequestProcessor:
+    INVALID_REQUEST: 'Ungültige Anfrage'
+    REQUEST_ABORTED: 'Anfrage abgebrochen'
+  SilverStripe\Core\Manifest\VersionProvider:
+    VERSIONUNKNOWN: Unbekannt
   SilverStripe\Forms\CheckboxField:
     NOANSWER: Nein
     YESANSWER: Ja
+  SilverStripe\Forms\CheckboxSetField_ss:
+    NOOPTIONSAVAILABLE: 'Keine Optionen verfügbar'
   SilverStripe\Forms\ConfirmedPasswordField:
     ATLEAST: 'Passwörter müssen mindestens {min} Zeichen lang sein.'
     BETWEEN: 'Passwörter müssen zwischen {min} und {max} Zeichen lang sein.'
+    CURRENT_PASSWORD_ERROR: 'Das derzeitige Passwort ist nicht richtig.'
+    CURRENT_PASSWORD_MISSING: 'Bitte geben Sie Ihr derzeitiges Passwort ein.'
     LOGGED_IN_ERROR: 'Sie müssen eingeloggt sein, um Ihr Passwort ändern zu können!'
     MAXIMUM: 'Passwörter dürfen maximal {max} Zeichen lang sein.'
     SHOWONCLICKTITLE: 'Passwort ändern'
@@ -14,12 +39,18 @@ de:
     VALIDDATEFORMAT2: 'Bitte geben sie das Datum im korrekten Format ein ({format})'
     VALIDDATEMAXDATE: 'Ihr Datum muss vor dem erlaubtem Datum ({date}) liegen oder gleich sein'
     VALIDDATEMINDATE: 'Ihr Datum muss nach dem erlaubtem Datum ({date}) liegen oder gleich sein'
+  SilverStripe\Forms\DatetimeField:
+    VALIDDATEMAXDATETIME: 'Ihr Datum muss vor dem erlaubtem Datum ({datetime}) liegen oder gleich sein'
+    VALIDDATETIMEFORMAT: 'Bitte geben Sie ein gültiges Datums- und Zeitformat ein  ({format})'
+    VALIDDATETIMEMINDATE: 'Ihr Datum muss nach dem erlaubtem Datum ({datetime}) liegen oder gleich sein'
   SilverStripe\Forms\DropdownField:
     CHOOSE: (Auswahl)
     CHOOSE_MODEL: '({name} auswählen)'
     SOURCE_VALIDATION: 'Bitte wählen Sie aus der Liste. {value} ist kein gültiger Wert'
   SilverStripe\Forms\EmailField:
     VALIDATION: 'Bitte geben Sie eine E-Mail-Adresse ein'
+  SilverStripe\Forms\FileUploadReceiver:
+    FIELDNOTSET: 'Dateiinformation nicht gefunden'
   SilverStripe\Forms\Form:
     CSRF_EXPIRED_MESSAGE: 'Ihre Sitzung ist abgelaufen. Bitte schicken Sie das Formular erneut ab.'
     CSRF_FAILED_MESSAGE: 'Es gab ein technisches Problem. Bitte versuchen Sie es erneut, nachdem sie die vorherige Seite neu geladen haben.'
@@ -29,10 +60,14 @@ de:
     VALIDATOR: Prüfer
     VALIDCURRENCY: 'Bitte geben Sie einen korrekten Betrag ein'
   SilverStripe\Forms\FormField:
+    EXAMPLE: 'z.B. {format}'
     NONE: keine
+  SilverStripe\Forms\FormScaffolder:
+    TABMAIN: Hauptteil
   SilverStripe\Forms\GridField\GridField:
     Add: '{name} hinzufügen'
     CSVEXPORT: 'Als CSV-Datei exportieren'
+    CSVIMPORT: 'CSV importieren'
     Filter: Filter
     FilterBy: 'Filtern nach'
     Find: Suchen
@@ -58,9 +93,18 @@ de:
     DeletePermissionsFailure: 'Keine Berechtigungen zum löschen'
     Deleted: 'Gelöscht {type} {name}'
     Save: Speichern
+  SilverStripe\Forms\GridField\GridFieldEditButton:
+    EDIT: Bearbeiten
+  SilverStripe\Forms\GridField\GridFieldPaginator:
+    OF: von
+    Page: Seite
+    View: Anzeigen
   SilverStripe\Forms\MoneyField:
     FIELDLABELAMOUNT: Betrag
     FIELDLABELCURRENCY: Währung
+    INVALID_CURRENCY: 'Währung {currency} ist nicht in der Liste der erlaubten Währungen'
+  SilverStripe\Forms\MultiSelectField:
+    SOURCE_VALIDATION: 'Bitte wählen Sie aus der Liste. {value} ist ungültig.'
   SilverStripe\Forms\NullableField:
     IsNullLabel: 'ist NULL'
   SilverStripe\Forms\NumericField:
@@ -69,19 +113,45 @@ de:
     VALIDATEFORMAT: 'Bitte geben Sie die Uhrzeit im korrekten Format ein ({format})'
   SilverStripe\ORM\DataObject:
     PLURALNAME: DatenObjekte
+    PLURALS:
+      one: 'Ein DatenObjekt'
+      other: '{count} DatenObjekte'
     SINGULARNAME: DatenObjekt
   SilverStripe\ORM\FieldType\DBBoolean:
     ANY: alle
     NOANSWER: Nein
     YESANSWER: Ja
   SilverStripe\ORM\FieldType\DBDate:
+    DAYS_SHORT_PLURALS:
+      one: '{count} Tag'
+      other: '{count} Tage'
+    HOURS_SHORT_PLURALS:
+      one: '{count} Stunde'
+      other: '{count} Stunden'
     LessThanMinuteAgo: 'weniger als eine Minute'
+    MINUTES_SHORT_PLURALS:
+      one: '{count} Minute'
+      other: '{count} Minuten'
+    MONTHS_SHORT_PLURALS:
+      one: '{count} Monat'
+      other: '{count} Monate'
+    SECONDS_SHORT_PLURALS:
+      one: '{count} Sekunde'
+      other: '{count} Sekunden'
     TIMEDIFFAGO: 'vor {difference}'
     TIMEDIFFIN: 'in {difference}'
+    YEARS_SHORT_PLURALS:
+      one: '{count} Jahr'
+      other: '{count} Jahre'
   SilverStripe\ORM\FieldType\DBEnum:
     ANY: alle
+  SilverStripe\ORM\Hierarchy:
+    LIMITED_TITLE: 'Zu viele Kindelemente ({count})'
   SilverStripe\ORM\Hierarchy\Hierarchy:
     InfiniteLoopNotAllowed: 'Es wurde eine Endlosschleife innerhalb der "{type}"-Hierarchie gefunden. Bitte ändern Sie die übergeordnete Seite, um den Fehler zu beheben'
+    LIMITED_TITLE: 'Zu viele Kindelemente ({count})'
+  SilverStripe\ORM\ValidationException:
+    DEFAULT_ERROR: Validierungsfehler
   SilverStripe\Security\BasicAuth:
     ENTERINFO: 'Bitte geben Sie einen Nutzernamen und ein Passwort ein'
     ERRORNOTADMIN: 'Dieser Nutzer ist kein Administrator'
@@ -90,28 +160,46 @@ de:
     PASSWORDEXPIRED: '<p>Ihr Passwort ist abgelaufen. <a target="_top" href="{link}">Bitte wählen Sie ein neues Passwort.</a></p>'
   SilverStripe\Security\CMSSecurity:
     INVALIDUSER: '<p>Ungültiger Benutzer. <a target="_top" href="{link}">Bitte melden Sie sich hier an</a> um fortzufahren.</p>'
+    LOGIN_MESSAGE: '<p>Ihre Sitzung ist wegen Inaktivität abgelaufen.</p>'
     SUCCESS: Erfolg
     SUCCESSCONTENT: '<p>Login erfolgreich. Falls Sie nicht automatisch weitergeleitet werden, bitte <a target="_top" href="{link}">hier klicken</a></p>'
+    SUCCESS_TITLE: 'Login erfolgreich'
+  SilverStripe\Security\DefaultAdminService:
+    DefaultAdminFirstname: Standardadmin
   SilverStripe\Security\Group:
     AddRole: 'Rolle zur Gruppe hinzufügen'
     Code: 'Gruppen Code'
     DefaultGroupTitleAdministrators: Administratoren
     DefaultGroupTitleContentAuthors: Inhaltsautoren
     Description: Beschreibung
+    GROUPNAME: Gruppenname
     GroupReminder: 'Diese Gruppe übernimmt automatisch die Rollen der Elterngruppe'
     HierarchyPermsError: 'Kann Berechtigungen der Eltern-Gruppe "{group}" nicht hinzufügen (erfordert Administratorrechte)'
     Locked: 'Gesperrt?'
+    MEMBERS: Mitglieder
+    NEWGROUP: 'Neue Gruppe'
     NoRoles: 'Keine Rollen gefunden'
+    PERMISSIONS: Berechtigungen
     PLURALNAME: Gruppen
+    PLURALS:
+      one: 'Eine Gruppe'
+      other: '{count} Gruppen'
     Parent: Elterngruppe
+    ROLES: Rollen
+    ROLESDESCRIPTION: 'Hier können Sie der Gruppe Rollen zuweisen.<br />Rollen sind logische Gruppierungen von Berechtigungen.'
     RolesAddEditLink: 'Rollen hinzufügen/editieren'
     SINGULARNAME: Gruppe
     Sort: Sortierreihenfolge
     has_many_Permissions: Berechtigungen
     many_many_Members: Mitglieder
   SilverStripe\Security\LoginAttempt:
+    Email: E-Mail-Adresse
+    EmailHashed: 'E-Mail-Adresse (gehashed)'
     IP: IP-Adresse
     PLURALNAME: Loginversuche
+    PLURALS:
+      one: 'Ein Loginversuch'
+      other: '{count} Loginversuche'
     SINGULARNAME: Loginversuch
     Status: Status
   SilverStripe\Security\Member:
@@ -119,6 +207,7 @@ de:
     BUTTONCHANGEPASSWORD: 'Passwort ändern'
     BUTTONLOGIN: Einloggen
     BUTTONLOGINOTHER: 'Als jemand anderes einloggen'
+    BUTTONLOGOUT: Abmelden
     BUTTONLOSTPASSWORD: 'Ich habe mein Passwort vergessen'
     CONFIRMNEWPASSWORD: 'Neues Passwort bestätigen'
     CONFIRMPASSWORD: 'Passwort bestätigen'
@@ -139,6 +228,10 @@ de:
     PASSWORD: Passwort
     PASSWORDEXPIRED: 'Ihr Passwort ist abgelaufen. Bitte wählen Sie ein neues Passwort.'
     PLURALNAME: Benutzer
+    PLURALS:
+      one: 'Ein Mitglied'
+      other: '{count}  Mitglieder'
+    REMEMBERME: 'Für das nächste Mal merken? (für {count} Tage auf diesem Gerät)'
     SINGULARNAME: Benutzer
     SUBJECTPASSWORDCHANGED: 'Ihr Passwort wurde geändert'
     SUBJECTPASSWORDRESET: 'Ihr Link zur Passwortrücksetzung'
@@ -151,8 +244,21 @@ de:
     db_LockedOutUntil: 'Gesperrt bis'
     db_Password: Passwort
     db_PasswordExpiry: 'Ablaufdatum des Passworts'
+  SilverStripe\Security\MemberAuthenticator\CMSMemberLoginForm:
+    AUTHENTICATORNAME: 'CMS Benutzer Login Formular'
+    BUTTONFORGOTPASSWORD: 'Passwort vergessen'
+    BUTTONLOGIN: 'Wieder einloggen'
+    BUTTONLOGOUT: Abmelden
+  SilverStripe\Security\MemberAuthenticator\MemberAuthenticator:
+    ERRORWRONGCRED: 'Ihre Eingaben scheinen nicht richtig zu sein. Bitte versuchen Sie es erneut.'
+    NoPassword: 'Dieser Benutzer hat kein Passwort.'
+  SilverStripe\Security\MemberAuthenticator\MemberLoginForm:
+    AUTHENTICATORNAME: 'E-Mail & Passwort'
   SilverStripe\Security\MemberPassword:
     PLURALNAME: Benutzerpasswörter
+    PLURALS:
+      one: 'Ein Benutzerpasswort'
+      other: '{count} Benutzerpasswörter'
     SINGULARNAME: Benutzerpasswort
   SilverStripe\Security\PasswordValidator:
     LOWCHARSTRENGTH: 'Bitte erhöhen Sie die Sicherheit des Passworts, indem Sie auch einige der folgenden Zeichen verwenden: {chars}'
@@ -160,10 +266,15 @@ de:
     TOOSHORT: 'Das Passwort ist zu kurz, es muss mindestens {minimum} Zeichen lang sein'
   SilverStripe\Security\Permission:
     AdminGroup: Administrator
+    CMS_ACCESS_CATEGORY: 'CMS Zugriff'
     CONTENT_CATEGORY: Inhaltsberechtigungen
     FULLADMINRIGHTS: 'Unbeschränkte Administratorenrechte'
     FULLADMINRIGHTS_HELP: 'Schließt alle anderen verfügbaren Berechtigungen ein'
+    PERMISSIONS_CATEGORY: 'Rollen und Zugriffsberechtigungen'
     PLURALNAME: Berechtigungen
+    PLURALS:
+      one: 'Eine Berechtigung'
+      other: '{count} Berechtigungen'
     SINGULARNAME: Zugriffsberechtigung
     UserPermissionsIntro: 'Durch das Hinzufügen von Benutzern zu Gruppen, werden dessen Rechte angepasst. Mehr Informationen über die Berechtigungen der einzelnen Gruppen erhältst Du im Abschnitt Gruppen.'
   SilverStripe\Security\PermissionCheckboxSetField:
@@ -174,12 +285,24 @@ de:
   SilverStripe\Security\PermissionRole:
     OnlyAdminCanApply: 'Nur Adminstratoren können beitreten'
     PLURALNAME: Rollen
+    PLURALS:
+      one: 'Eine Rolle'
+      other: '{count} Rollen'
     SINGULARNAME: Rolle
     Title: Titel
   SilverStripe\Security\PermissionRoleCode:
     PLURALNAME: Berechtigungsrollencodes
+    PLURALS:
+      one: 'Ein Berechtigungsrollencode'
+      other: '{count} Berechtigungsrollencodes'
     PermsError: 'Kann Berechtigungen dem Code "{code}" nicht hinzufügen (erfordert Administratorrechte)'
     SINGULARNAME: Berechtigungsrollencode
+  SilverStripe\Security\RememberLoginHash:
+    PLURALNAME: 'Login Hashes'
+    PLURALS:
+      one: 'Ein Login Hash'
+      other: '{count} Login Hashes'
+    SINGULARNAME: 'Login Hash'
   SilverStripe\Security\Security:
     ALREADYLOGGEDIN: 'Sie haben keinen Zugriff auf diese Seite. Wenn Sie ein anderes Konto besitzen, mit dem Sie auf diese Seite zugreifen können, melden Sie sich bitte unten an.'
     BUTTONSEND: 'Senden Sie mir den Link zur Passwortrücksetzung'
@@ -188,6 +311,10 @@ de:
     ENTERNEWPASSWORD: 'Bitte geben Sie ein neues Passwort ein'
     ERRORPASSWORDPERMISSION: 'Sie müssen eingeloggt sein, um Ihr Passwort ändern zu können!'
     LOGIN: Anmelden
+    LOGOUT: Abmelden
     LOSTPASSWORDHEADER: 'Passwort vergessen'
     NOTEPAGESECURED: 'Diese Seite ist geschützt. Bitte melden Sie sich an und Sie werden sofort weitergeleitet.'
+    NOTERESETLINKINVALID: '<p>Der Link zum Zurücksetzen des Passworts ist entweder nicht korrekt oder abgelaufen</p><p>Sie können <a href="{link1}">einen neuen Link anfordern</a> oder Ihr Passwort nach dem <a href="{link2}">einloggen</a> ändern.</p>'
     NOTERESETPASSWORD: 'Geben Sie Ihre E-Mail-Adresse ein und wir werden Ihnen einen Link zuschicken, mit dem Sie Ihr Passwort zurücksetzen können.'
+    PASSWORDRESETSENTHEADER: 'Der Link zum Zurücksetzen des Passworts wurde gesendet'
+    PASSWORDRESETSENTTEXT: 'Vielen Dank! Wenn ein Account zu der E-Mail Adresse existiert, wurde eine E-Mail mit dem Link zum Zurücksetzen des Passworts verschickt.'
diff --git a/lang/en.yml b/lang/en.yml
index 2a6fa6c18..37da731e4 100644
--- a/lang/en.yml
+++ b/lang/en.yml
@@ -104,15 +104,6 @@ en:
     OF: of
     Page: Page
     View: View
-  SilverStripe\Forms\GridField\GridFieldVersionedState:
-    ADDEDTODRAFTHELP: 'Item has not been published yet'
-    ADDEDTODRAFTSHORT: Draft
-    ARCHIVEDPAGEHELP: 'Item is removed from draft and live'
-    ARCHIVEDPAGESHORT: Archived
-    MODIFIEDONDRAFTHELP: 'Item has unpublished changes'
-    MODIFIEDONDRAFTSHORT: Modified
-    ONLIVEONLYSHORT: 'On live only'
-    ONLIVEONLYSHORTHELP: 'Item is published, but has been deleted from draft'
   SilverStripe\Forms\MoneyField:
     FIELDLABELAMOUNT: Amount
     FIELDLABELCURRENCY: Currency
diff --git a/lang/eo.yml b/lang/eo.yml
index 206dffc1d..cc792bab4 100644
--- a/lang/eo.yml
+++ b/lang/eo.yml
@@ -84,7 +84,6 @@ eo:
     RelationSearch: 'Serĉi rilatojn'
     ResetFilter: Restartigi
   SilverStripe\Forms\GridField\GridFieldDeleteAction:
-    DELETE_DESCRIPTION: Forigi
     Delete: Forigi
     DeletePermissionsFailure: 'Mankas permeso forigi'
     EditPermissionsFailure: 'Mankas permeso malligi rikordon'
@@ -96,23 +95,12 @@ eo:
     DeletePermissionsFailure: 'Mankas permeso forigi'
     Deleted: 'Forigita {type} {name}'
     Save: Konservi
-  SilverStripe\Forms\GridField\GridFieldEditButton_ss:
-    EDIT: Redakti
   SilverStripe\Forms\GridField\GridFieldGroupDeleteAction:
     UnlinkSelfFailure: 'Ne povas forigi vin el ĉi tiu grupo; vi perdus administrajn rajtojn'
   SilverStripe\Forms\GridField\GridFieldPaginator:
     OF: de
     Page: Paĝo
     View: Vido
-  SilverStripe\Forms\GridField\GridFieldVersionedState:
-    ADDEDTODRAFTHELP: 'Ero ankoraŭ estas ne publikigita'
-    ADDEDTODRAFTSHORT: Malneto
-    ARCHIVEDPAGEHELP: 'Ero estas forigita el malneta kaj publika'
-    ARCHIVEDPAGESHORT: Enarkivigita
-    MODIFIEDONDRAFTHELP: 'Ero enhavas nepublikigitajn ŝanĝojn'
-    MODIFIEDONDRAFTSHORT: Ŝanĝita
-    ONLIVEONLYSHORT: 'Nur ĉe publika'
-    ONLIVEONLYSHORTHELP: 'Ero estas publikigita, sed ĝi estas forigita el malneto'
   SilverStripe\Forms\MoneyField:
     FIELDLABELAMOUNT: Kvanto
     FIELDLABELCURRENCY: Kurzo
@@ -331,7 +319,4 @@ eo:
     LOGOUT: Elsaluti
     LOSTPASSWORDHEADER: 'Perdis pasvorton'
     NOTEPAGESECURED: 'Tiu paĝo estas sekurigita.  Enigu viajn akreditaĵojn sube kaj vi aliros pluen.'
-    NOTERESETLINKINVALID: '<p>La pasvorta reagorda ligilo estas malvalida aŭ finiĝis.</p><p>Vi povas peti novan <a href="{link1}">ĉi tie</a> aŭ ŝanĝi vian pasvorton post <a href="{link2}">vi ensalutis</a>.</p>'
     NOTERESETPASSWORD: 'Enigu vian retpoŝtan adreson kaj ni sendos al vi ligilon per kiu vi povas reagordi vian pasvorton'
-    PASSWORDSENTHEADER: 'Pasvorta reagorda ligilo sendiĝis al ''{email}'''
-    PASSWORDSENTTEXT: 'Dankon! Reagordita ligilo sendiĝis al ''{email}'', kondiĉe ke konto ekzistas por tiu retadreso.'
diff --git a/lang/nl.yml b/lang/nl.yml
index eae378c9d..f23bc5ef1 100644
--- a/lang/nl.yml
+++ b/lang/nl.yml
@@ -84,7 +84,6 @@ nl:
     RelationSearch: 'Zoek relatie'
     ResetFilter: Resetten
   SilverStripe\Forms\GridField\GridFieldDeleteAction:
-    DELETE_DESCRIPTION: Verwijder
     Delete: Verwijder
     DeletePermissionsFailure: 'Onvoldoende rechten om te verwijderen'
     EditPermissionsFailure: 'Geen toelating om te ontkoppelen'
@@ -96,23 +95,12 @@ nl:
     DeletePermissionsFailure: 'Onvoldoende rechten om te verwijderen'
     Deleted: '{type} {name} verwijderd'
     Save: Opslaan
-  SilverStripe\Forms\GridField\GridFieldEditButton_ss:
-    EDIT: Edit
   SilverStripe\Forms\GridField\GridFieldGroupDeleteAction:
     UnlinkSelfFailure: 'U kunt uzelf niet verwijderen van deze groep, omdat u dan geen admin-rechten meer heeft.'
   SilverStripe\Forms\GridField\GridFieldPaginator:
     OF: van
     Page: Pagina
     View: Bekijk
-  SilverStripe\Forms\GridField\GridFieldVersionedState:
-    ADDEDTODRAFTHELP: 'Item is nog niet gepubliceerd'
-    ADDEDTODRAFTSHORT: Concept
-    ARCHIVEDPAGEHELP: 'Het item is verwijderd van de concept- en de live site'
-    ARCHIVEDPAGESHORT: Gearchiveerd
-    MODIFIEDONDRAFTHELP: 'Item heeft wijzigingen die nog niet gepubliceerd zijn'
-    MODIFIEDONDRAFTSHORT: Aangepast
-    ONLIVEONLYSHORT: 'Alleen op de live site'
-    ONLIVEONLYSHORTHELP: 'Item is gepubliceerd, maar verwijderd van de concept site'
   SilverStripe\Forms\MoneyField:
     FIELDLABELAMOUNT: Aantal
     FIELDLABELCURRENCY: Munteenheid
@@ -174,8 +162,8 @@ nl:
     PASSWORDEXPIRED: '<p>Uw wachtwoord is verlopen. <a target="_top" href="{link}">Kies een nieuw wachtwoord.</a></p>'
   SilverStripe\Security\CMSSecurity:
     INVALIDUSER: '<p>Ongeldige gebruiker <a target="_top" href="{link}">Log hier opnieuw in</a> om verder te gaan.</p>'
-    LOGIN_MESSAGE: 'Sessie is verlopen'
-    LOGIN_TITLE: '<p>U kunt verder met wat u aan het doen was, door opnieuw in te loggen.</p>'
+    LOGIN_MESSAGE: '<p>De browsersessie is verlopen wegens inactiviteit</p>'
+    LOGIN_TITLE: 'Log opnieuw in om verder te gaan.'
     SUCCESS: Succes
     SUCCESSCONTENT: '<p>U bent ingelogd. <a target="_top" href="{link}">Klik hier</a> als u niet automatisch wordt doorgestuurd.</p>'
     SUCCESS_TITLE: 'Inloggen is gelukt'
@@ -331,7 +319,4 @@ nl:
     LOGOUT: Uitloggen
     LOSTPASSWORDHEADER: 'Wachtwoord vergeten'
     NOTEPAGESECURED: 'Deze pagina is beveiligd. Voer uw gegevens in en u wordt automatisch doorgestuurd.'
-    NOTERESETLINKINVALID: '<p>De link om uw wachtwoord te kunnen wijzigen is niet meer geldig.</p><p>U kunt <a href="{link1}">een nieuwe link aanvragen</a> of uw wachtwoord aanpassen door <a href="{link2}">in te loggen</a>.</p>'
     NOTERESETPASSWORD: 'Voer uw e-mailadres in en we sturen een link waarmee u een nieuw wachtwoord kunt instellen.'
-    PASSWORDSENTHEADER: 'Wachtwoord herstel link verzonden naar {email}'
-    PASSWORDSENTTEXT: 'Bedankt! Er is een link verstuurd naar {email} om uw wachtwoord opnieuw in te stellen, in de veronderstelling dat er een account bestaat voor dit e-mailadres.'

From fd90cf6ceb346142eee6ba620599ab36c2d18cbb Mon Sep 17 00:00:00 2001
From: Maxime Rainville <maxime@silverstripe.com>
Date: Tue, 18 Dec 2018 16:46:56 +1300
Subject: [PATCH 14/20] [SS-2018-021] Fix potential SQL vulnerability in
 non-scalar value hyrdation

---
 src/ORM/DataObject.php                   | 27 ++++++++++
 src/ORM/FieldType/DBComposite.php        |  5 ++
 src/ORM/FieldType/DBField.php            | 23 ++++++---
 src/ORM/FieldType/DBString.php           |  2 +-
 src/ORM/ManyManyList.php                 | 14 ++++++
 tests/php/ORM/DBFieldTest.php            | 63 ++++++++++++++++++++++++
 tests/php/ORM/DataObjectTest.php         | 18 +++++++
 tests/php/ORM/DataObjectTest/Company.php |  4 +-
 tests/php/ORM/DataObjectTest/Team.php    |  4 +-
 9 files changed, 150 insertions(+), 10 deletions(-)

diff --git a/src/ORM/DataObject.php b/src/ORM/DataObject.php
index 397e0e6b1..576cf8055 100644
--- a/src/ORM/DataObject.php
+++ b/src/ORM/DataObject.php
@@ -1453,6 +1453,7 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity
      * @param string $baseTable Base table
      * @param string $now Timestamp to use for the current time
      * @param bool $isNewRecord If this is a new record
+     * @throws InvalidArgumentException
      */
     protected function writeManipulation($baseTable, $now, $isNewRecord)
     {
@@ -1471,6 +1472,20 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity
             $manipulation[$baseTable]['command'] = 'update';
         }
 
+        // Make sure none of our field assignment are arrays
+        foreach ($manipulation as $tableManipulation) {
+            if (!isset($tableManipulation['fields'])) {
+                continue;
+            }
+            foreach ($tableManipulation['fields'] as $fieldValue) {
+                if (is_array($fieldValue)) {
+                    throw new InvalidArgumentException(
+                        'DataObject::writeManipulation: parameterised field assignments are disallowed'
+                    );
+                }
+            }
+        }
+
         // Perform the manipulation
         DB::manipulate($manipulation);
     }
@@ -2630,6 +2645,18 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity
                 throw new InvalidArgumentException('DataObject::setField: passed an object that is not a DBField');
             }
 
+            if (!empty($val) && !is_scalar($val)) {
+                $dbField = $this->dbObject($fieldName);
+                if ($dbField && $dbField->scalarValueOnly()) {
+                    throw new InvalidArgumentException(
+                        sprintf(
+                            'DataObject::setField: %s only accepts scalars',
+                            $fieldName
+                        )
+                    );
+                }
+            }
+
             // if a field is not existing or has strictly changed
             if (!isset($this->record[$fieldName]) || $this->record[$fieldName] !== $val) {
                 // TODO Add check for php-level defaults which are not set in the db
diff --git a/src/ORM/FieldType/DBComposite.php b/src/ORM/FieldType/DBComposite.php
index a938f242f..d55700c05 100644
--- a/src/ORM/FieldType/DBComposite.php
+++ b/src/ORM/FieldType/DBComposite.php
@@ -309,4 +309,9 @@ abstract class DBComposite extends DBField
             ];
         }
     }
+
+    public function scalarValueOnly()
+    {
+        return false;
+    }
 }
diff --git a/src/ORM/FieldType/DBField.php b/src/ORM/FieldType/DBField.php
index 70aa13cb4..73d7172d4 100644
--- a/src/ORM/FieldType/DBField.php
+++ b/src/ORM/FieldType/DBField.php
@@ -335,18 +335,16 @@ abstract class DBField extends ViewableData implements DBIndexable
      * will be escaped automatically by the prepared query processor, so it
      * should not be escaped or quoted at all.
      *
-     * The field values could also be in paramaterised format, such as
-     * array('MAX(?,?)' => array(42, 69)), allowing the use of raw SQL values such as
-     * array('NOW()' => array()).
-     *
-     * @see SQLWriteExpression::addAssignments for syntax examples
-     *
      * @param $value mixed The value to check
      * @return mixed The raw value, or escaped parameterised details
      */
     public function prepValueForDB($value)
     {
-        if ($value === null || $value === "" || $value === false) {
+        if ($value === null ||
+            $value === "" ||
+            $value === false ||
+            ($this->scalarValueOnly() && !is_scalar($value))
+        ) {
             return null;
         } else {
             return $value;
@@ -653,4 +651,15 @@ DBG;
         }
         return null;
     }
+
+    /**
+     * Whether or not this DBField only accepts scalar values.
+     *
+     * Composite DBFields can override this method and return `false` so they can accept arrays of values.
+     * @return boolean
+     */
+    public function scalarValueOnly()
+    {
+        return true;
+    }
 }
diff --git a/src/ORM/FieldType/DBString.php b/src/ORM/FieldType/DBString.php
index 3732c0952..d40481dd7 100644
--- a/src/ORM/FieldType/DBString.php
+++ b/src/ORM/FieldType/DBString.php
@@ -94,7 +94,7 @@ abstract class DBString extends DBField
     public function prepValueForDB($value)
     {
         // Cast non-empty value
-        if (strlen($value)) {
+        if (is_scalar($value) && strlen($value)) {
             return (string)$value;
         }
 
diff --git a/src/ORM/ManyManyList.php b/src/ORM/ManyManyList.php
index 53f02ed1e..8e07f10e4 100644
--- a/src/ORM/ManyManyList.php
+++ b/src/ORM/ManyManyList.php
@@ -299,6 +299,20 @@ class ManyManyList extends RelationList
             $manipulation[$this->joinTable]['fields'][$this->localKey] = $itemID;
             $manipulation[$this->joinTable]['fields'][$this->foreignKey] = $foreignID;
 
+            // Make sure none of our field assignments are arrays
+            foreach ($manipulation as $tableManipulation) {
+                if (!isset($tableManipulation['fields'])) {
+                    continue;
+                }
+                foreach ($tableManipulation['fields'] as $fieldValue) {
+                    if (is_array($fieldValue)) {
+                        throw new InvalidArgumentException(
+                            'ManyManyList::add: parameterised field assignments are disallowed'
+                        );
+                    }
+                }
+            }
+
             DB::manipulate($manipulation);
         }
     }
diff --git a/tests/php/ORM/DBFieldTest.php b/tests/php/ORM/DBFieldTest.php
index 8946d72c9..fb3bb6bf4 100644
--- a/tests/php/ORM/DBFieldTest.php
+++ b/tests/php/ORM/DBFieldTest.php
@@ -2,17 +2,32 @@
 
 namespace SilverStripe\ORM\Tests;
 
+use SilverStripe\Assets\Image;
 use SilverStripe\ORM\FieldType\DBBigInt;
 use SilverStripe\ORM\FieldType\DBBoolean;
+use SilverStripe\ORM\FieldType\DBCurrency;
+use SilverStripe\ORM\FieldType\DBDate;
+use SilverStripe\ORM\FieldType\DBDatetime;
 use SilverStripe\ORM\FieldType\DBDecimal;
 use SilverStripe\ORM\FieldType\DBDouble;
+use SilverStripe\ORM\FieldType\DBEnum;
 use SilverStripe\ORM\FieldType\DBFloat;
+use SilverStripe\ORM\FieldType\DBForeignKey;
 use SilverStripe\ORM\FieldType\DBHTMLText;
+use SilverStripe\ORM\FieldType\DBHTMLVarchar;
+use SilverStripe\ORM\FieldType\DBInt;
+use SilverStripe\ORM\FieldType\DBLocale;
+use SilverStripe\ORM\FieldType\DBMoney;
+use SilverStripe\ORM\FieldType\DBMultiEnum;
+use SilverStripe\ORM\FieldType\DBPercentage;
+use SilverStripe\ORM\FieldType\DBPolymorphicForeignKey;
+use SilverStripe\ORM\FieldType\DBPrimaryKey;
 use SilverStripe\ORM\FieldType\DBString;
 use SilverStripe\ORM\FieldType\DBTime;
 use SilverStripe\ORM\FieldType\DBVarchar;
 use SilverStripe\ORM\FieldType\DBText;
 use SilverStripe\Dev\SapphireTest;
+use SilverStripe\ORM\FieldType\DBYear;
 
 /**
  * Tests for DBField objects.
@@ -189,6 +204,54 @@ class DBFieldTest extends SapphireTest
         $this->assertEquals(PHP_INT_MAX, $bigInt->getValue());
     }
 
+    /**
+     * @dataProvider dataProviderPrepValueForDBArrayValue
+     */
+    public function testPrepValueForDBArrayValue($dbFieldName, $scalarValueOnly, $extraArgs = [])
+    {
+        $reflection = new \ReflectionClass($dbFieldName);
+        /**
+         * @var DBField
+         */
+        $dbField = $reflection->newInstanceArgs($extraArgs);
+        $dbField->setName('SomeField');
+        $payload = ['GREATEST(0,?)' => '2'];
+        $preparedValue = $dbField->prepValueForDB($payload);
+        $this->assertTrue(
+            !$scalarValueOnly || !is_array($preparedValue),
+            '`prepValueForDB` can not return an array if scalarValueOnly is true'
+        );
+        $this->assertEquals($scalarValueOnly, $dbField->scalarValueOnly());
+    }
+
+    public function dataProviderPrepValueForDBArrayValue()
+    {
+        return [
+            [DBBigInt::class, true],
+            [DBBoolean::class, true],
+            [DBCurrency::class, true],
+            [DBDate::class, true],
+            [DBDatetime::class, true],
+            [DBDecimal::class, true],
+            [DBDouble::class, true],
+            [DBEnum::class, true],
+            [DBFloat::class, true],
+            [DBForeignKey::class, true, ['SomeField']],
+            [DBHTMLText::class, true],
+            [DBHTMLVarchar::class, true],
+            [DBInt::class, true],
+            [DBLocale::class, true],
+            [DBMoney::class, false],
+            [DBMultiEnum::class, true, ['SomeField', ['One', 'Two', 'Three']]],
+            [DBPercentage::class, true],
+            [DBPolymorphicForeignKey::class, false, ['SomeField']],
+            [DBText::class, true],
+            [DBTime::class, true],
+            [DBVarchar::class, true],
+            [DBYear::class, true],
+        ];
+    }
+
     public function testExists()
     {
         $varcharField = new DBVarchar("testfield");
diff --git a/tests/php/ORM/DataObjectTest.php b/tests/php/ORM/DataObjectTest.php
index 3a2158c4c..60d198243 100644
--- a/tests/php/ORM/DataObjectTest.php
+++ b/tests/php/ORM/DataObjectTest.php
@@ -17,7 +17,9 @@ use SilverStripe\ORM\FieldType\DBField;
 use SilverStripe\ORM\FieldType\DBPolymorphicForeignKey;
 use SilverStripe\ORM\FieldType\DBVarchar;
 use SilverStripe\ORM\ManyManyList;
+use SilverStripe\ORM\Tests\DataObjectTest\Company;
 use SilverStripe\ORM\Tests\DataObjectTest\Player;
+use SilverStripe\ORM\Tests\DataObjectTest\Team;
 use SilverStripe\View\ViewableData;
 use stdClass;
 
@@ -2221,4 +2223,20 @@ class DataObjectTest extends SapphireTest
             ['"DataObjectTest_TeamComment"."Name"' => 'does not exists']
         ));
     }
+
+    public function testSetFieldWithArrayOnScalarOnlyField()
+    {
+        $this->expectException(InvalidArgumentException::class);
+        $do = Company::singleton();
+        $do->FoundationYear = '1984';
+        $do->FoundationYear = array('Amount' => 123, 'Currency' => 'CAD');
+        $this->assertEmpty($do->FoundationYear);
+    }
+
+    public function testSetFieldWithArrayOnCompositeField()
+    {
+        $do = Company::singleton();
+        $do->SalaryCap = array('Amount' => 123456, 'Currency' => 'CAD');
+        $this->assertNotEmpty($do->SalaryCap);
+    }
 }
diff --git a/tests/php/ORM/DataObjectTest/Company.php b/tests/php/ORM/DataObjectTest/Company.php
index c17e47d40..a9107e263 100644
--- a/tests/php/ORM/DataObjectTest/Company.php
+++ b/tests/php/ORM/DataObjectTest/Company.php
@@ -10,7 +10,9 @@ class Company extends DataObject implements TestOnly
     private static $table_name = 'DataObjectTest_Company';
 
     private static $db = [
-        'Name' => 'Varchar'
+        'Name' => 'Varchar',
+        'MarketValue' => 'Money',
+        'FoundationYear' => 'Year'
     ];
 
     private static $has_one = [
diff --git a/tests/php/ORM/DataObjectTest/Team.php b/tests/php/ORM/DataObjectTest/Team.php
index 014ef9595..12de9b467 100644
--- a/tests/php/ORM/DataObjectTest/Team.php
+++ b/tests/php/ORM/DataObjectTest/Team.php
@@ -10,6 +10,8 @@ use SilverStripe\ORM\ManyManyList;
 /**
  * @property string Title
  * @property string DatabaseField
+ * @property array SalaryCap
+ * @property string FoundationYear
  * @method Player Captain()
  * @method Player Founder()
  * @method Player HasOneRelationship()
@@ -27,7 +29,7 @@ class Team extends DataObject implements TestOnly
 
     private static $db = array(
         'Title' => 'Varchar',
-        'DatabaseField' => 'HTMLVarchar'
+        'DatabaseField' => 'HTMLVarchar',
     );
 
     private static $has_one = array(

From 1362b20ee43d8603d0c4a0336c539db700e302b7 Mon Sep 17 00:00:00 2001
From: Aaron Carlino <unclecheese@leftandmain.com>
Date: Tue, 12 Feb 2019 20:50:11 +1300
Subject: [PATCH 15/20] Added 4.1.5 changelog

---
 docs/en/04_Changelogs/4.1.5.md | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 docs/en/04_Changelogs/4.1.5.md

diff --git a/docs/en/04_Changelogs/4.1.5.md b/docs/en/04_Changelogs/4.1.5.md
new file mode 100644
index 000000000..2d466ac54
--- /dev/null
+++ b/docs/en/04_Changelogs/4.1.5.md
@@ -0,0 +1,18 @@
+# 4.1.5
+
+<!--- Changes below this line will be automatically regenerated -->
+
+## Change Log
+
+### Security
+
+ * 2018-12-18 [fd90cf6ce](https://github.com/silverstripe/silverstripe-framework/commit/fd90cf6ceb346142eee6ba620599ab36c2d18cbb) Fix potential SQL vulnerability in non-scalar value hyrdation (Maxime Rainville) - See [ss-2018-021](https://www.silverstripe.org/download/security-releases/ss-2018-021)
+s
+### Bugfixes
+
+ * 2019-01-31 [cda9eef](https://github.com/silverstripe/silverstripe-assets/commit/cda9eef992b70fd46377be6d4459260d31ea2215) Fix for issue #212 (Joe Madden)
+ * 2019-01-25 [0797ab7](https://github.com/silverstripe/silverstripe-asset-admin/commit/0797ab7762a4a64f2dc89c754a6bb04216b96fe1) Fix GraphQL FolderTypeCreator::resolveChildrenConnection on PostgreSQL (#901) (Serge Latyntcev)
+ * 2019-01-13 [5c3b95ac](https://github.com/silverstripe/silverstripe-cms/commit/5c3b95ac8977f77e7d95d4da6333ca12b5ef465f) Multibyte URL routing (Ingo Schommer)
+ * 2019-01-11 [2cb49ea](https://github.com/silverstripe/silverstripe-versioned/commit/2cb49ea79d6babb80289f170dc6102c82f5b0d69) [Warning] on count() with PHP &gt;= 7.2 (Lukas)
+ * 2018-12-18 [3d841a4](https://github.com/silverstripe/silverstripe-installer/commit/3d841a409c43752a8192afea5ebc48327e2ac3d3) / Behat tests (Serge Latyntcev)
+ * 2018-12-13 [c4a0d5f0](https://github.com/silverstripe/silverstripe-cms/commit/c4a0d5f0831f0f27022905700a0ffb86cc56aceb) Publish button text merge regression (Aaron Carlino)

From 95505db7d666a75f249f65cb1af74dca01d39add Mon Sep 17 00:00:00 2001
From: Maxime Rainville <maxime@silverstripe.com>
Date: Tue, 18 Dec 2018 16:46:56 +1300
Subject: [PATCH 16/20] [SS-2018-021] Fix potential SQL vulnerability in
 non-scalar value hyrdation

---
 src/ORM/DataObject.php                   | 27 ++++++++++
 src/ORM/FieldType/DBComposite.php        |  5 ++
 src/ORM/FieldType/DBField.php            | 23 ++++++---
 src/ORM/FieldType/DBString.php           |  2 +-
 src/ORM/ManyManyList.php                 | 14 ++++++
 tests/php/ORM/DBFieldTest.php            | 63 ++++++++++++++++++++++++
 tests/php/ORM/DataObjectTest.php         | 18 +++++++
 tests/php/ORM/DataObjectTest/Company.php |  4 +-
 tests/php/ORM/DataObjectTest/Team.php    |  4 +-
 9 files changed, 150 insertions(+), 10 deletions(-)

diff --git a/src/ORM/DataObject.php b/src/ORM/DataObject.php
index 881add45c..f6e49222d 100644
--- a/src/ORM/DataObject.php
+++ b/src/ORM/DataObject.php
@@ -1307,6 +1307,7 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity
      * @param string $baseTable Base table
      * @param string $now Timestamp to use for the current time
      * @param bool $isNewRecord If this is a new record
+     * @throws InvalidArgumentException
      */
     protected function writeManipulation($baseTable, $now, $isNewRecord)
     {
@@ -1325,6 +1326,20 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity
             $manipulation[$baseTable]['command'] = 'update';
         }
 
+        // Make sure none of our field assignment are arrays
+        foreach ($manipulation as $tableManipulation) {
+            if (!isset($tableManipulation['fields'])) {
+                continue;
+            }
+            foreach ($tableManipulation['fields'] as $fieldValue) {
+                if (is_array($fieldValue)) {
+                    throw new InvalidArgumentException(
+                        'DataObject::writeManipulation: parameterised field assignments are disallowed'
+                    );
+                }
+            }
+        }
+
         // Perform the manipulation
         DB::manipulate($manipulation);
     }
@@ -2403,6 +2418,18 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity
                 throw new InvalidArgumentException('DataObject::setField: passed an object that is not a DBField');
             }
 
+            if (!empty($val) && !is_scalar($val)) {
+                $dbField = $this->dbObject($fieldName);
+                if ($dbField && $dbField->scalarValueOnly()) {
+                    throw new InvalidArgumentException(
+                        sprintf(
+                            'DataObject::setField: %s only accepts scalars',
+                            $fieldName
+                        )
+                    );
+                }
+            }
+
             // if a field is not existing or has strictly changed
             if (!isset($this->record[$fieldName]) || $this->record[$fieldName] !== $val) {
                 // TODO Add check for php-level defaults which are not set in the db
diff --git a/src/ORM/FieldType/DBComposite.php b/src/ORM/FieldType/DBComposite.php
index a938f242f..d55700c05 100644
--- a/src/ORM/FieldType/DBComposite.php
+++ b/src/ORM/FieldType/DBComposite.php
@@ -309,4 +309,9 @@ abstract class DBComposite extends DBField
             ];
         }
     }
+
+    public function scalarValueOnly()
+    {
+        return false;
+    }
 }
diff --git a/src/ORM/FieldType/DBField.php b/src/ORM/FieldType/DBField.php
index 70aa13cb4..73d7172d4 100644
--- a/src/ORM/FieldType/DBField.php
+++ b/src/ORM/FieldType/DBField.php
@@ -335,18 +335,16 @@ abstract class DBField extends ViewableData implements DBIndexable
      * will be escaped automatically by the prepared query processor, so it
      * should not be escaped or quoted at all.
      *
-     * The field values could also be in paramaterised format, such as
-     * array('MAX(?,?)' => array(42, 69)), allowing the use of raw SQL values such as
-     * array('NOW()' => array()).
-     *
-     * @see SQLWriteExpression::addAssignments for syntax examples
-     *
      * @param $value mixed The value to check
      * @return mixed The raw value, or escaped parameterised details
      */
     public function prepValueForDB($value)
     {
-        if ($value === null || $value === "" || $value === false) {
+        if ($value === null ||
+            $value === "" ||
+            $value === false ||
+            ($this->scalarValueOnly() && !is_scalar($value))
+        ) {
             return null;
         } else {
             return $value;
@@ -653,4 +651,15 @@ DBG;
         }
         return null;
     }
+
+    /**
+     * Whether or not this DBField only accepts scalar values.
+     *
+     * Composite DBFields can override this method and return `false` so they can accept arrays of values.
+     * @return boolean
+     */
+    public function scalarValueOnly()
+    {
+        return true;
+    }
 }
diff --git a/src/ORM/FieldType/DBString.php b/src/ORM/FieldType/DBString.php
index 3732c0952..d40481dd7 100644
--- a/src/ORM/FieldType/DBString.php
+++ b/src/ORM/FieldType/DBString.php
@@ -94,7 +94,7 @@ abstract class DBString extends DBField
     public function prepValueForDB($value)
     {
         // Cast non-empty value
-        if (strlen($value)) {
+        if (is_scalar($value) && strlen($value)) {
             return (string)$value;
         }
 
diff --git a/src/ORM/ManyManyList.php b/src/ORM/ManyManyList.php
index d5495ee36..a576a33db 100644
--- a/src/ORM/ManyManyList.php
+++ b/src/ORM/ManyManyList.php
@@ -295,6 +295,20 @@ class ManyManyList extends RelationList
             $manipulation[$this->joinTable]['fields'][$this->localKey] = $itemID;
             $manipulation[$this->joinTable]['fields'][$this->foreignKey] = $foreignID;
 
+            // Make sure none of our field assignments are arrays
+            foreach ($manipulation as $tableManipulation) {
+                if (!isset($tableManipulation['fields'])) {
+                    continue;
+                }
+                foreach ($tableManipulation['fields'] as $fieldValue) {
+                    if (is_array($fieldValue)) {
+                        throw new InvalidArgumentException(
+                            'ManyManyList::add: parameterised field assignments are disallowed'
+                        );
+                    }
+                }
+            }
+
             DB::manipulate($manipulation);
         }
     }
diff --git a/tests/php/ORM/DBFieldTest.php b/tests/php/ORM/DBFieldTest.php
index 8946d72c9..fb3bb6bf4 100644
--- a/tests/php/ORM/DBFieldTest.php
+++ b/tests/php/ORM/DBFieldTest.php
@@ -2,17 +2,32 @@
 
 namespace SilverStripe\ORM\Tests;
 
+use SilverStripe\Assets\Image;
 use SilverStripe\ORM\FieldType\DBBigInt;
 use SilverStripe\ORM\FieldType\DBBoolean;
+use SilverStripe\ORM\FieldType\DBCurrency;
+use SilverStripe\ORM\FieldType\DBDate;
+use SilverStripe\ORM\FieldType\DBDatetime;
 use SilverStripe\ORM\FieldType\DBDecimal;
 use SilverStripe\ORM\FieldType\DBDouble;
+use SilverStripe\ORM\FieldType\DBEnum;
 use SilverStripe\ORM\FieldType\DBFloat;
+use SilverStripe\ORM\FieldType\DBForeignKey;
 use SilverStripe\ORM\FieldType\DBHTMLText;
+use SilverStripe\ORM\FieldType\DBHTMLVarchar;
+use SilverStripe\ORM\FieldType\DBInt;
+use SilverStripe\ORM\FieldType\DBLocale;
+use SilverStripe\ORM\FieldType\DBMoney;
+use SilverStripe\ORM\FieldType\DBMultiEnum;
+use SilverStripe\ORM\FieldType\DBPercentage;
+use SilverStripe\ORM\FieldType\DBPolymorphicForeignKey;
+use SilverStripe\ORM\FieldType\DBPrimaryKey;
 use SilverStripe\ORM\FieldType\DBString;
 use SilverStripe\ORM\FieldType\DBTime;
 use SilverStripe\ORM\FieldType\DBVarchar;
 use SilverStripe\ORM\FieldType\DBText;
 use SilverStripe\Dev\SapphireTest;
+use SilverStripe\ORM\FieldType\DBYear;
 
 /**
  * Tests for DBField objects.
@@ -189,6 +204,54 @@ class DBFieldTest extends SapphireTest
         $this->assertEquals(PHP_INT_MAX, $bigInt->getValue());
     }
 
+    /**
+     * @dataProvider dataProviderPrepValueForDBArrayValue
+     */
+    public function testPrepValueForDBArrayValue($dbFieldName, $scalarValueOnly, $extraArgs = [])
+    {
+        $reflection = new \ReflectionClass($dbFieldName);
+        /**
+         * @var DBField
+         */
+        $dbField = $reflection->newInstanceArgs($extraArgs);
+        $dbField->setName('SomeField');
+        $payload = ['GREATEST(0,?)' => '2'];
+        $preparedValue = $dbField->prepValueForDB($payload);
+        $this->assertTrue(
+            !$scalarValueOnly || !is_array($preparedValue),
+            '`prepValueForDB` can not return an array if scalarValueOnly is true'
+        );
+        $this->assertEquals($scalarValueOnly, $dbField->scalarValueOnly());
+    }
+
+    public function dataProviderPrepValueForDBArrayValue()
+    {
+        return [
+            [DBBigInt::class, true],
+            [DBBoolean::class, true],
+            [DBCurrency::class, true],
+            [DBDate::class, true],
+            [DBDatetime::class, true],
+            [DBDecimal::class, true],
+            [DBDouble::class, true],
+            [DBEnum::class, true],
+            [DBFloat::class, true],
+            [DBForeignKey::class, true, ['SomeField']],
+            [DBHTMLText::class, true],
+            [DBHTMLVarchar::class, true],
+            [DBInt::class, true],
+            [DBLocale::class, true],
+            [DBMoney::class, false],
+            [DBMultiEnum::class, true, ['SomeField', ['One', 'Two', 'Three']]],
+            [DBPercentage::class, true],
+            [DBPolymorphicForeignKey::class, false, ['SomeField']],
+            [DBText::class, true],
+            [DBTime::class, true],
+            [DBVarchar::class, true],
+            [DBYear::class, true],
+        ];
+    }
+
     public function testExists()
     {
         $varcharField = new DBVarchar("testfield");
diff --git a/tests/php/ORM/DataObjectTest.php b/tests/php/ORM/DataObjectTest.php
index dbc46f090..cfda6085e 100644
--- a/tests/php/ORM/DataObjectTest.php
+++ b/tests/php/ORM/DataObjectTest.php
@@ -16,7 +16,9 @@ use SilverStripe\ORM\FieldType\DBField;
 use SilverStripe\ORM\FieldType\DBPolymorphicForeignKey;
 use SilverStripe\ORM\FieldType\DBVarchar;
 use SilverStripe\ORM\ManyManyList;
+use SilverStripe\ORM\Tests\DataObjectTest\Company;
 use SilverStripe\ORM\Tests\DataObjectTest\Player;
+use SilverStripe\ORM\Tests\DataObjectTest\Team;
 use SilverStripe\View\ViewableData;
 use stdClass;
 
@@ -2129,4 +2131,20 @@ class DataObjectTest extends SapphireTest
             ['"DataObjectTest_TeamComment"."Name"' => 'does not exists']
         ));
     }
+
+    public function testSetFieldWithArrayOnScalarOnlyField()
+    {
+        $this->expectException(InvalidArgumentException::class);
+        $do = Company::singleton();
+        $do->FoundationYear = '1984';
+        $do->FoundationYear = array('Amount' => 123, 'Currency' => 'CAD');
+        $this->assertEmpty($do->FoundationYear);
+    }
+
+    public function testSetFieldWithArrayOnCompositeField()
+    {
+        $do = Company::singleton();
+        $do->SalaryCap = array('Amount' => 123456, 'Currency' => 'CAD');
+        $this->assertNotEmpty($do->SalaryCap);
+    }
 }
diff --git a/tests/php/ORM/DataObjectTest/Company.php b/tests/php/ORM/DataObjectTest/Company.php
index c17e47d40..a9107e263 100644
--- a/tests/php/ORM/DataObjectTest/Company.php
+++ b/tests/php/ORM/DataObjectTest/Company.php
@@ -10,7 +10,9 @@ class Company extends DataObject implements TestOnly
     private static $table_name = 'DataObjectTest_Company';
 
     private static $db = [
-        'Name' => 'Varchar'
+        'Name' => 'Varchar',
+        'MarketValue' => 'Money',
+        'FoundationYear' => 'Year'
     ];
 
     private static $has_one = [
diff --git a/tests/php/ORM/DataObjectTest/Team.php b/tests/php/ORM/DataObjectTest/Team.php
index d9436a1fa..ee2937e2a 100644
--- a/tests/php/ORM/DataObjectTest/Team.php
+++ b/tests/php/ORM/DataObjectTest/Team.php
@@ -10,6 +10,8 @@ use SilverStripe\ORM\ManyManyList;
 /**
  * @property string Title
  * @property string DatabaseField
+ * @property array SalaryCap
+ * @property string FoundationYear
  * @method Player Captain()
  * @method Player Founder()
  * @method Player HasOneRelationship()
@@ -27,7 +29,7 @@ class Team extends DataObject implements TestOnly
 
     private static $db = array(
         'Title' => 'Varchar',
-        'DatabaseField' => 'HTMLVarchar'
+        'DatabaseField' => 'HTMLVarchar',
     );
 
     private static $has_one = array(

From 3f3a1884d72a2bed29b1d73fbbf8102cc6c7857c Mon Sep 17 00:00:00 2001
From: Aaron Carlino <unclecheese@leftandmain.com>
Date: Tue, 12 Feb 2019 21:10:53 +1300
Subject: [PATCH 17/20] Added 4.0.7 changelog

---
 docs/en/04_Changelogs/4.0.7.md | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 docs/en/04_Changelogs/4.0.7.md

diff --git a/docs/en/04_Changelogs/4.0.7.md b/docs/en/04_Changelogs/4.0.7.md
new file mode 100644
index 000000000..fd75c792f
--- /dev/null
+++ b/docs/en/04_Changelogs/4.0.7.md
@@ -0,0 +1,24 @@
+# 4.0.7
+
+<!--- Changes below this line will be automatically regenerated -->
+
+## Change Log
+
+### Security
+
+ * 2018-12-18 [95505db7d](https://github.com/silverstripe/silverstripe-framework/commit/95505db7d666a75f249f65cb1af74dca01d39add) Fix potential SQL vulnerability in non-scalar value hyrdation (Maxime Rainville) - See [ss-2018-021](https://www.silverstripe.org/download/security-releases/ss-2018-021)
+
+### Features and Enhancements
+
+ * 2018-11-27 [a8f4f23c6](https://github.com/silverstripe/silverstripe-framework/commit/a8f4f23c660474e965b510ba1bb04bf7a145d5b0) Add visibility updates to `upgrade.yml`. (bergice)
+
+### Bugfixes
+
+ * 2019-01-31 [cda9eef](https://github.com/silverstripe/silverstripe-assets/commit/cda9eef992b70fd46377be6d4459260d31ea2215) Fix for issue #212 (Joe Madden)
+ * 2019-01-29 [f918dcd36](https://github.com/silverstripe/silverstripe-framework/commit/f918dcd36a177adb8abee751d27a809f25a0afab) Escape wildcard characters when matching database name in databaseExists (Guy Marriott)
+ * 2019-01-28 [dc9d1b9cc](https://github.com/silverstripe/silverstripe-framework/commit/dc9d1b9cc0d3b14929fe2675282980a2750fb4cf) GridFieldPrintButton no longer assumes that children of GridField would implement their own print template (Robbie Averill)
+ * 2019-01-25 [0797ab7](https://github.com/silverstripe/silverstripe-asset-admin/commit/0797ab7762a4a64f2dc89c754a6bb04216b96fe1) Fix GraphQL FolderTypeCreator::resolveChildrenConnection on PostgreSQL (#901) (Serge Latyntcev)
+ * 2019-01-24 [d530bc2fb](https://github.com/silverstripe/silverstripe-framework/commit/d530bc2fb6c8c290f1f75f39bc4ec898cc326cf1) fix user feedback when jquery could not be loaded (Benedikt Seidl)
+ * 2019-01-13 [5c3b95ac](https://github.com/silverstripe/silverstripe-cms/commit/5c3b95ac8977f77e7d95d4da6333ca12b5ef465f) Multibyte URL routing (Ingo Schommer)
+ * 2019-01-11 [2cb49ea](https://github.com/silverstripe/silverstripe-versioned/commit/2cb49ea79d6babb80289f170dc6102c82f5b0d69) [Warning] on count() with PHP &gt;= 7.2 (Lukas)
+ * 2018-12-12 [0491ca03c](https://github.com/silverstripe/silverstripe-framework/commit/0491ca03cfcbd81690c54cc00f6234675978ef39) prevent death on urls with querystrings & anchors (mikeyc7m)

From 0758cd8416515ec17c57ed8de6daab83e67cab53 Mon Sep 17 00:00:00 2001
From: Aaron Carlino <unclecheese@leftandmain.com>
Date: Tue, 12 Feb 2019 16:46:11 +1300
Subject: [PATCH 18/20] Added 4.2.4 changelog

---
 docs/en/04_Changelogs/4.2.4.md | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 docs/en/04_Changelogs/4.2.4.md

diff --git a/docs/en/04_Changelogs/4.2.4.md b/docs/en/04_Changelogs/4.2.4.md
new file mode 100644
index 000000000..6bf24c1a9
--- /dev/null
+++ b/docs/en/04_Changelogs/4.2.4.md
@@ -0,0 +1,24 @@
+# 4.2.4
+
+<!--- Changes below this line will be automatically regenerated -->
+
+## Change Log
+
+### Security
+
+ * 2018-12-18 [7cc40fe39](https://github.com/silverstripe/silverstripe-framework/commit/7cc40fe392ed907be8fbfc73579b4888840c39e6) Fix potential SQL vulnerability in non-scalar value hyrdation (Maxime Rainville) - See [ss-2018-021](https://www.silverstripe.org/download/security-releases/ss-2018-021)
+
+### Bugfixes
+
+ * 2019-01-31 [cda9eef](https://github.com/silverstripe/silverstripe-assets/commit/cda9eef992b70fd46377be6d4459260d31ea2215) Fix for issue #212 (Joe Madden)
+ * 2019-01-25 [568be8e29](https://github.com/silverstripe/silverstripe-framework/commit/568be8e29b9a6f9205dd28a823ed5294cc95a590) Misconfiguration for versioned cache segmentation (fixes #8754) (Loz Calver)
+ * 2019-01-25 [0797ab7](https://github.com/silverstripe/silverstripe-asset-admin/commit/0797ab7762a4a64f2dc89c754a6bb04216b96fe1) Fix GraphQL FolderTypeCreator::resolveChildrenConnection on PostgreSQL (#901) (Serge Latyntcev)
+ * 2019-01-24 [d00c59c38](https://github.com/silverstripe/silverstripe-framework/commit/d00c59c383dee270c9c1753dd8b64b8cd1b15489) Fix tests not loading fixtures and loading themes in CWP recipe kitchen sink (Robbie Averill)
+ * 2019-01-17 [9ced2347](https://github.com/silverstripe/silverstripe-cms/commit/9ced23473f2f102de5b6d828d093be1102f8d570) Don't convert datalist to arraylist when filtering pages (Damian Mooyman)
+ * 2019-01-13 [5c3b95ac](https://github.com/silverstripe/silverstripe-cms/commit/5c3b95ac8977f77e7d95d4da6333ca12b5ef465f) Multibyte URL routing (Ingo Schommer)
+ * 2019-01-11 [2cb49ea](https://github.com/silverstripe/silverstripe-versioned/commit/2cb49ea79d6babb80289f170dc6102c82f5b0d69) [Warning] on count() with PHP &gt;= 7.2 (Lukas)
+ * 2019-01-10 [34ac22802](https://github.com/silverstripe/silverstripe-framework/commit/34ac228029a4609d993e8604aad16e72bd52ac9c) Fix issue with assertListEquals() ignoring field getters (Damian Mooyman)
+ * 2019-01-08 [c43f4e0](https://github.com/silverstripe/silverstripe-graphql/commit/c43f4e0708fd86e8078ef3326d963005d626baf4) Ensure queries are sorted before limiting (Damian Mooyman)
+ * 2018-12-18 [3d841a4](https://github.com/silverstripe/silverstripe-installer/commit/3d841a409c43752a8192afea5ebc48327e2ac3d3) / Behat tests (Serge Latyntcev)
+ * 2018-12-13 [c4a0d5f0](https://github.com/silverstripe/silverstripe-cms/commit/c4a0d5f0831f0f27022905700a0ffb86cc56aceb) Publish button text merge regression (Aaron Carlino)
+ * 2018-09-27 [ce3a1ce9](https://github.com/silverstripe/silverstripe-cms/commit/ce3a1ce91307424f643a15f0c292e16b35f35873) Use correct subsites namespace in SiteTree and test classes (Robbie Averill)

From 4eeec52b091e0dc09a863679c0d26ec9198efae3 Mon Sep 17 00:00:00 2001
From: Aaron Carlino <unclecheese@leftandmain.com>
Date: Tue, 12 Feb 2019 22:02:19 +1300
Subject: [PATCH 19/20] Added 3.6.7 changelog

---
 docs/en/04_Changelogs/3.6.7.md | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 docs/en/04_Changelogs/3.6.7.md

diff --git a/docs/en/04_Changelogs/3.6.7.md b/docs/en/04_Changelogs/3.6.7.md
new file mode 100644
index 000000000..d4c3ebfdf
--- /dev/null
+++ b/docs/en/04_Changelogs/3.6.7.md
@@ -0,0 +1,21 @@
+# 3.6.7
+
+<!--- Changes below this line will be automatically regenerated -->
+
+## Change Log
+
+### Security
+
+ * 2019-01-10 [c44f06cdf](https://github.com/silverstripe/silverstripe-framework/commit/c44f06cdf10387a987e4efb096ff06b3bb4495ef) Patch SQL Injection vulnerability when arrays are assigned to DataObject Fields (Aaron Carlino) - See [ss-2018-021](https://www.silverstripe.org/download/security-releases/ss-2018-021)
+ * 2018-09-26 [598edd913](https://github.com/silverstripe/silverstripe-framework/commit/598edd91341f389d7b919ec1201e03d2aba4d284) Add confirmation token to dev/build (Loz Calver) - See [ss-2018-019](https://www.silverstripe.org/download/security-releases/ss-2018-019)
+
+### Bugfixes
+
+ * 2019-01-23 [746c0679a](https://github.com/silverstripe/silverstripe-framework/commit/746c0679ad1d6ceac03d2adf167367f0ca2259cd) Injector may instantiate prototypes as if they're singletons (fixes #8567) (Loz Calver)
+ * 2018-11-15 [86701b8cd](https://github.com/silverstripe/silverstripe-framework/commit/86701b8cd0cd5f8de813a7c9347e7c8055d878f4) Redirect loop with multiple URL tokens (fixes #8607) (Loz Calver)
+ * 2018-06-04 [41e601a03](https://github.com/silverstripe/silverstripe-framework/commit/41e601a036307065d9ea2ba8862f67be738d402f) Regression from #8009 (Daniel Hensby)
+ * 2018-05-29 [1cbf27e0f](https://github.com/silverstripe/silverstripe-framework/commit/1cbf27e0f47c3547914b03193d0f5f77c87ff8d5) PHP 5.3 compat for referencing $this in closure, and make method public for same reason (Robbie Averill)
+ * 2018-04-17 [af3a9f3ec](https://github.com/silverstripe/silverstripe-framework/commit/af3a9f3ec8a5465f841c5aa8ee1faf40c1b76bf4) Duplicating many_many relationships looses the extra fields (fixes #7973) (UndefinedOffset)
+ * 2018-03-15 [d17d93f7](https://github.com/silverstripe/silverstripe-cms/commit/d17d93f784a6e01f3d396c55adc623d69a90261a) Remove SearchForm results() function from allowed_actions (Steve Dixon)
+ * 2018-02-16 [86addea1d](https://github.com/silverstripe/silverstripe-framework/commit/86addea1d2a7b2e28ae8115279ae358bcb46648a) Split HTML manipulation to onadd, so elements are not accidentally duplicated (Christopher Joe)
+ * 2018-02-13 [c767e472d](https://github.com/silverstripe/silverstripe-framework/commit/c767e472dc494408460ef47c27b8d34475da4ac6) DataObject singleton creation (Jonathon Menz)

From a481d004ec5d4ca58b8122303692570bb986baba Mon Sep 17 00:00:00 2001
From: Aaron Carlino <unclecheese@leftandmain.com>
Date: Tue, 12 Feb 2019 21:43:37 +1300
Subject: [PATCH 20/20] Added 3.7.3 changelog

---
 docs/en/04_Changelogs/3.7.3.md | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 docs/en/04_Changelogs/3.7.3.md

diff --git a/docs/en/04_Changelogs/3.7.3.md b/docs/en/04_Changelogs/3.7.3.md
new file mode 100644
index 000000000..103b88c8a
--- /dev/null
+++ b/docs/en/04_Changelogs/3.7.3.md
@@ -0,0 +1,16 @@
+# 3.7.3
+
+<!--- Changes below this line will be automatically regenerated -->
+
+## Change Log
+
+### Security
+
+ * 2019-01-10 [6bf9542d6](https://github.com/silverstripe/silverstripe-framework/commit/6bf9542d664ac7935691c8055505b7ad8ea26e9a) Patch SQL Injection vulnerability when arrays are assigned to DataObject Fields (Maxime Rainville) - See [ss-2018-021](https://www.silverstripe.org/download/security-releases/ss-2018-021)
+
+### Bugfixes
+
+ * 2019-01-30 [8e6e70335](https://github.com/silverstripe/silverstripe-framework/commit/8e6e70335895063c6e6cfd99cfcfb50c6f9c2ad9) Block Manifest of the compatibility class Object and lean on model/fieldtypes/compat/autoload.php (UndefinedOffset)
+ * 2019-01-23 [746c0679a](https://github.com/silverstripe/silverstripe-framework/commit/746c0679ad1d6ceac03d2adf167367f0ca2259cd) Injector may instantiate prototypes as if they're singletons (fixes #8567) (Loz Calver)
+ * 2019-01-11 [16a837d6a](https://github.com/silverstripe/silverstripe-framework/commit/16a837d6a093115755cd821c63be1e3be088645b) fix [Warning] on count() with PHP &gt;= 7.2 (lerni)
+ * 2018-11-15 [86701b8cd](https://github.com/silverstripe/silverstripe-framework/commit/86701b8cd0cd5f8de813a7c9347e7c8055d878f4) Redirect loop with multiple URL tokens (fixes #8607) (Loz Calver)