From 6dc90f8c7f64d8f57194fd10b0ba87fb25c59076 Mon Sep 17 00:00:00 2001 From: Guy Sartorelli Date: Fri, 10 Mar 2023 12:21:31 +1300 Subject: [PATCH 1/5] MNT Update development dependencies --- composer.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/composer.json b/composer.json index 85c1718d..c756b2df 100644 --- a/composer.json +++ b/composer.json @@ -26,12 +26,12 @@ ], "require": { "php": "^7.4 || ^8.0", - "silverstripe/framework": "^4.10", - "silverstripe/admin": "^1.1", - "silverstripe/siteconfig": "^4.1", + "silverstripe/framework": "4.13.x-dev", + "silverstripe/admin": "1.13.x-dev", + "silverstripe/siteconfig": "4.13.x-dev", "defuse/php-encryption": "^2.2", - "silverstripe/login-forms": "^4.0", - "silverstripe/security-extensions": "^4.0" + "silverstripe/login-forms": "4.9.x-dev", + "silverstripe/security-extensions": "4.5.x-dev" }, "require-dev": { "phpunit/phpunit": "^9.5", From 3b7e55d1129773eeb9dc792d01bba025fad70cb4 Mon Sep 17 00:00:00 2001 From: Guy Sartorelli Date: Fri, 10 Mar 2023 16:37:33 +1300 Subject: [PATCH 2/5] MNT Update release dependencies --- composer.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/composer.json b/composer.json index c756b2df..401dd349 100644 --- a/composer.json +++ b/composer.json @@ -26,12 +26,12 @@ ], "require": { "php": "^7.4 || ^8.0", - "silverstripe/framework": "4.13.x-dev", - "silverstripe/admin": "1.13.x-dev", - "silverstripe/siteconfig": "4.13.x-dev", + "silverstripe/framework": "4.13.0-beta1", + "silverstripe/admin": "1.13.0-beta1", + "silverstripe/siteconfig": "4.13.0-beta1", "defuse/php-encryption": "^2.2", - "silverstripe/login-forms": "4.9.x-dev", - "silverstripe/security-extensions": "4.5.x-dev" + "silverstripe/login-forms": "4.9.0-beta1", + "silverstripe/security-extensions": "4.5.0-beta1" }, "require-dev": { "phpunit/phpunit": "^9.5", From 54802f12f9bec4926d1ad737942f8bc063e59cdd Mon Sep 17 00:00:00 2001 From: Guy Sartorelli Date: Fri, 10 Mar 2023 16:37:36 +1300 Subject: [PATCH 3/5] MNT Update development dependencies --- composer.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/composer.json b/composer.json index 401dd349..c756b2df 100644 --- a/composer.json +++ b/composer.json @@ -26,12 +26,12 @@ ], "require": { "php": "^7.4 || ^8.0", - "silverstripe/framework": "4.13.0-beta1", - "silverstripe/admin": "1.13.0-beta1", - "silverstripe/siteconfig": "4.13.0-beta1", + "silverstripe/framework": "4.13.x-dev", + "silverstripe/admin": "1.13.x-dev", + "silverstripe/siteconfig": "4.13.x-dev", "defuse/php-encryption": "^2.2", - "silverstripe/login-forms": "4.9.0-beta1", - "silverstripe/security-extensions": "4.5.0-beta1" + "silverstripe/login-forms": "4.9.x-dev", + "silverstripe/security-extensions": "4.5.x-dev" }, "require-dev": { "phpunit/phpunit": "^9.5", From f04381d4c061b6fcbe36fdbe74dca560be9cf0df Mon Sep 17 00:00:00 2001 From: Steve Boyd Date: Fri, 24 Mar 2023 12:06:27 +1300 Subject: [PATCH 4/5] ENH Update translations --- lang/da.yml | 75 ----------------------------------------------------- 1 file changed, 75 deletions(-) diff --git a/lang/da.yml b/lang/da.yml index 55761dad..9fb3df5a 100644 --- a/lang/da.yml +++ b/lang/da.yml @@ -8,80 +8,5 @@ da: MUST_USE_EXISTING_METHOD: 'Denne bruger har allerede en MFA metode' NOT_AUTHENTICATING: 'Du skal være logget ind eller være i gang med at logge ind. Opdater siden og prøv igen.' SUDO_MODE_REQUIRED: 'Du skal gen-bekræfte din konto før du kan fortsætte. Opdater og forsøg igen.' - SilverStripe\MFA\BackupCode\Method: - NAME: '' - SilverStripe\MFA\BackupCode\RegisterHandler: - DESCRIPTION: '' - SUPPORT_LINK_DESCRIPTION: '' - SilverStripe\MFA\BackupCode\VerifyHandler: - INVALID_CODE: '' - MFAREMOVED: '' SilverStripe\MFA\Controller\AdminRegistrationController: - COULD_NOT_DELETE: '' - COULD_NOT_SET_DEFAULT: '' - CSRF_FAILURE: '' INVALID_METHOD: 'Ingen sådan metode tilgængelig' - INVALID_REGISTERED_METHOD: '' - INVALID_SESSION: '' - MENUTITLE: '' - SilverStripe\MFA\Email\AccountReset: - ACTION: '' - DESCRIPTION: '' - HI: '' - SilverStripe\MFA\Email\Notification: - CODESLEFT: '' - HELLO: '' - NOTYOU: '' - REGISTERED: '' - REMOVED: '' - USEDBACKUPCODE: '' - SilverStripe\MFA\Extension\AccountReset\SecurityAdminExtension: - ACCOUNT_RESET_EMAIL_SUBJECT: '' - BAD_REQUEST: '' - EMAIL_NOT_SENT: '' - INSUFFICIENT_PERMISSIONS: '' - INVALID_CSRF_TOKEN: '' - INVALID_MEMBER: '' - SilverStripe\MFA\Extension\AccountReset\SecurityExtension: - ACCOUNT_RESET_DESCRIPTION: '' - ACCOUNT_RESET_TITLE: '' - ALREADYAUTHENTICATEDBODY: '' - ALREADYAUTHENTICATEDTITLE: '' - INVALIDTOKENBODY: '' - INVALIDTOKENTITLE: '' - RESETSUCCESSMESSAGE: '' - RESETTIMEDOUT: '' - SilverStripe\MFA\Extension\MemberExtension: - MFA_PERMISSION_DESCRIPTION: '' - MFA_PERMISSION_LABEL: '' - MFA_SETTINGS_FIELD_LABEL: '' - SilverStripe\MFA\Extension\SiteConfigExtension: - MFA_GRACE_DESCRIPTION: '' - MFA_GRACE_TITLE: '' - MFA_LEARN_MORE: '' - MFA_OPTIONAL: '' - MFA_REQUIRED: '' - MULTI_FACTOR_AUTHENTICATION: '' - SilverStripe\MFA\Model\RegisteredMethod: - PLURALNAME: '' - PLURALS: - one: '' - other: '' - SINGULARNAME: '' - SilverStripe\MFA\Report\EnabledMembers: - ANY_AT_LEAST_ONE: '' - COLUMN_METHODS_REGISTERED: '' - COLUMN_METHOD_DEFAULT: '' - COLUMN_SKIPPED_REGISTRATION: '' - FILTER_MEMBER_DESCRIPTION: '' - NONE: '' - SilverStripe\MFA\RequestHandler: - CSRF_FAILURE: '' - METHOD_ALREADY_REGISTERED: '' - METHOD_MISMATCH: '' - METHOD_NOT_PROVIDED: '' - METHOD_NOT_REGISTERED: '' - NO_REGISTRATION_IN_PROGRESS: '' - SilverStripe\MFA\Service\RegisteredMethodManager: - MFAADDED: '' - MFAREMOVED: '' From 2ca799940b18b7830c95c43d795948da086e2cec Mon Sep 17 00:00:00 2001 From: Guy Sartorelli Date: Tue, 28 Mar 2023 14:55:39 +1300 Subject: [PATCH 5/5] MNT Revert erroneous dependency changes --- composer.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/composer.json b/composer.json index c756b2df..85c1718d 100644 --- a/composer.json +++ b/composer.json @@ -26,12 +26,12 @@ ], "require": { "php": "^7.4 || ^8.0", - "silverstripe/framework": "4.13.x-dev", - "silverstripe/admin": "1.13.x-dev", - "silverstripe/siteconfig": "4.13.x-dev", + "silverstripe/framework": "^4.10", + "silverstripe/admin": "^1.1", + "silverstripe/siteconfig": "^4.1", "defuse/php-encryption": "^2.2", - "silverstripe/login-forms": "4.9.x-dev", - "silverstripe/security-extensions": "4.5.x-dev" + "silverstripe/login-forms": "^4.0", + "silverstripe/security-extensions": "^4.0" }, "require-dev": { "phpunit/phpunit": "^9.5",