From 48a0d946f45826cb3c7ffd3722b18d1d9acd6863 Mon Sep 17 00:00:00 2001 From: "James (DPC)" Date: Fri, 2 Jun 2023 14:51:23 +1000 Subject: [PATCH 01/31] Bump silverstripe/recipe-cms to ^5 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index a70fd8c..14431a5 100644 --- a/composer.json +++ b/composer.json @@ -64,7 +64,7 @@ "silverstripe/contentreview": "^4.5.0", "silverstripe/gridfieldqueuedexport": "^2.7.0", "silverstripe/lumberjack": "^2.2.0", - "silverstripe/recipe-cms": "^4.10.0", + "silverstripe/recipe-cms": "^5", "silverstripe/sharedraftcontent": "^2.7.0", "silverstripe/userforms": "^5.13.0", "silverstripe/versioned-admin": "^1.10.0", From efb897b8e1fbfa90d140a2d8ba18dd2240133f16 Mon Sep 17 00:00:00 2001 From: "James (DPC)" Date: Fri, 2 Jun 2023 14:54:57 +1000 Subject: [PATCH 02/31] Remove trailing slash middleware, to replace with canonical --- composer.json | 1 - 1 file changed, 1 deletion(-) diff --git a/composer.json b/composer.json index 14431a5..f514e6e 100644 --- a/composer.json +++ b/composer.json @@ -22,7 +22,6 @@ "user experience" ], "require": { - "axllent/silverstripe-trailing-slash": "^2.2.0", "bigfork/silverstripe-simpledatefield": "^0.2", "bummzack/sortablefile": "^2.1.0", "codem/silverstripe-damn-fine-uploader": "^0.4", From fdb849179317d6d06cac1a9d3ef74d4986b23203 Mon Sep 17 00:00:00 2001 From: "James (DPC)" Date: Fri, 2 Jun 2023 14:57:04 +1000 Subject: [PATCH 03/31] Replace simple date field --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index f514e6e..aaee6f5 100644 --- a/composer.json +++ b/composer.json @@ -22,7 +22,7 @@ "user experience" ], "require": { - "bigfork/silverstripe-simpledatefield": "^0.2", + "nswdpc/silverstripe-datetime-inputs": "^1", "bummzack/sortablefile": "^2.1.0", "codem/silverstripe-damn-fine-uploader": "^0.4", "dnadesign/silverstripe-elemental": "^4.9.0", From 2dba1a2f49b8ff664bca430152c048d6181d9982 Mon Sep 17 00:00:00 2001 From: "James (DPC)" Date: Fri, 2 Jun 2023 15:20:28 +1000 Subject: [PATCH 04/31] WIP: module minimum required version updates --- composer.json | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/composer.json b/composer.json index aaee6f5..8cd0c88 100644 --- a/composer.json +++ b/composer.json @@ -23,21 +23,21 @@ ], "require": { "nswdpc/silverstripe-datetime-inputs": "^1", - "bummzack/sortablefile": "^2.1.0", + "bummzack/sortablefile": "^2.2.0", "codem/silverstripe-damn-fine-uploader": "^0.4", - "dnadesign/silverstripe-elemental": "^4.9.0", - "dnadesign/silverstripe-elemental-list": "^1.2.0", + "dnadesign/silverstripe-elemental": "^5", + "dnadesign/silverstripe-elemental-list": "^2", "dnadesign/silverstripe-elemental-virtual": "^1.2.2", - "dnadesign/silverstripe-elemental-userforms": "^3.2.0", + "dnadesign/silverstripe-elemental-userforms": "^4", "drmartingonzo/tinymce-ss4-theme": "^1.0.0", "dynamic/silverstripe-elemental-section-navigation": "^2.0.0", - "firebrandhq/silverstripe-phonelink": "^2.1.0", - "fromholdio/silverstripe-errorpagesconfig": "^1.0.0", + "firebrandhq/silverstripe-phonelink": "^3", + "fromholdio/silverstripe-errorpagesconfig": "^1.1.0", "gorriecoe/silverstripe-embed": "^1.0.0", "gorriecoe/silverstripe-linkfield": "^1.0.1", - "innoweb/silverstripe-robots": "^4", - "innoweb/silverstripe-social-metadata": "^7", - "jonom/focuspoint": "^4", + "innoweb/silverstripe-robots": "^5", + "innoweb/silverstripe-social-metadata": "^8", + "jonom/focuspoint": "^5", "jonom/silverstripe-text-target-length": "^2.0.0", "nglasl/silverstripe-mediawesome": "^4.0.6", "nglasl/silverstripe-misdirection": "^3.1.1", @@ -59,26 +59,26 @@ "nswdpc/silverstripe-recaptcha-v3-userforms": "^0.2", "nswdpc/silverstripe-search-boilerplate": "^0.2", "nswdpc/silverstripe-thereisnouserform" : "^0.1", - "purplespider/asset-alt-text": "^1.0.0", - "silverstripe/contentreview": "^4.5.0", - "silverstripe/gridfieldqueuedexport": "^2.7.0", - "silverstripe/lumberjack": "^2.2.0", + "purplespider/asset-alt-text": "^1.2.1", + "silverstripe/contentreview": "^5", + "silverstripe/gridfieldqueuedexport": "^3", + "silverstripe/lumberjack": "^3", "silverstripe/recipe-cms": "^5", - "silverstripe/sharedraftcontent": "^2.7.0", - "silverstripe/userforms": "^5.13.0", - "silverstripe/versioned-admin": "^1.10.0", - "symbiote/silverstripe-advancedworkflow": "^5.6.0", + "silverstripe/sharedraftcontent": "^3", + "silverstripe/userforms": "^6", + "silverstripe/versioned-admin": "^2", + "symbiote/silverstripe-advancedworkflow": "^6", "symbiote/silverstripe-contentreplace": "^2.0.1", "symbiote/silverstripe-datachange-tracker": "^5.0.3", "symbiote/silverstripe-dynamiclists": "^2.0.8", "symbiote/silverstripe-elemental-listingpagelisting": "^2.0.2", - "symbiote/silverstripe-gridfieldextensions": "^3.3", - "symbiote/silverstripe-grouped-cms-menu": "^4.0.1", + "symbiote/silverstripe-gridfieldextensions": "^4", + "symbiote/silverstripe-grouped-cms-menu": "^4.1", "symbiote/silverstripe-listingpage": "^2.3.3", - "symbiote/silverstripe-multivaluefield": "^5.3.0", + "symbiote/silverstripe-multivaluefield": "^6", "symbiote/silverstripe-usertemplates": "^2.1.0", - "unclecheese/display-logic": "^2.0.4", - "wilr/silverstripe-googlesitemaps": "^2.2.1" + "unclecheese/display-logic": "^3", + "wilr/silverstripe-googlesitemaps": "^3" }, "autoload": { "psr-4": { From 8ee176dc178f57fa3827562deafd7e91b3416549 Mon Sep 17 00:00:00 2001 From: "James (DPC)" Date: Fri, 2 Jun 2023 15:22:11 +1000 Subject: [PATCH 05/31] Remove tinymce theme module --- composer.json | 1 - 1 file changed, 1 deletion(-) diff --git a/composer.json b/composer.json index 8cd0c88..66a7cee 100644 --- a/composer.json +++ b/composer.json @@ -29,7 +29,6 @@ "dnadesign/silverstripe-elemental-list": "^2", "dnadesign/silverstripe-elemental-virtual": "^1.2.2", "dnadesign/silverstripe-elemental-userforms": "^4", - "drmartingonzo/tinymce-ss4-theme": "^1.0.0", "dynamic/silverstripe-elemental-section-navigation": "^2.0.0", "firebrandhq/silverstripe-phonelink": "^3", "fromholdio/silverstripe-errorpagesconfig": "^1.1.0", From 6a9008690043f801060921817e9823e9c3342d2f Mon Sep 17 00:00:00 2001 From: "James (DPC)" Date: Fri, 2 Jun 2023 15:22:54 +1000 Subject: [PATCH 06/31] Bump recaptcha module version --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 66a7cee..872eab5 100644 --- a/composer.json +++ b/composer.json @@ -55,7 +55,7 @@ "nswdpc/silverstripe-elemental-slider": "^0.2.1", "nswdpc/silverstripe-elemental-taxonomy": "^0.1", "nswdpc/silverstripe-inline-linker": "dev-master", - "nswdpc/silverstripe-recaptcha-v3-userforms": "^0.2", + "nswdpc/silverstripe-recaptcha-v3-userforms": "^1", "nswdpc/silverstripe-search-boilerplate": "^0.2", "nswdpc/silverstripe-thereisnouserform" : "^0.1", "purplespider/asset-alt-text": "^1.2.1", From 07beef9471a9775267654e67d425bb15d1926013 Mon Sep 17 00:00:00 2001 From: James Ellis <69664712+JamesDPC@users.noreply.github.com> Date: Fri, 2 Jun 2023 16:30:41 +1000 Subject: [PATCH 07/31] Update minimum requirement for module --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 872eab5..14d5677 100644 --- a/composer.json +++ b/composer.json @@ -57,7 +57,7 @@ "nswdpc/silverstripe-inline-linker": "dev-master", "nswdpc/silverstripe-recaptcha-v3-userforms": "^1", "nswdpc/silverstripe-search-boilerplate": "^0.2", - "nswdpc/silverstripe-thereisnouserform" : "^0.1", + "nswdpc/silverstripe-thereisnouserform" : "^1", "purplespider/asset-alt-text": "^1.2.1", "silverstripe/contentreview": "^5", "silverstripe/gridfieldqueuedexport": "^3", From bc0811a73a4d96c1a7ae46dff65e531cb765b3dd Mon Sep 17 00:00:00 2001 From: James Ellis <69664712+JamesDPC@users.noreply.github.com> Date: Fri, 2 Jun 2023 17:06:39 +1000 Subject: [PATCH 08/31] Update minimum requirement for module --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 14d5677..54553b3 100644 --- a/composer.json +++ b/composer.json @@ -53,7 +53,7 @@ "nswdpc/silverstripe-elemental-quickgallery": "^0.2", "nswdpc/silverstripe-schema-specialannouncement": "^0.2", "nswdpc/silverstripe-elemental-slider": "^0.2.1", - "nswdpc/silverstripe-elemental-taxonomy": "^0.1", + "nswdpc/silverstripe-elemental-taxonomy": "^1", "nswdpc/silverstripe-inline-linker": "dev-master", "nswdpc/silverstripe-recaptcha-v3-userforms": "^1", "nswdpc/silverstripe-search-boilerplate": "^0.2", From 1cb10cbbe2e43bffc064e9ee3de488b36a7121bb Mon Sep 17 00:00:00 2001 From: James Ellis <69664712+JamesDPC@users.noreply.github.com> Date: Fri, 2 Jun 2023 17:24:51 +1000 Subject: [PATCH 09/31] Remove module requirement to be less restrictive about search requirements --- composer.json | 1 - 1 file changed, 1 deletion(-) diff --git a/composer.json b/composer.json index 54553b3..7199487 100644 --- a/composer.json +++ b/composer.json @@ -56,7 +56,6 @@ "nswdpc/silverstripe-elemental-taxonomy": "^1", "nswdpc/silverstripe-inline-linker": "dev-master", "nswdpc/silverstripe-recaptcha-v3-userforms": "^1", - "nswdpc/silverstripe-search-boilerplate": "^0.2", "nswdpc/silverstripe-thereisnouserform" : "^1", "purplespider/asset-alt-text": "^1.2.1", "silverstripe/contentreview": "^5", From 7f56918c54beee8361ae99a13ff48e59011992d3 Mon Sep 17 00:00:00 2001 From: "James (DPC)" <69664712+JamesDPC@users.noreply.github.com> Date: Fri, 28 Jul 2023 16:39:16 +1000 Subject: [PATCH 10/31] WIP: update requirements --- composer.json | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/composer.json b/composer.json index 7199487..c99802e 100644 --- a/composer.json +++ b/composer.json @@ -33,28 +33,28 @@ "firebrandhq/silverstripe-phonelink": "^3", "fromholdio/silverstripe-errorpagesconfig": "^1.1.0", "gorriecoe/silverstripe-embed": "^1.0.0", - "gorriecoe/silverstripe-linkfield": "^1.0.1", + "gorriecoe/silverstripe-linkfield": "^1.1", "innoweb/silverstripe-robots": "^5", "innoweb/silverstripe-social-metadata": "^8", "jonom/focuspoint": "^5", "jonom/silverstripe-text-target-length": "^2.0.0", "nglasl/silverstripe-mediawesome": "^4.0.6", "nglasl/silverstripe-misdirection": "^3.1.1", - "nswdpc/silverstripe-dataobject-editable": "^0.2", - "nswdpc/silverstripe-elemental-banner": "^0.2", - "nswdpc/silverstripe-elemental-decoratedcontent": "^0.2", - "nswdpc/silverstripe-elemental-feature-video": "^0.5", - "nswdpc/silverstripe-elemental-iframe": "^0.3.0", - "nswdpc/silverstripe-elemental-image": "^0.1", - "nswdpc/silverstripe-elemental-links": "^0.2", - "nswdpc/silverstripe-elemental-mediawesome": "^0.2", - "nswdpc/silverstripe-elemental-modeladmin": "^0.2", - "nswdpc/silverstripe-elemental-publications": "^0.2", - "nswdpc/silverstripe-elemental-quickgallery": "^0.2", - "nswdpc/silverstripe-schema-specialannouncement": "^0.2", - "nswdpc/silverstripe-elemental-slider": "^0.2.1", + "nswdpc/silverstripe-dataobject-editable": "^1", + "nswdpc/silverstripe-elemental-banner": "^1", + "nswdpc/silverstripe-elemental-decoratedcontent": "^1", + "nswdpc/silverstripe-elemental-feature-video": "^1", + "nswdpc/silverstripe-elemental-iframe": "^1", + "nswdpc/silverstripe-elemental-image": "^1", + "nswdpc/silverstripe-elemental-links": "^1", + "nswdpc/silverstripe-elemental-mediawesome": "v1.0.0-rc1", + "nswdpc/silverstripe-elemental-modeladmin": "^1", + "nswdpc/silverstripe-elemental-publications": "^1", + "nswdpc/silverstripe-elemental-quickgallery": "^1", + "nswdpc/silverstripe-schema-specialannouncement": "^1", + "nswdpc/silverstripe-elemental-slider": "^1", "nswdpc/silverstripe-elemental-taxonomy": "^1", - "nswdpc/silverstripe-inline-linker": "dev-master", + "nswdpc/silverstripe-inline-linker": "dev-ss5", "nswdpc/silverstripe-recaptcha-v3-userforms": "^1", "nswdpc/silverstripe-thereisnouserform" : "^1", "purplespider/asset-alt-text": "^1.2.1", From 768e7649ba1fa03ef56e52d0da04e0d6538879e4 Mon Sep 17 00:00:00 2001 From: "James (DPC)" <69664712+JamesDPC@users.noreply.github.com> Date: Fri, 28 Jul 2023 16:54:38 +1000 Subject: [PATCH 11/31] Update requirements --- composer.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index c99802e..4e06770 100644 --- a/composer.json +++ b/composer.json @@ -27,17 +27,17 @@ "codem/silverstripe-damn-fine-uploader": "^0.4", "dnadesign/silverstripe-elemental": "^5", "dnadesign/silverstripe-elemental-list": "^2", - "dnadesign/silverstripe-elemental-virtual": "^1.2.2", + "dnadesign/silverstripe-elemental-virtual": "dev-main", "dnadesign/silverstripe-elemental-userforms": "^4", "dynamic/silverstripe-elemental-section-navigation": "^2.0.0", "firebrandhq/silverstripe-phonelink": "^3", "fromholdio/silverstripe-errorpagesconfig": "^1.1.0", - "gorriecoe/silverstripe-embed": "^1.0.0", + "gorriecoe/silverstripe-embed": "*", "gorriecoe/silverstripe-linkfield": "^1.1", "innoweb/silverstripe-robots": "^5", "innoweb/silverstripe-social-metadata": "^8", "jonom/focuspoint": "^5", - "jonom/silverstripe-text-target-length": "^2.0.0", + "jonom/silverstripe-text-target-length": "^2.0.3", "nglasl/silverstripe-mediawesome": "^4.0.6", "nglasl/silverstripe-misdirection": "^3.1.1", "nswdpc/silverstripe-dataobject-editable": "^1", From c1da630b07035beea3af960b3e39e01aaf9609b1 Mon Sep 17 00:00:00 2001 From: "James (DPC)" <69664712+JamesDPC@users.noreply.github.com> Date: Thu, 25 Jul 2024 15:12:01 +1000 Subject: [PATCH 12/31] Update link module requirement for SS5 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 4e06770..077efcb 100644 --- a/composer.json +++ b/composer.json @@ -54,7 +54,7 @@ "nswdpc/silverstripe-schema-specialannouncement": "^1", "nswdpc/silverstripe-elemental-slider": "^1", "nswdpc/silverstripe-elemental-taxonomy": "^1", - "nswdpc/silverstripe-inline-linker": "dev-ss5", + "nswdpc/silverstripe-inline-linker": "^1", "nswdpc/silverstripe-recaptcha-v3-userforms": "^1", "nswdpc/silverstripe-thereisnouserform" : "^1", "purplespider/asset-alt-text": "^1.2.1", From 49bda92ef0ad8dc0e06341527ed2e334a88fdff0 Mon Sep 17 00:00:00 2001 From: "James (DPC)" <69664712+JamesDPC@users.noreply.github.com> Date: Thu, 25 Jul 2024 15:38:54 +1000 Subject: [PATCH 13/31] Loosen requirements --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 077efcb..a0b7c8a 100644 --- a/composer.json +++ b/composer.json @@ -38,8 +38,8 @@ "innoweb/silverstripe-social-metadata": "^8", "jonom/focuspoint": "^5", "jonom/silverstripe-text-target-length": "^2.0.3", - "nglasl/silverstripe-mediawesome": "^4.0.6", - "nglasl/silverstripe-misdirection": "^3.1.1", + "nglasl/silverstripe-mediawesome": "*", + "nglasl/silverstripe-misdirection": "*", "nswdpc/silverstripe-dataobject-editable": "^1", "nswdpc/silverstripe-elemental-banner": "^1", "nswdpc/silverstripe-elemental-decoratedcontent": "^1", From c881aaa8f3bf7494eeb726d704b2093d79f7a97e Mon Sep 17 00:00:00 2001 From: tardinha Date: Mon, 14 Aug 2023 12:16:09 +1000 Subject: [PATCH 14/31] Standardise config name --- _config/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_config/config.yml b/_config/config.yml index a3ffa94..d2bab95 100644 --- a/_config/config.yml +++ b/_config/config.yml @@ -11,7 +11,7 @@ SilverStripe\Admin\LeftAndMain: extra_requirements_css: - 'nswdpc/silverstripe-content-boilerplate:client/static/css/leftandmain.css' --- -Name: app-content-workflow +Name: nswdpc-content-workflow --- Symbiote\AdvancedWorkflow\Actions\NotifyUsersWorkflowAction: whitelist_template_variables: true From c00c47017d2b6fef9acaceee966b6a00a0d3c37c Mon Sep 17 00:00:00 2001 From: "James (DPC)" <69664712+JamesDPC@users.noreply.github.com> Date: Thu, 11 Jan 2024 13:45:15 +1100 Subject: [PATCH 15/31] Set default configuration for phonefield --- _config/config.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/_config/config.yml b/_config/config.yml index d2bab95..03e874d 100644 --- a/_config/config.yml +++ b/_config/config.yml @@ -71,3 +71,11 @@ SilverStripe\Admin\ModelAdmin: page_length: 100 Symbiote\GridFieldExtensions\GridFieldConfigurablePaginator: default_page_sizes: [ 15, 30, 60, 100, 200, 500, 1000 ] + +--- +Name: nswdpc-content-phonefield +--- +# Default to no geolocation service +Innoweb\InternationalPhoneNumberField\Forms\InternationalPhoneNumberField: + geolocation_service: null + initial_country: 'au' From 7d76bd358acf123c3bd15a9c3134b4826a1075b0 Mon Sep 17 00:00:00 2001 From: "James (DPC)" <69664712+JamesDPC@users.noreply.github.com> Date: Wed, 24 Jul 2024 11:07:32 +1000 Subject: [PATCH 16/31] Update meta --- composer.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/composer.json b/composer.json index a0b7c8a..3269b5d 100644 --- a/composer.json +++ b/composer.json @@ -6,12 +6,10 @@ "authors": [ { "name": "James Ellis", - "homepage": "https://dpc.nsw.gov.au", "role": "Developer" }, { "name": "Mark Taylor", - "homepage": "https://dpc.nsw.gov.au", "role": "Developer" } ], From 7d352699c75e152be85833026cfb6068f1b1b4a4 Mon Sep 17 00:00:00 2001 From: "James (DPC)" <69664712+JamesDPC@users.noreply.github.com> Date: Tue, 30 Jul 2024 11:55:45 +1000 Subject: [PATCH 17/31] (chore) reorder requirement for visual grep help --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 3269b5d..7464308 100644 --- a/composer.json +++ b/composer.json @@ -20,7 +20,6 @@ "user experience" ], "require": { - "nswdpc/silverstripe-datetime-inputs": "^1", "bummzack/sortablefile": "^2.2.0", "codem/silverstripe-damn-fine-uploader": "^0.4", "dnadesign/silverstripe-elemental": "^5", @@ -39,6 +38,7 @@ "nglasl/silverstripe-mediawesome": "*", "nglasl/silverstripe-misdirection": "*", "nswdpc/silverstripe-dataobject-editable": "^1", + "nswdpc/silverstripe-datetime-inputs": "^1", "nswdpc/silverstripe-elemental-banner": "^1", "nswdpc/silverstripe-elemental-decoratedcontent": "^1", "nswdpc/silverstripe-elemental-feature-video": "^1", From e84dfe30f8311f80b8863c50bd421d94cc812590 Mon Sep 17 00:00:00 2001 From: "James (DPC)" <69664712+JamesDPC@users.noreply.github.com> Date: Tue, 30 Jul 2024 11:56:01 +1000 Subject: [PATCH 18/31] Switch to version range --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 7464308..aaaa96d 100644 --- a/composer.json +++ b/composer.json @@ -45,7 +45,7 @@ "nswdpc/silverstripe-elemental-iframe": "^1", "nswdpc/silverstripe-elemental-image": "^1", "nswdpc/silverstripe-elemental-links": "^1", - "nswdpc/silverstripe-elemental-mediawesome": "v1.0.0-rc1", + "nswdpc/silverstripe-elemental-mediawesome": "^1", "nswdpc/silverstripe-elemental-modeladmin": "^1", "nswdpc/silverstripe-elemental-publications": "^1", "nswdpc/silverstripe-elemental-quickgallery": "^1", From 2acce0ef0b2b677653412b75f989b00327017fe9 Mon Sep 17 00:00:00 2001 From: "James (DPC)" <69664712+JamesDPC@users.noreply.github.com> Date: Tue, 30 Jul 2024 11:57:20 +1000 Subject: [PATCH 19/31] Wildcard requirement for dev work --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index aaaa96d..77173c6 100644 --- a/composer.json +++ b/composer.json @@ -21,7 +21,7 @@ ], "require": { "bummzack/sortablefile": "^2.2.0", - "codem/silverstripe-damn-fine-uploader": "^0.4", + "codem/silverstripe-damn-fine-uploader": "*", "dnadesign/silverstripe-elemental": "^5", "dnadesign/silverstripe-elemental-list": "^2", "dnadesign/silverstripe-elemental-virtual": "dev-main", From b74ab34de7c7131b061980e166e62c9ba505c21a Mon Sep 17 00:00:00 2001 From: "James (DPC)" <69664712+JamesDPC@users.noreply.github.com> Date: Tue, 30 Jul 2024 13:56:40 +1000 Subject: [PATCH 20/31] Update dependencies --- composer.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index 77173c6..f0a63cd 100644 --- a/composer.json +++ b/composer.json @@ -21,10 +21,10 @@ ], "require": { "bummzack/sortablefile": "^2.2.0", - "codem/silverstripe-damn-fine-uploader": "*", + "codem/silverstripe-damn-fine-uploader": "dev-ss5", "dnadesign/silverstripe-elemental": "^5", "dnadesign/silverstripe-elemental-list": "^2", - "dnadesign/silverstripe-elemental-virtual": "dev-main", + "dnadesign/silverstripe-elemental-virtual": "^2", "dnadesign/silverstripe-elemental-userforms": "^4", "dynamic/silverstripe-elemental-section-navigation": "^2.0.0", "firebrandhq/silverstripe-phonelink": "^3", @@ -55,7 +55,7 @@ "nswdpc/silverstripe-inline-linker": "^1", "nswdpc/silverstripe-recaptcha-v3-userforms": "^1", "nswdpc/silverstripe-thereisnouserform" : "^1", - "purplespider/asset-alt-text": "^1.2.1", + "purplespider/asset-alt-text": "^2", "silverstripe/contentreview": "^5", "silverstripe/gridfieldqueuedexport": "^3", "silverstripe/lumberjack": "^3", From ac785315d86a6906f2c2e3f9a899a99be5d52f35 Mon Sep 17 00:00:00 2001 From: "James (DPC)" <69664712+JamesDPC@users.noreply.github.com> Date: Tue, 30 Jul 2024 15:12:44 +1000 Subject: [PATCH 21/31] Fix: incorrect requirement, as no tag exists --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index f0a63cd..0a83048 100644 --- a/composer.json +++ b/composer.json @@ -26,7 +26,7 @@ "dnadesign/silverstripe-elemental-list": "^2", "dnadesign/silverstripe-elemental-virtual": "^2", "dnadesign/silverstripe-elemental-userforms": "^4", - "dynamic/silverstripe-elemental-section-navigation": "^2.0.0", + "dynamic/silverstripe-elemental-section-navigation": "dev-main", "firebrandhq/silverstripe-phonelink": "^3", "fromholdio/silverstripe-errorpagesconfig": "^1.1.0", "gorriecoe/silverstripe-embed": "*", From 808c9561f2fcb5fef192ed1de3edf0b369d54a3c Mon Sep 17 00:00:00 2001 From: "James (DPC)" <69664712+JamesDPC@users.noreply.github.com> Date: Tue, 30 Jul 2024 15:17:41 +1000 Subject: [PATCH 22/31] Use correct branch name --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 0a83048..16fab3f 100644 --- a/composer.json +++ b/composer.json @@ -26,7 +26,7 @@ "dnadesign/silverstripe-elemental-list": "^2", "dnadesign/silverstripe-elemental-virtual": "^2", "dnadesign/silverstripe-elemental-userforms": "^4", - "dynamic/silverstripe-elemental-section-navigation": "dev-main", + "dynamic/silverstripe-elemental-section-navigation": "dev-master", "firebrandhq/silverstripe-phonelink": "^3", "fromholdio/silverstripe-errorpagesconfig": "^1.1.0", "gorriecoe/silverstripe-embed": "*", From 7b18a5f071a1f73d1b8ea605b82d9e7afe4099fc Mon Sep 17 00:00:00 2001 From: "James (DPC)" <69664712+JamesDPC@users.noreply.github.com> Date: Tue, 30 Jul 2024 15:23:41 +1000 Subject: [PATCH 23/31] Update module to use fork branch --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 16fab3f..2e7b745 100644 --- a/composer.json +++ b/composer.json @@ -70,7 +70,7 @@ "symbiote/silverstripe-elemental-listingpagelisting": "^2.0.2", "symbiote/silverstripe-gridfieldextensions": "^4", "symbiote/silverstripe-grouped-cms-menu": "^4.1", - "symbiote/silverstripe-listingpage": "^2.3.3", + "symbiote/silverstripe-listingpage": "dev-ss5", "symbiote/silverstripe-multivaluefield": "^6", "symbiote/silverstripe-usertemplates": "^2.1.0", "unclecheese/display-logic": "^3", From 91127e57d0ccff08cb7397725f662599aabc0327 Mon Sep 17 00:00:00 2001 From: "James (DPC)" <69664712+JamesDPC@users.noreply.github.com> Date: Tue, 30 Jul 2024 15:36:07 +1000 Subject: [PATCH 24/31] Loosen requirements around modules, for testing --- composer.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/composer.json b/composer.json index 2e7b745..6fb7257 100644 --- a/composer.json +++ b/composer.json @@ -64,15 +64,15 @@ "silverstripe/userforms": "^6", "silverstripe/versioned-admin": "^2", "symbiote/silverstripe-advancedworkflow": "^6", - "symbiote/silverstripe-contentreplace": "^2.0.1", - "symbiote/silverstripe-datachange-tracker": "^5.0.3", - "symbiote/silverstripe-dynamiclists": "^2.0.8", - "symbiote/silverstripe-elemental-listingpagelisting": "^2.0.2", + "symbiote/silverstripe-contentreplace": "*", + "symbiote/silverstripe-datachange-tracker": "*", + "symbiote/silverstripe-dynamiclists": "*", + "symbiote/silverstripe-elemental-listingpagelisting": "*", "symbiote/silverstripe-gridfieldextensions": "^4", "symbiote/silverstripe-grouped-cms-menu": "^4.1", - "symbiote/silverstripe-listingpage": "dev-ss5", + "symbiote/silverstripe-listingpage": "*", "symbiote/silverstripe-multivaluefield": "^6", - "symbiote/silverstripe-usertemplates": "^2.1.0", + "symbiote/silverstripe-usertemplates": "*", "unclecheese/display-logic": "^3", "wilr/silverstripe-googlesitemaps": "^3" }, From 10270338176fe49dfcbeca1938c63f52c726344d Mon Sep 17 00:00:00 2001 From: "James (DPC)" <69664712+JamesDPC@users.noreply.github.com> Date: Tue, 30 Jul 2024 15:47:01 +1000 Subject: [PATCH 25/31] Relax the requirement for now --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 6fb7257..9a295e8 100644 --- a/composer.json +++ b/composer.json @@ -55,7 +55,7 @@ "nswdpc/silverstripe-inline-linker": "^1", "nswdpc/silverstripe-recaptcha-v3-userforms": "^1", "nswdpc/silverstripe-thereisnouserform" : "^1", - "purplespider/asset-alt-text": "^2", + "purplespider/asset-alt-text": "^1.2.1 || ^2", "silverstripe/contentreview": "^5", "silverstripe/gridfieldqueuedexport": "^3", "silverstripe/lumberjack": "^3", From d43693f09b63af4237c05332af3ada4438ac227c Mon Sep 17 00:00:00 2001 From: "James (DPC)" <69664712+JamesDPC@users.noreply.github.com> Date: Wed, 14 Aug 2024 10:21:36 +1000 Subject: [PATCH 26/31] Replace embed module --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 9a295e8..6645ee7 100644 --- a/composer.json +++ b/composer.json @@ -29,7 +29,6 @@ "dynamic/silverstripe-elemental-section-navigation": "dev-master", "firebrandhq/silverstripe-phonelink": "^3", "fromholdio/silverstripe-errorpagesconfig": "^1.1.0", - "gorriecoe/silverstripe-embed": "*", "gorriecoe/silverstripe-linkfield": "^1.1", "innoweb/silverstripe-robots": "^5", "innoweb/silverstripe-social-metadata": "^8", @@ -55,6 +54,7 @@ "nswdpc/silverstripe-inline-linker": "^1", "nswdpc/silverstripe-recaptcha-v3-userforms": "^1", "nswdpc/silverstripe-thereisnouserform" : "^1", + "nswdpc/silverstripe-embed": "^2", "purplespider/asset-alt-text": "^1.2.1 || ^2", "silverstripe/contentreview": "^5", "silverstripe/gridfieldqueuedexport": "^3", From 414902ea274a0039e23363f5658ca7fa6d54d56a Mon Sep 17 00:00:00 2001 From: "James (DPC)" <69664712+JamesDPC@users.noreply.github.com> Date: Mon, 16 Sep 2024 12:05:00 +1000 Subject: [PATCH 27/31] Update modules to tagged versions --- composer.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/composer.json b/composer.json index 6645ee7..a97bb6c 100644 --- a/composer.json +++ b/composer.json @@ -64,15 +64,15 @@ "silverstripe/userforms": "^6", "silverstripe/versioned-admin": "^2", "symbiote/silverstripe-advancedworkflow": "^6", - "symbiote/silverstripe-contentreplace": "*", - "symbiote/silverstripe-datachange-tracker": "*", - "symbiote/silverstripe-dynamiclists": "*", - "symbiote/silverstripe-elemental-listingpagelisting": "*", + "symbiote/silverstripe-contentreplace": "^2.1", + "symbiote/silverstripe-datachange-tracker": "^5.1", + "symbiote/silverstripe-dynamiclists": "^2.1", + "symbiote/silverstripe-elemental-listingpagelisting": "^2.1", "symbiote/silverstripe-gridfieldextensions": "^4", "symbiote/silverstripe-grouped-cms-menu": "^4.1", - "symbiote/silverstripe-listingpage": "*", + "symbiote/silverstripe-listingpage": "^2.4", "symbiote/silverstripe-multivaluefield": "^6", - "symbiote/silverstripe-usertemplates": "*", + "symbiote/silverstripe-usertemplates": "^2.4", "unclecheese/display-logic": "^3", "wilr/silverstripe-googlesitemaps": "^3" }, From cf6b18912769c7a375cd6c134c89bae213d92240 Mon Sep 17 00:00:00 2001 From: "James (DPC)" <69664712+JamesDPC@users.noreply.github.com> Date: Thu, 9 Jan 2025 12:08:32 +1100 Subject: [PATCH 28/31] Avoid duplicate visualblocks button in 'cms' editor config --- _config.php | 1 - 1 file changed, 1 deletion(-) diff --git a/_config.php b/_config.php index ff3898a..5dc2b87 100644 --- a/_config.php +++ b/_config.php @@ -26,7 +26,6 @@ 'blockquote', 'hr' ); -TinyMCEConfig::get('cms')->addButtonsToLine(1, '|', 'visualblocks'); TinyMCEConfig::get('cms')->addButtonsToLine(2, '|', 'fullscreen'); TinyMCEConfig::get('cms')->insertButtonsAfter('formatselect', 'styleselect'); From df6547a79fd4644e2c66af1528aff1fe3f6be13e Mon Sep 17 00:00:00 2001 From: "James (DPC)" <69664712+JamesDPC@users.noreply.github.com> Date: Thu, 9 Jan 2025 17:27:04 +1100 Subject: [PATCH 29/31] Use tagged version of upload module --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index a97bb6c..ffabc25 100644 --- a/composer.json +++ b/composer.json @@ -21,7 +21,7 @@ ], "require": { "bummzack/sortablefile": "^2.2.0", - "codem/silverstripe-damn-fine-uploader": "dev-ss5", + "codem/silverstripe-damn-fine-uploader": "^1", "dnadesign/silverstripe-elemental": "^5", "dnadesign/silverstripe-elemental-list": "^2", "dnadesign/silverstripe-elemental-virtual": "^2", From ebf40a5a6a96ebbbdb59efd1aba359191111cccf Mon Sep 17 00:00:00 2001 From: "James (DPC)" <69664712+JamesDPC@users.noreply.github.com> Date: Fri, 10 Jan 2025 12:06:45 +1100 Subject: [PATCH 30/31] Update gitattributes --- .gitattributes | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitattributes b/.gitattributes index 1485db8..b091bcc 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,4 +1,8 @@ -/.gitattributes export-ignore -/.gitignore export-ignore -/.waratah export-ignore -/README.md export-ignore +/docs export-ignore +/.editorconfig export-ignore +/.gitattributes export-ignore +/.gitignore export-ignore +/.waratah export-ignore +/code-of-conduct.md export-ignore +/CONTRIBUTING.md export-ignore +/README.md export-ignore From 08c1d95dafc314d423f6c38d7290ea34585bfcfa Mon Sep 17 00:00:00 2001 From: "James (DPC)" <69664712+JamesDPC@users.noreply.github.com> Date: Fri, 10 Jan 2025 12:07:26 +1100 Subject: [PATCH 31/31] Update documentation --- README.md | 2 ++ docs/en/001_index.md | 16 ++++++++++++++++ 2 files changed, 18 insertions(+) create mode 100644 docs/en/001_index.md diff --git a/README.md b/README.md index 06429a2..536ff14 100644 --- a/README.md +++ b/README.md @@ -14,6 +14,8 @@ See [composer.json](./composer.json) for a full list of included modules. A [default boilerplate configuration is available](./_config/config.yml). This can be overridden on a per-project basis. +See [documentation for updates and changes across versions](./docs/en/001_index.md). + ## Installation The only supported way of installing this module is via [composer](https://getcomposer.org) diff --git a/docs/en/001_index.md b/docs/en/001_index.md new file mode 100644 index 0000000..67d9932 --- /dev/null +++ b/docs/en/001_index.md @@ -0,0 +1,16 @@ +# Documentation + +## v1 changes + +### Modules removed or replaced ++ axllent/silverstripe-trailing-slash: use `SilverStripe\Control\Controller.add_trailing_slash = true` ++ bigfork/silverstripe-simpledatefield: use nswdpc/silverstripe-datetime-inputs ++ rmartingonzo/tinymce-ss4-theme: no longer required ++ gorriecoe/silverstripe-embed: use `nswdpc/silverstripe-embed:^2` ++ nswdpc/silverstripe-search-boilerplate: removed with no replacement, as search solution has become decoupled + + +## Forks + ++ nglasl/silverstripe-mediawesome: use https://github.com/JamesDPC/silverstripe-mediawesome until merged ++ nglasl/silverstripe-misdirection: use https://github.com/JamesDPC/silverstripe-misdirection until merged