From 93e79034dc3c429d392ba2e5e37e4ebd73a1e156 Mon Sep 17 00:00:00 2001 From: Guy Sartorelli Date: Fri, 10 Mar 2023 12:21:27 +1300 Subject: [PATCH 1/6] MNT Update development dependencies --- composer.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/composer.json b/composer.json index 48aad992..144d710b 100644 --- a/composer.json +++ b/composer.json @@ -21,10 +21,10 @@ ], "require": { "php": "^7.4 || ^8.0", - "silverstripe/admin": "^1.6", - "silverstripe/framework": "^4.10", - "silverstripe/versioned": "^1.6", - "silverstripe/graphql": "^3.5 || ^4", + "silverstripe/admin": "1.13.x-dev", + "silverstripe/framework": "4.13.x-dev", + "silverstripe/versioned": "1.13.x-dev", + "silverstripe/graphql": "3.8.x-dev || 4.2.x-dev", "silverstripe/vendor-plugin": "^1" }, "require-dev": { @@ -49,4 +49,4 @@ }, "minimum-stability": "dev", "prefer-stable": true -} +} \ No newline at end of file From 040f014af6e19fa78aef96a3ca09d0bfea66e98a Mon Sep 17 00:00:00 2001 From: Guy Sartorelli Date: Fri, 10 Mar 2023 16:30:29 +1300 Subject: [PATCH 2/6] MNT Update release dependencies --- composer.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.json b/composer.json index 144d710b..1de93d77 100644 --- a/composer.json +++ b/composer.json @@ -21,10 +21,10 @@ ], "require": { "php": "^7.4 || ^8.0", - "silverstripe/admin": "1.13.x-dev", - "silverstripe/framework": "4.13.x-dev", - "silverstripe/versioned": "1.13.x-dev", - "silverstripe/graphql": "3.8.x-dev || 4.2.x-dev", + "silverstripe/admin": "1.13.0-beta1", + "silverstripe/framework": "4.13.0-beta1", + "silverstripe/versioned": "1.13.0-beta1", + "silverstripe/graphql": "~3.8.1@stable || 4.2.2@stable", "silverstripe/vendor-plugin": "^1" }, "require-dev": { From 3adc5e371c93e31fe8be18e041985ede8ba6f558 Mon Sep 17 00:00:00 2001 From: Guy Sartorelli Date: Fri, 10 Mar 2023 16:30:32 +1300 Subject: [PATCH 3/6] MNT Update development dependencies --- composer.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.json b/composer.json index 1de93d77..144d710b 100644 --- a/composer.json +++ b/composer.json @@ -21,10 +21,10 @@ ], "require": { "php": "^7.4 || ^8.0", - "silverstripe/admin": "1.13.0-beta1", - "silverstripe/framework": "4.13.0-beta1", - "silverstripe/versioned": "1.13.0-beta1", - "silverstripe/graphql": "~3.8.1@stable || 4.2.2@stable", + "silverstripe/admin": "1.13.x-dev", + "silverstripe/framework": "4.13.x-dev", + "silverstripe/versioned": "1.13.x-dev", + "silverstripe/graphql": "3.8.x-dev || 4.2.x-dev", "silverstripe/vendor-plugin": "^1" }, "require-dev": { From c30e0b671bee5f87d055e6fecb2c99281e8343ed Mon Sep 17 00:00:00 2001 From: Steve Boyd Date: Tue, 21 Mar 2023 12:17:08 +1300 Subject: [PATCH 4/6] MNT Use gha-dispatch-ci --- .github/workflows/ci.yml | 5 ----- .github/workflows/dispatch-ci.yml | 16 ++++++++++++++++ 2 files changed, 16 insertions(+), 5 deletions(-) create mode 100644 .github/workflows/dispatch-ci.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6b431f8c..bf02210e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -4,13 +4,8 @@ on: push: pull_request: workflow_dispatch: - # Every Monday at 11:30am UTC - schedule: - - cron: '30 11 * * 1' jobs: ci: name: CI - # Only run cron on the silverstripe account - if: (github.event_name == 'schedule' && github.repository_owner == 'silverstripe') || (github.event_name != 'schedule') uses: silverstripe/gha-ci/.github/workflows/ci.yml@v1 diff --git a/.github/workflows/dispatch-ci.yml b/.github/workflows/dispatch-ci.yml new file mode 100644 index 00000000..3faa0313 --- /dev/null +++ b/.github/workflows/dispatch-ci.yml @@ -0,0 +1,16 @@ +name: Dispatch CI + +on: + # At 11:30 AM UTC, only on Monday and Tuesday + schedule: + - cron: '30 11 * * 1,2' + +jobs: + dispatch-ci: + name: Dispatch CI + # Only run cron on the silverstripe account + if: (github.event_name == 'schedule' && github.repository_owner == 'silverstripe') || (github.event_name != 'schedule') + runs-on: ubuntu-latest + steps: + - name: Dispatch CI + uses: silverstripe/gha-dispatch-ci@v1 From 17a9b01e290a32732436dd6f9126cb0d928b8f80 Mon Sep 17 00:00:00 2001 From: Steve Boyd Date: Fri, 24 Mar 2023 12:06:28 +1300 Subject: [PATCH 5/6] ENH Update translations --- lang/ar.yml | 10 ---------- lang/bg.yml | 14 -------------- lang/da.yml | 5 ----- lang/de.yml | 10 ---------- lang/fi.yml | 13 ------------- lang/fi_FI.yml | 10 ---------- lang/fr.yml | 8 -------- lang/it.yml | 5 ----- lang/pl.yml | 5 ----- lang/sl.yml | 5 ----- lang/sv.yml | 14 -------------- 11 files changed, 99 deletions(-) diff --git a/lang/ar.yml b/lang/ar.yml index 1623b431..85c5a3aa 100644 --- a/lang/ar.yml +++ b/lang/ar.yml @@ -9,15 +9,5 @@ ar: SELECT_EMPTY: اختر... SELECT_TYPE: 'اختر نوع المحتوى' TAB_OTHERS: أخرى - SilverStripe\VersionedAdmin\Controllers\CMSPageHistoryViewerController: - MENUTITLE: '' SilverStripe\VersionedAdmin\Controllers\HistoryViewerController: ErrorItemViewPermissionDenied: 'ليس لديك الصلاحيات اللازمة لعرض {ObjectTitle}' - MENUTITLE: '' - SilverStripe\VersionedAdmin\Forms\DiffField: - NO_DIFF_AVAILABLE: '' - SilverStripe\Versioned\RestoreAction: - RESTORE: '' - RESTORE_DESC: '' - RESTORE_TO_ROOT: '' - RESTORE_TO_ROOT_DESC: '' diff --git a/lang/bg.yml b/lang/bg.yml index 27725e8f..c168d177 100644 --- a/lang/bg.yml +++ b/lang/bg.yml @@ -7,17 +7,3 @@ bg: COLUMN_TYPE: Тип SELECT_EMPTY: Изберете... SELECT_TYPE: 'Изберете тип съдържание' - TAB_OTHERS: '' - MENUTITLE: '' - SilverStripe\VersionedAdmin\Controllers\CMSPageHistoryViewerController: - MENUTITLE: '' - SilverStripe\VersionedAdmin\Controllers\HistoryViewerController: - ErrorItemViewPermissionDenied: '' - MENUTITLE: '' - SilverStripe\VersionedAdmin\Forms\DiffField: - NO_DIFF_AVAILABLE: '' - SilverStripe\Versioned\RestoreAction: - RESTORE: '' - RESTORE_DESC: '' - RESTORE_TO_ROOT: '' - RESTORE_TO_ROOT_DESC: '' diff --git a/lang/da.yml b/lang/da.yml index a9b9107d..1be5ac88 100644 --- a/lang/da.yml +++ b/lang/da.yml @@ -16,8 +16,3 @@ da: MENUTITLE: SilverStripe\VersionedAdmin\Controllers\HistoryViewerController SilverStripe\VersionedAdmin\Forms\DiffField: NO_DIFF_AVAILABLE: 'Ingen diff tilgængelig' - SilverStripe\Versioned\RestoreAction: - RESTORE: '' - RESTORE_DESC: '' - RESTORE_TO_ROOT: '' - RESTORE_TO_ROOT_DESC: '' diff --git a/lang/de.yml b/lang/de.yml index 209d662f..2cfad79a 100644 --- a/lang/de.yml +++ b/lang/de.yml @@ -9,15 +9,5 @@ de: SELECT_EMPTY: Auswählen... SELECT_TYPE: 'Inhaltstyp auswählen' TAB_OTHERS: Andere - SilverStripe\VersionedAdmin\Controllers\CMSPageHistoryViewerController: - MENUTITLE: '' SilverStripe\VersionedAdmin\Controllers\HistoryViewerController: ErrorItemViewPermissionDenied: 'Sie haben nicht die nötigen Berechtigungen, um {ObjectTitle} auszuwählen' - MENUTITLE: '' - SilverStripe\VersionedAdmin\Forms\DiffField: - NO_DIFF_AVAILABLE: '' - SilverStripe\Versioned\RestoreAction: - RESTORE: '' - RESTORE_DESC: '' - RESTORE_TO_ROOT: '' - RESTORE_TO_ROOT_DESC: '' diff --git a/lang/fi.yml b/lang/fi.yml index ac4eb69e..c0f80fe2 100644 --- a/lang/fi.yml +++ b/lang/fi.yml @@ -8,16 +8,3 @@ fi: MENUTITLE: Arkistot SELECT_EMPTY: Valitse... SELECT_TYPE: 'Valitse sisällön tyyppi' - TAB_OTHERS: '' - SilverStripe\VersionedAdmin\Controllers\CMSPageHistoryViewerController: - MENUTITLE: '' - SilverStripe\VersionedAdmin\Controllers\HistoryViewerController: - ErrorItemViewPermissionDenied: '' - MENUTITLE: '' - SilverStripe\VersionedAdmin\Forms\DiffField: - NO_DIFF_AVAILABLE: '' - SilverStripe\Versioned\RestoreAction: - RESTORE: '' - RESTORE_DESC: '' - RESTORE_TO_ROOT: '' - RESTORE_TO_ROOT_DESC: '' diff --git a/lang/fi_FI.yml b/lang/fi_FI.yml index 7d869a13..7cdd3b3b 100644 --- a/lang/fi_FI.yml +++ b/lang/fi_FI.yml @@ -9,15 +9,5 @@ fi_FI: SELECT_EMPTY: Valitse... SELECT_TYPE: 'Valitse sisältötyyppi' TAB_OTHERS: Muut - SilverStripe\VersionedAdmin\Controllers\CMSPageHistoryViewerController: - MENUTITLE: '' SilverStripe\VersionedAdmin\Controllers\HistoryViewerController: ErrorItemViewPermissionDenied: 'Oikeutesi eivät riitä {ObjectTitle} tarkasteluun' - MENUTITLE: '' - SilverStripe\VersionedAdmin\Forms\DiffField: - NO_DIFF_AVAILABLE: '' - SilverStripe\Versioned\RestoreAction: - RESTORE: '' - RESTORE_DESC: '' - RESTORE_TO_ROOT: '' - RESTORE_TO_ROOT_DESC: '' diff --git a/lang/fr.yml b/lang/fr.yml index a906bad7..94651812 100644 --- a/lang/fr.yml +++ b/lang/fr.yml @@ -13,11 +13,3 @@ fr: MENUTITLE: 'Éditer la page' SilverStripe\VersionedAdmin\Controllers\HistoryViewerController: ErrorItemViewPermissionDenied: 'Vous n''avez pas les permissions nécessaires pour voir {ObjectTitle}' - MENUTITLE: '' - SilverStripe\VersionedAdmin\Forms\DiffField: - NO_DIFF_AVAILABLE: '' - SilverStripe\Versioned\RestoreAction: - RESTORE: '' - RESTORE_DESC: '' - RESTORE_TO_ROOT: '' - RESTORE_TO_ROOT_DESC: '' diff --git a/lang/it.yml b/lang/it.yml index 26db5284..97a70996 100644 --- a/lang/it.yml +++ b/lang/it.yml @@ -16,8 +16,3 @@ it: MENUTITLE: SilverStripe\VersionedAdmin\Controllers\HistoryViewerController SilverStripe\VersionedAdmin\Forms\DiffField: NO_DIFF_AVAILABLE: 'Diff non disponibile' - SilverStripe\Versioned\RestoreAction: - RESTORE: '' - RESTORE_DESC: '' - RESTORE_TO_ROOT: '' - RESTORE_TO_ROOT_DESC: '' diff --git a/lang/pl.yml b/lang/pl.yml index c21f84c9..aeea3d97 100644 --- a/lang/pl.yml +++ b/lang/pl.yml @@ -16,8 +16,3 @@ pl: MENUTITLE: HistoryViewer SilverStripe\VersionedAdmin\Forms\DiffField: NO_DIFF_AVAILABLE: 'Nie znaleziono różnic w stronach' - SilverStripe\Versioned\RestoreAction: - RESTORE: '' - RESTORE_DESC: '' - RESTORE_TO_ROOT: '' - RESTORE_TO_ROOT_DESC: '' diff --git a/lang/sl.yml b/lang/sl.yml index db83674c..40a13c2e 100644 --- a/lang/sl.yml +++ b/lang/sl.yml @@ -16,8 +16,3 @@ sl: MENUTITLE: SilverStripe\VersionedAdmin\Controllers\HistoryViewerController SilverStripe\VersionedAdmin\Forms\DiffField: NO_DIFF_AVAILABLE: 'Spremembe niso na voljo' - SilverStripe\Versioned\RestoreAction: - RESTORE: '' - RESTORE_DESC: '' - RESTORE_TO_ROOT: '' - RESTORE_TO_ROOT_DESC: '' diff --git a/lang/sv.yml b/lang/sv.yml index a357ac69..4087325b 100644 --- a/lang/sv.yml +++ b/lang/sv.yml @@ -7,17 +7,3 @@ sv: COLUMN_TYPE: Typ SELECT_EMPTY: Välj... SELECT_TYPE: 'Välj en innehållstyp' - TAB_OTHERS: '' - MENUTITLE: '' - SilverStripe\VersionedAdmin\Controllers\CMSPageHistoryViewerController: - MENUTITLE: '' - SilverStripe\VersionedAdmin\Controllers\HistoryViewerController: - ErrorItemViewPermissionDenied: '' - MENUTITLE: '' - SilverStripe\VersionedAdmin\Forms\DiffField: - NO_DIFF_AVAILABLE: '' - SilverStripe\Versioned\RestoreAction: - RESTORE: '' - RESTORE_DESC: '' - RESTORE_TO_ROOT: '' - RESTORE_TO_ROOT_DESC: '' From fe95ac9e40805d73cb940e63e54bc41934cf5385 Mon Sep 17 00:00:00 2001 From: Guy Sartorelli <36352093+GuySartorelli@users.noreply.github.com> Date: Tue, 28 Mar 2023 16:54:24 +1300 Subject: [PATCH 6/6] MNT Revert erroneous dependency changes (#279) --- composer.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/composer.json b/composer.json index 144d710b..48aad992 100644 --- a/composer.json +++ b/composer.json @@ -21,10 +21,10 @@ ], "require": { "php": "^7.4 || ^8.0", - "silverstripe/admin": "1.13.x-dev", - "silverstripe/framework": "4.13.x-dev", - "silverstripe/versioned": "1.13.x-dev", - "silverstripe/graphql": "3.8.x-dev || 4.2.x-dev", + "silverstripe/admin": "^1.6", + "silverstripe/framework": "^4.10", + "silverstripe/versioned": "^1.6", + "silverstripe/graphql": "^3.5 || ^4", "silverstripe/vendor-plugin": "^1" }, "require-dev": { @@ -49,4 +49,4 @@ }, "minimum-stability": "dev", "prefer-stable": true -} \ No newline at end of file +}