ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #2391 from emanuelschuetze/issue2238

Browse Source 
Upgraded to tinymce 4.4.x and tinymce-ui 0.0.17 (Fixes #2238).
This commit is contained in:
Norman Jäckel 2016-09-17 11:19:24 +02:00 committed by GitHub
commit 1e87bdca4b
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bower.json
View File

@ -18,7 +18,7 @@
"angular-sanitize": "~1.4.10", "angular-sanitize": "~1.4.10",
"angular-scroll-glue": "~2.0.6", "angular-scroll-glue": "~2.0.6",
"angular-ui-router": "~0.2.17", "angular-ui-router": "~0.2.17",
"angular-ui-tinymce": "0.0.14", "angular-ui-tinymce": "~0.0.17",
"angular-ui-tree": "~2.17.0", "angular-ui-tree": "~2.17.0",
"bootstrap-css-only": "~3.3.6", "bootstrap-css-only": "~3.3.6",
"font-awesome-bower": "~4.5.0", "font-awesome-bower": "~4.5.0",
@ -33,7 +33,7 @@
"pdfmake-dist": "~0.1.27", "pdfmake-dist": "~0.1.27",
"open-sans-fontface": "https://github.com/OpenSlides/open-sans.git#1.4.2.post1", "open-sans-fontface": "https://github.com/OpenSlides/open-sans.git#1.4.2.post1",
"roboto-condensed": "~0.3.0", "roboto-condensed": "~0.3.0",
"tinymce-dist": "4.3.12", "tinymce": "~4.4.3",
"tinymce-i18n": "OpenSlides/tinymce-i18n#a186ad61e0aa30fdf657e88f405f966d790f0805" "tinymce-i18n": "OpenSlides/tinymce-i18n#a186ad61e0aa30fdf657e88f405f966d790f0805"
}, },
"overrides": { "overrides": {
@ -43,7 +43,7 @@
"pdfjs-dist": { "pdfjs-dist": {
"main": "build/pdf.combined.js" "main": "build/pdf.combined.js"
}, },
"tinymce-dist": { "tinymce": {
"main": [ "main": [
"tinymce.js", "tinymce.js",
"themes/modern/theme.js", "themes/modern/theme.js",