Merge branch '2' into 3

# Conflicts: # client/dist/js/bundle.js # client/dist/js/vendor.js # client/dist/styles/bundle.css # yarn.lock
silverstripe · Sep 11, 2024 · f37e693 · f37e693
2 parents da42aa7 + c21cf6d
commit f37e693
Show file tree

Hide file tree

Showing 34 changed files with 2,056 additions and 1,956 deletions.
diff --git a/client/dist/js/bundle.js b/client/dist/js/bundle.js
diff --git a/client/dist/js/vendor.js b/client/dist/js/vendor.js
diff --git a/client/dist/styles/bundle.css b/client/dist/styles/bundle.css
diff --git a/client/dist/tinymce/CHANGELOG.md b/client/dist/tinymce/CHANGELOG.md
@@ -6,6 +6,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+## 6.8.4 - 2024-06-19
+
+### Fixed
+- HTML entities that were double decoded in `noscript` elements caused an XSS vulnerability. #TINY-11019
+- It was possible to inject XSS HTML that was not matching the regexp when using the `noneditable_regexp` option. #TINY-11022
+
 ## 6.8.3 - 2024-02-08
 
 ### Changed

diff --git a/client/dist/tinymce/composer.json b/client/dist/tinymce/composer.json
@@ -1,6 +1,6 @@
 {
 	"name": "tinymce/tinymce",
-	"version": "6.8.3",
+	"version": "6.8.4",
 	"description": "Web based JavaScript HTML WYSIWYG editor control.",
 	"license": [
 		"MIT-only"

diff --git a/client/dist/tinymce/models/dom/model.min.js b/client/dist/tinymce/models/dom/model.min.js
diff --git a/client/dist/tinymce/package.json b/client/dist/tinymce/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "tinymce",
-	"version": "6.8.3",
+	"version": "6.8.4",
 	"repository": {
 		"type": "git",
 		"url": "https://github.com/tinymce/tinymce.git",

diff --git a/client/dist/tinymce/plugins/accordion/plugin.min.js b/client/dist/tinymce/plugins/accordion/plugin.min.js
diff --git a/client/dist/tinymce/plugins/autolink/plugin.min.js b/client/dist/tinymce/plugins/autolink/plugin.min.js
diff --git a/client/dist/tinymce/plugins/autoresize/plugin.min.js b/client/dist/tinymce/plugins/autoresize/plugin.min.js