Skip to content

Commit a56d797

Browse files
cliffparnitzkycliffparnitzky
committed
Merge branch 'hotfix/2.1.8' into develop
2 parents b0d573d + e8f6e5e commit a56d797

File tree

2 files changed

+28
-28
lines changed

2 files changed

+28
-28
lines changed

‎README.md‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ https://github.com/cliffparnitzky/TinyMcePluginLoader/issues
2828
Compatibility
2929
-------------
3030

31-
- min. Contao version: >= 3.3.0
32-
- max. Contao version: < 3.6.0
31+
- Contao version >= 3.3.0 ... < 3.6.0
32+
- Contao version >= 4.4.0
3333

3434

3535
Dependency
@@ -48,30 +48,30 @@ Components
4848

4949
These are the currently integrated plugins and their respective availability status. The plugins must be installed separately, either individually or via [bundle](#bundles).
5050

51-
| Plugin | TinyMCE 3 compatible | TinyMCE 4 compatible |
52-
| ------------------------------------------------------------------------------------ | :------------------------------------------------------------------------------------: | :------------------------------------------------------------------------------: |
53-
| [TinyMceAdvancedList](https://github.com/cliffparnitzky/TinyMceAdvancedList) | ![tinymce 3 ok](http://img.shields.io/badge/tinymce%203-ok-green.svg?style=flat) | ![tinymce 4 ok](http://img.shields.io/badge/tinymce%204-ok-green.svg?style=flat) |
54-
| [TinyMceAnchor](https://github.com/cliffparnitzky/TinyMceAnchor) | ![tinymce 3 n/a](http://img.shields.io/badge/tinymce%203-n/a-lightgrey.svg?style=flat) | ![tinymce 4 ok](http://img.shields.io/badge/tinymce%204-ok-green.svg?style=flat) |
55-
| [TinyMceCodeMirror](https://github.com/cliffparnitzky/TinyMceCodeMirror) | ![tinymce 3 n/a](http://img.shields.io/badge/tinymce%203-n/a-lightgrey.svg?style=flat) | ![tinymce 4 ok](http://img.shields.io/badge/tinymce%204-ok-green.svg?style=flat) |
56-
| [TinyMceColorpicker](https://github.com/cliffparnitzky/TinyMceColorpicker) | ![tinymce 3 n/a](http://img.shields.io/badge/tinymce%203-n/a-lightgrey.svg?style=flat) | ![tinymce 4 ok](http://img.shields.io/badge/tinymce%204-ok-green.svg?style=flat) |
57-
| [TinyMceContextMenu](https://github.com/cliffparnitzky/TinyMceContextMenu) | ![tinymce 3 ok](http://img.shields.io/badge/tinymce%203-ok-green.svg?style=flat) | ![tinymce 4 ok](http://img.shields.io/badge/tinymce%204-ok-green.svg?style=flat) |
58-
| [TinyMceEmoticons](https://github.com/cliffparnitzky/TinyMceEmoticons) | ![tinymce 3 n/a](http://img.shields.io/badge/tinymce%203-n/a-lightgrey.svg?style=flat) | ![tinymce 4 ok](http://img.shields.io/badge/tinymce%204-ok-green.svg?style=flat) |
59-
| [TinyMceFontAwesome](https://github.com/cliffparnitzky/TinyMceFontAwesome) | ![tinymce 3 n/a](http://img.shields.io/badge/tinymce%203-n/a-lightgrey.svg?style=flat) | ![tinymce 4 ok](http://img.shields.io/badge/tinymce%204-ok-green.svg?style=flat) |
60-
| [TinyMceGoogleMaps](https://github.com/cliffparnitzky/TinyMceGoogleMaps) | ![tinymce 3 ok](http://img.shields.io/badge/tinymce%203-ok-green.svg?style=flat) | ![tinymce 4 nok](http://img.shields.io/badge/tinymce%204-nok-red.svg?style=flat) |
61-
| [TinyMceHorizontalRuler](https://github.com/cliffparnitzky/TinyMceHorizontalRuler) | ![tinymce 3 n/a](http://img.shields.io/badge/tinymce%203-n/a-lightgrey.svg?style=flat) | ![tinymce 4 ok](http://img.shields.io/badge/tinymce%204-ok-green.svg?style=flat) |
62-
| [TinyMceImageEnhancement](https://github.com/cliffparnitzky/TinyMceImageEnhancement) | ![tinymce 3 n/a](http://img.shields.io/badge/tinymce%203-n/a-lightgrey.svg?style=flat) | ![tinymce 4 ok](http://img.shields.io/badge/tinymce%204-ok-green.svg?style=flat) |
63-
| [TinyMceInsertDateTime](https://github.com/cliffparnitzky/TinyMceInsertDateTime) | ![tinymce 3 ok](http://img.shields.io/badge/tinymce%203-ok-green.svg?style=flat) | ![tinymce 4 ok](http://img.shields.io/badge/tinymce%204-ok-green.svg?style=flat) |
64-
| [TinyMceLinkAutoDetect](https://github.com/cliffparnitzky/TinyMceLinkAutoDetect) | ![tinymce 3 ok](http://img.shields.io/badge/tinymce%203-ok-green.svg?style=flat) | ![tinymce 4 ok](http://img.shields.io/badge/tinymce%204-ok-green.svg?style=flat) |
65-
| [TinyMceLinkLightbox](https://github.com/cliffparnitzky/TinyMceLinkLightbox) | ![tinymce 3 n/a](http://img.shields.io/badge/tinymce%203-n/a-lightgrey.svg?style=flat) | ![tinymce 4 ok](http://img.shields.io/badge/tinymce%204-ok-green.svg?style=flat) |
66-
| [TinyMceLocalStorage](https://github.com/cliffparnitzky/TinyMceLocalStorage) | ![tinymce 3 ok](http://img.shields.io/badge/tinymce%203-ok-green.svg?style=flat) | ![tinymce 4 nok](http://img.shields.io/badge/tinymce%204-nok-red.svg?style=flat) |
67-
| [TinyMcePagebreak](https://github.com/cliffparnitzky/TinyMcePagebreak) | ![tinymce 3 ok](http://img.shields.io/badge/tinymce%203-ok-green.svg?style=flat) | ![tinymce 4 ok](http://img.shields.io/badge/tinymce%204-ok-green.svg?style=flat) |
68-
| [TinyMceQuotes](https://github.com/cliffparnitzky/TinyMceQuotes) | ![tinymce 3 ok](http://img.shields.io/badge/tinymce%203-ok-green.svg?style=flat) | ![tinymce 4 nok](http://img.shields.io/badge/tinymce%204-nok-red.svg?style=flat) |
69-
| [TinyMceStrikethrough](https://github.com/cliffparnitzky/TinyMceStrikethrough) | ![tinymce 3 ok](http://img.shields.io/badge/tinymce%203-ok-green.svg?style=flat) | ![tinymce 4 ok](http://img.shields.io/badge/tinymce%204-ok-green.svg?style=flat) |
70-
| [TinyMceTextColor](https://github.com/cliffparnitzky/TinyMceTextColor) | ![tinymce 3 n/a](http://img.shields.io/badge/tinymce%203-n/a-lightgrey.svg?style=flat) | ![tinymce 4 ok](http://img.shields.io/badge/tinymce%204-ok-green.svg?style=flat) |
71-
| [TinyMceTextPattern](https://github.com/cliffparnitzky/TinyMceTextPattern) | ![tinymce 3 n/a](http://img.shields.io/badge/tinymce%203-n/a-lightgrey.svg?style=flat) | ![tinymce 4 ok](http://img.shields.io/badge/tinymce%204-ok-green.svg?style=flat) |
72-
| [TinyMceUnderline](https://github.com/cliffparnitzky/TinyMceUnderline) | ![tinymce 3 n/a](http://img.shields.io/badge/tinymce%203-n/a-lightgrey.svg?style=flat) | ![tinymce 4 ok](http://img.shields.io/badge/tinymce%204-ok-green.svg?style=flat) |
73-
| [TinyMceWordCount](https://github.com/cliffparnitzky/TinyMceWordCount) | ![tinymce 3 ok](http://img.shields.io/badge/tinymce%203-ok-green.svg?style=flat) | ![tinymce 4 ok](http://img.shields.io/badge/tinymce%204-ok-green.svg?style=flat) |
74-
| [TinyMceYouTube](https://github.com/cliffparnitzky/TinyMceYouTube) | ![tinymce 3 ok](http://img.shields.io/badge/tinymce%203-ok-green.svg?style=flat) | ![tinymce 4 ok](http://img.shields.io/badge/tinymce%204-ok-green.svg?style=flat) |
51+
| Plugin | Contao 3.2 compatible | Contao 3.5 compatible | Contao 4.4 compatible |
52+
| ------------------------------------------------------------------------------------ | :-------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------: | :------------------------------------------------------------------------------: |
53+
| [TinyMceAdvancedList](https://github.com/cliffparnitzky/TinyMceAdvancedList) | ![Contao 3.2 ok](http://img.shields.io/badge/tinymce%203-ok-green.svg?style=flat) | ![Contao 3.5 ok](http://img.shields.io/badge/tinymce%204-ok-green.svg?style=flat) | ![Contao 4.4 ok](http://img.shields.io/badge/tinymce%204-ok-green.svg?style=flat) |
54+
| [TinyMceAnchor](https://github.com/cliffparnitzky/TinyMceAnchor) | ![Contao 3.2 n/a](http://img.shields.io/badge/tinymce%203-n/a-lightgrey.svg?style=flat) | ![Contao 3.5 ok](http://img.shields.io/badge/tinymce%204-ok-green.svg?style=flat) | ![Contao 4.4 nok](http://img.shields.io/badge/tinymce%204-nok-red.svg?style=flat) |
55+
| [TinyMceCodeMirror](https://github.com/cliffparnitzky/TinyMceCodeMirror) | ![Contao 3.2 n/a](http://img.shields.io/badge/tinymce%203-n/a-lightgrey.svg?style=flat) | ![Contao 3.5 ok](http://img.shields.io/badge/tinymce%204-ok-green.svg?style=flat) | ![Contao 4.4 nok](http://img.shields.io/badge/tinymce%204-nok-red.svg?style=flat) |
56+
| [TinyMceColorpicker](https://github.com/cliffparnitzky/TinyMceColorpicker) | ![Contao 3.2 n/a](http://img.shields.io/badge/tinymce%203-n/a-lightgrey.svg?style=flat) | ![Contao 3.5 ok](http://img.shields.io/badge/tinymce%204-ok-green.svg?style=flat) | ![Contao 4.4 nok](http://img.shields.io/badge/tinymce%204-nok-red.svg?style=flat) |
57+
| [TinyMceContextMenu](https://github.com/cliffparnitzky/TinyMceContextMenu) | ![Contao 3.2 ok](http://img.shields.io/badge/tinymce%203-ok-green.svg?style=flat) | ![Contao 3.5 ok](http://img.shields.io/badge/tinymce%204-ok-green.svg?style=flat) | ![Contao 4.4 nok](http://img.shields.io/badge/tinymce%204-nok-red.svg?style=flat) |
58+
| [TinyMceEmoticons](https://github.com/cliffparnitzky/TinyMceEmoticons) | ![Contao 3.2 n/a](http://img.shields.io/badge/tinymce%203-n/a-lightgrey.svg?style=flat) | ![Contao 3.5 ok](http://img.shields.io/badge/tinymce%204-ok-green.svg?style=flat) | ![Contao 4.4 nok](http://img.shields.io/badge/tinymce%204-nok-red.svg?style=flat) |
59+
| [TinyMceFontAwesome](https://github.com/cliffparnitzky/TinyMceFontAwesome) | ![Contao 3.2 n/a](http://img.shields.io/badge/tinymce%203-n/a-lightgrey.svg?style=flat) | ![Contao 3.5 ok](http://img.shields.io/badge/tinymce%204-ok-green.svg?style=flat) | ![Contao 4.4 nok](http://img.shields.io/badge/tinymce%204-nok-red.svg?style=flat) |
60+
| [TinyMceGoogleMaps](https://github.com/cliffparnitzky/TinyMceGoogleMaps) | ![Contao 3.2 ok](http://img.shields.io/badge/tinymce%203-ok-green.svg?style=flat) | ![Contao 3.5 nok](http://img.shields.io/badge/tinymce%204-nok-red.svg?style=flat) | ![Contao 4.4 nok](http://img.shields.io/badge/tinymce%204-nok-red.svg?style=flat) |
61+
| [TinyMceHorizontalRuler](https://github.com/cliffparnitzky/TinyMceHorizontalRuler) | ![Contao 3.2 n/a](http://img.shields.io/badge/tinymce%203-n/a-lightgrey.svg?style=flat) | ![Contao 3.5 ok](http://img.shields.io/badge/tinymce%204-ok-green.svg?style=flat) | ![Contao 4.4 nok](http://img.shields.io/badge/tinymce%204-nok-red.svg?style=flat) |
62+
| [TinyMceImageEnhancement](https://github.com/cliffparnitzky/TinyMceImageEnhancement) | ![Contao 3.2 n/a](http://img.shields.io/badge/tinymce%203-n/a-lightgrey.svg?style=flat) | ![Contao 3.5 ok](http://img.shields.io/badge/tinymce%204-ok-green.svg?style=flat) | ![Contao 4.4 nok](http://img.shields.io/badge/tinymce%204-nok-red.svg?style=flat) |
63+
| [TinyMceInsertDateTime](https://github.com/cliffparnitzky/TinyMceInsertDateTime) | ![Contao 3.2 ok](http://img.shields.io/badge/tinymce%203-ok-green.svg?style=flat) | ![Contao 3.5 ok](http://img.shields.io/badge/tinymce%204-ok-green.svg?style=flat) | ![Contao 4.4 nok](http://img.shields.io/badge/tinymce%204-nok-red.svg?style=flat) |
64+
| [TinyMceLinkAutoDetect](https://github.com/cliffparnitzky/TinyMceLinkAutoDetect) | ![Contao 3.2 ok](http://img.shields.io/badge/tinymce%203-ok-green.svg?style=flat) | ![Contao 3.5 ok](http://img.shields.io/badge/tinymce%204-ok-green.svg?style=flat) | ![Contao 4.4 nok](http://img.shields.io/badge/tinymce%204-nok-red.svg?style=flat) |
65+
| [TinyMceLinkLightbox](https://github.com/cliffparnitzky/TinyMceLinkLightbox) | ![Contao 3.2 n/a](http://img.shields.io/badge/tinymce%203-n/a-lightgrey.svg?style=flat) | ![Contao 3.5 ok](http://img.shields.io/badge/tinymce%204-ok-green.svg?style=flat) | ![Contao 4.4 nok](http://img.shields.io/badge/tinymce%204-nok-red.svg?style=flat) |
66+
| [TinyMceLocalStorage](https://github.com/cliffparnitzky/TinyMceLocalStorage) | ![Contao 3.2 ok](http://img.shields.io/badge/tinymce%203-ok-green.svg?style=flat) | ![Contao 3.5 nok](http://img.shields.io/badge/tinymce%204-nok-red.svg?style=flat) | ![Contao 4.4 nok](http://img.shields.io/badge/tinymce%204-nok-red.svg?style=flat) |
67+
| [TinyMcePagebreak](https://github.com/cliffparnitzky/TinyMcePagebreak) | ![Contao 3.2 ok](http://img.shields.io/badge/tinymce%203-ok-green.svg?style=flat) | ![Contao 3.5 ok](http://img.shields.io/badge/tinymce%204-ok-green.svg?style=flat) | ![Contao 4.4 nok](http://img.shields.io/badge/tinymce%204-nok-red.svg?style=flat) |
68+
| [TinyMceQuotes](https://github.com/cliffparnitzky/TinyMceQuotes) | ![Contao 3.2 ok](http://img.shields.io/badge/tinymce%203-ok-green.svg?style=flat) | ![Contao 3.5 nok](http://img.shields.io/badge/tinymce%204-nok-red.svg?style=flat) | ![Contao 4.4 nok](http://img.shields.io/badge/tinymce%204-nok-red.svg?style=flat) |
69+
| [TinyMceStrikethrough](https://github.com/cliffparnitzky/TinyMceStrikethrough) | ![Contao 3.2 ok](http://img.shields.io/badge/tinymce%203-ok-green.svg?style=flat) | ![Contao 3.5 ok](http://img.shields.io/badge/tinymce%204-ok-green.svg?style=flat) | ![Contao 4.4 nok](http://img.shields.io/badge/tinymce%204-nok-red.svg?style=flat) |
70+
| [TinyMceTextColor](https://github.com/cliffparnitzky/TinyMceTextColor) | ![Contao 3.2 n/a](http://img.shields.io/badge/tinymce%203-n/a-lightgrey.svg?style=flat) | ![Contao 3.5 ok](http://img.shields.io/badge/tinymce%204-ok-green.svg?style=flat) | ![Contao 4.4 nok](http://img.shields.io/badge/tinymce%204-nok-red.svg?style=flat) |
71+
| [TinyMceTextPattern](https://github.com/cliffparnitzky/TinyMceTextPattern) | ![Contao 3.2 n/a](http://img.shields.io/badge/tinymce%203-n/a-lightgrey.svg?style=flat) | ![Contao 3.5 ok](http://img.shields.io/badge/tinymce%204-ok-green.svg?style=flat) | ![Contao 4.4 nok](http://img.shields.io/badge/tinymce%204-nok-red.svg?style=flat) |
72+
| [TinyMceUnderline](https://github.com/cliffparnitzky/TinyMceUnderline) | ![Contao 3.2 n/a](http://img.shields.io/badge/tinymce%203-n/a-lightgrey.svg?style=flat) | ![Contao 3.5 ok](http://img.shields.io/badge/tinymce%204-ok-green.svg?style=flat) | ![Contao 4.4 ok](http://img.shields.io/badge/tinymce%204-ok-green.svg?style=flat) |
73+
| [TinyMceWordCount](https://github.com/cliffparnitzky/TinyMceWordCount) | ![Contao 3.2 ok](http://img.shields.io/badge/tinymce%203-ok-green.svg?style=flat) | ![Contao 3.5 ok](http://img.shields.io/badge/tinymce%204-ok-green.svg?style=flat) | ![Contao 4.4 nok](http://img.shields.io/badge/tinymce%204-nok-red.svg?style=flat) |
74+
| [TinyMceYouTube](https://github.com/cliffparnitzky/TinyMceYouTube) | ![Contao 3.2 ok](http://img.shields.io/badge/tinymce%203-ok-green.svg?style=flat) | ![Contao 3.5 ok](http://img.shields.io/badge/tinymce%204-ok-green.svg?style=flat) | ![Contao 4.4 nok](http://img.shields.io/badge/tinymce%204-nok-red.svg?style=flat) |
7575

7676
(More plugins will be added soon. For wishes add a comment to [issue #3](https://github.com/cliffparnitzky/TinyMcePluginLoader/issues/3).)
7777

‎composer.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
},
1919
"require":{
2020
"php":">=5.3",
21-
"contao/core":">=3.3.0,<3.6",
22-
"contao-community-alliance/composer-plugin":"~2.0"
21+
"contao/core-bundle":"~3.2 || ~4.4",
22+
"contao-community-alliance/composer-plugin":"~2.4 || ~3.0"
2323
},
2424
"conflict": {
2525
"contao/core":"3.4.0,3.4.1,3.4.2"

0 commit comments

Comments
 (0)