Skip to content

Commit

Permalink
Merge pull request #307 from plone/petschki-tinymce6
Browse files Browse the repository at this point in the history
TinyMCE 6 upgrade
  • Loading branch information
petschki authored Oct 24, 2023
2 parents 8118c6f + 922bcc5 commit 6afeb94
Show file tree
Hide file tree
Showing 714 changed files with 2,389 additions and 1,762 deletions.
11 changes: 11 additions & 0 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,17 @@ plone.staticresources

This add-on contains Fonts, Icons and JavaScript used by Plone Classic-UI.

Version Information
-------------------

- Version 2.2.x -> Plone 6.1
- Version 2.1.x -> Plone 6.0
- Version 1.x -> Plone 5.2

Note on Version 2.2.x:

This version introduces TinyMCE 6. It is also compatible with ``Plone>=6.0.7``.


How to upgrade the resources in this package
--------------------------------------------
Expand Down
2 changes: 2 additions & 0 deletions news/307.feature
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Update TinyMCE to version 6.
[petschki]
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "plone.staticresources",
"version": "2.1.5",
"version": "2.2.0-alpha.1",
"description": "Static resources for Plone",
"repository": "[email protected]:plone/plone.staticresources.git",
"license": "BSD-3-Clause",
Expand All @@ -9,12 +9,12 @@
"stats": "NODE_ENV=production webpack --config webpack.config.js --json > stats.json"
},
"dependencies": {
"@plone/mockup": "5.1.5",
"@plone/mockup": "5.2.0-alpha.1",
"bootstrap-icons": "1.11.1",
"svg-country-flags": "git+https://github.com/hampusborgos/country-flags.git"
},
"devDependencies": {
"@patternslib/dev": "3.4.0",
"@patternslib/dev": "3.5.2",
"copy-webpack-plugin": "11.0.0"
},
"resolutions": {
Expand Down
36 changes: 33 additions & 3 deletions src/plone/staticresources/static/bundle-plone/bundle.min.js

Large diffs are not rendered by default.

Large diffs are not rendered by default.

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit 6afeb94

Please sign in to comment.