From 365f646bdc2d743df7f522942eb7cba03e20cb30 Mon Sep 17 00:00:00 2001 From: Garion Herman Date: Tue, 18 Feb 2020 16:49:35 +1300 Subject: [PATCH 1/2] FIX Apply mcrypt requirement --- composer.json | 6 ------ 1 file changed, 6 deletions(-) diff --git a/composer.json b/composer.json index 8f1ffa5..b3f2068 100644 --- a/composer.json +++ b/composer.json @@ -19,8 +19,6 @@ "silverstripe/textextraction": "3.x-dev", "silverstripe/realme": "4.x-dev", "silverstripe/ckan-registry": "1.x-dev", - "silverstripe/mfa": "4.x-dev", - "silverstripe/totp-authenticator": "4.x-dev", "silverstripe/webauthn-authenticator": "4.x-dev", "silverstripe/security-extensions": "4.x-dev", "silverstripe/login-forms": "4.x-dev", @@ -33,10 +31,6 @@ "mikey179/vfsstream": "^1.6", "sminnee/phpunit-mock-objects": "^3.4.5" }, - "suggest": { - "silverstripe/mfa": "Add MFA authentication. Only available in PHP ^7.1.", - "silverstripe/totp-authenticator": "Add TOTP for the silverstripe/mfa module. Only available in PHP ^7.1." - }, "extra": { "project-files": [] }, From 79d1ac9657d3644a423279219c5632dd8c08ccc7 Mon Sep 17 00:00:00 2001 From: brynwhyman Date: Mon, 2 Mar 2020 16:51:43 +1300 Subject: [PATCH 2/2] DOCS new branding in cwp change log template One sentence really needed a re-work, so I've also updated 'Silverstripe' to match recent branding changes. We'd be doing the same in future release announcements too. --- .changelog.md.twig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.changelog.md.twig b/.changelog.md.twig index 387bed4..9be22d5 100644 --- a/.changelog.md.twig +++ b/.changelog.md.twig @@ -2,7 +2,7 @@ ## Overview -This release includes [CMS and Framework version X.X.X](#). +This release includes [Silverstripe CMS version X.X.X](#). {% if version.stability == 'rc' %} @@ -12,7 +12,7 @@ This version of CWP is a **release candidate** for an upcoming stable version, a {% elseif version.stable %} -Upgrading to Recipe {{ version }} is recommended for all CWP sites. This upgrade can be carried out by any development team familiar with SilverStripe. However, if you would like SilverStripe's assistance, you can request support via the [Service Desk](https://www.cwp.govt.nz/service-desk/new-request/). +Upgrading to Recipe {{ version }} is recommended for all CWP sites. This upgrade can be carried out by any development team familiar with the Silverstripe CMS. However, if you would like Silverstripe and the CWP team's assistance, you can request support via the [Service Desk](https://www.cwp.govt.nz/service-desk/new-request/). ## New features