Merge pull request #24 from nswdpc/ss5

SS5
nswdpc · Jan 10, 2025 · 6e15aec · 6e15aec
2 parents e683b75 + 08c1d95
commit 6e15aec
Show file tree

Hide file tree

Showing 5 changed files with 81 additions and 63 deletions.
diff --git 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
diff --git 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/_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');

diff --git a/composer.json b/composer.json
@@ -20,64 +20,61 @@
       "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",
-        "dnadesign/silverstripe-elemental": "^4.9.0",
-        "dnadesign/silverstripe-elemental-list": "^1.2.0",
-        "dnadesign/silverstripe-elemental-virtual": "^1.2.2",
-        "dnadesign/silverstripe-elemental-userforms": "^3.2.0",
-        "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",
-        "gorriecoe/silverstripe-embed": "^1.0.0",
-        "gorriecoe/silverstripe-linkfield": "^1.0.1",
-        "innoweb/silverstripe-robots": "^4",
-        "innoweb/silverstripe-social-metadata": "^7",
-        "jonom/focuspoint": "^4",
-        "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-elemental-taxonomy": "<1",
-        "nswdpc/silverstripe-inline-linker": "<1",
-        "nswdpc/silverstripe-recaptcha-v3-userforms": "<1",
-        "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",
-        "silverstripe/recipe-cms": "^4.10.0",
-        "silverstripe/sharedraftcontent": "^2.7.0",
-        "silverstripe/userforms": "^5.13.0",
-        "silverstripe/versioned-admin": "^1.10.0",
-        "symbiote/silverstripe-advancedworkflow": "^5.6.0",
-        "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-listingpage": "^2.3.3",
-        "symbiote/silverstripe-multivaluefield": "^5.3.0",
-        "symbiote/silverstripe-usertemplates": "^2.1.0",
-        "unclecheese/display-logic": "^2.0.4",
-        "wilr/silverstripe-googlesitemaps": "^2.2.1"
+        "bummzack/sortablefile": "^2.2.0",
+        "codem/silverstripe-damn-fine-uploader": "^1",
+        "dnadesign/silverstripe-elemental": "^5",
+        "dnadesign/silverstripe-elemental-list": "^2",
+        "dnadesign/silverstripe-elemental-virtual": "^2",
+        "dnadesign/silverstripe-elemental-userforms": "^4",
+        "dynamic/silverstripe-elemental-section-navigation": "dev-master",
+        "firebrandhq/silverstripe-phonelink": "^3",
+        "fromholdio/silverstripe-errorpagesconfig": "^1.1.0",
+        "gorriecoe/silverstripe-linkfield": "^1.1",
+        "innoweb/silverstripe-robots": "^5",
+        "innoweb/silverstripe-social-metadata": "^8",
+        "jonom/focuspoint": "^5",
+        "jonom/silverstripe-text-target-length": "^2.0.3",
+        "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",
+        "nswdpc/silverstripe-elemental-iframe": "^1",
+        "nswdpc/silverstripe-elemental-image": "^1",
+        "nswdpc/silverstripe-elemental-links": "^1",
+        "nswdpc/silverstripe-elemental-mediawesome": "^1",
+        "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": "^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",
+        "silverstripe/lumberjack": "^3",
+        "silverstripe/recipe-cms": "^5",
+        "silverstripe/sharedraftcontent": "^3",
+        "silverstripe/userforms": "^6",
+        "silverstripe/versioned-admin": "^2",
+        "symbiote/silverstripe-advancedworkflow": "^6",
+        "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": "^2.4",
+        "symbiote/silverstripe-multivaluefield": "^6",
+        "symbiote/silverstripe-usertemplates": "^2.4",
+        "unclecheese/display-logic": "^3",
+        "wilr/silverstripe-googlesitemaps": "^3"
     },
     "autoload": {
         "psr-4": {

diff --git a/docs/en/001_index.md 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