Merge branch '3.0' into 3

silverstripe · May 4, 2023 · d580b3a · d580b3a
2 parents d220f39 + d112b07
commit d580b3a
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 13 deletions.
diff --git a/README.md b/README.md
@@ -3,18 +3,10 @@
 [![CI](https://github.com/silverstripe/cwp/actions/workflows/ci.yml/badge.svg)](https://github.com/silverstripe/cwp/actions/workflows/ci.yml)
 [![Silverstripe supported module](https://img.shields.io/badge/silverstripe-supported-0071C4.svg)](https://www.silverstripe.org/software/addons/silverstripe-commercially-supported-module-list/)
 
-## Requirements
-
-* Silverstripe ^4
-* Optional: symbiote/silverstripe-advancedworkflow
-* Optional: silverstripe/userforms
-
 ## Installation
 
-Install using Composer:
-
-```
-composer require cwp/cwp ^2.0
+```sh
+composer require cwp/cwp
 ```
 
 ## Bugtracker

diff --git a/_config.php b/_config.php
@@ -20,7 +20,6 @@
     'friendly_name' => 'Default CWP',
     'priority' => '60',
     'skin' => 'silverstripe',
-    'mode' => 'none',
     'body_class' => 'typography',
     'document_base_url' => Director::absoluteBaseURL(),
     'cleanup_callback' => "sapphiremce_cleanup",
@@ -90,7 +89,6 @@
 $adminModule = ModuleLoader::inst()->getManifest()->getModule('silverstripe/admin');
 $cwpEditor
     ->enablePlugins([
-        'contextmenu' => null,
         'image' => null,
         'anchor' => null,
         'sslink' => $adminModule->getResource('client/dist/js/TinyMCE_sslink.js'),

diff --git a/composer.json b/composer.json
@@ -41,4 +41,4 @@
     },
     "minimum-stability": "dev",
     "prefer-stable": true
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -41,4 +41,4 @@ @@
         },
         "minimum-stability": "dev",
         "prefer-stable": true
-    }
+    }