diff --git a/library/pom.xml b/library/pom.xml index 11e0b9f662bf..8c09f02361e5 100644 --- a/library/pom.xml +++ b/library/pom.xml @@ -14,7 +14,7 @@ war - 4.8.0 + 4.9.1 3.3.7 4.7.0 @@ -153,7 +153,7 @@ org.webjars.bower elfinder - 2.1.23 + 2.1.28 runtime diff --git a/library/src/morpheus-master/sass/modules/editor/_base.scss b/library/src/morpheus-master/sass/modules/editor/_base.scss index 8ffd81e1a209..bbc4e9576b88 100644 --- a/library/src/morpheus-master/sass/modules/editor/_base.scss +++ b/library/src/morpheus-master/sass/modules/editor/_base.scss @@ -2,7 +2,7 @@ .cke { .cke_button__sakaipreview { .cke_button__sakaipreview_icon { - background: url(/library/webjars/ckeditor/4.8.0/full/skins/moono-lisa/icons_hidpi.png) no-repeat 0 -1632px !important; + background: url(/library/webjars/ckeditor/4.9.1/full/skins/moono-lisa/icons_hidpi.png) no-repeat 0 -1632px !important; background-size: 16px !important; } } diff --git a/library/src/webapp/editor/elfinder/sakai/elfinder.html b/library/src/webapp/editor/elfinder/sakai/elfinder.html index 956abb422843..e7779cc8ad34 100644 --- a/library/src/webapp/editor/elfinder/sakai/elfinder.html +++ b/library/src/webapp/editor/elfinder/sakai/elfinder.html @@ -9,8 +9,8 @@ - - + + @@ -20,7 +20,7 @@ - + diff --git a/master/pom.xml b/master/pom.xml index d8ca7fff00e7..039c2a41e75e 100644 --- a/master/pom.xml +++ b/master/pom.xml @@ -100,11 +100,11 @@ - 786318aefed553a62cebbe4cd10b67c3ab266437 - b29a29d4dc8a42732ce46720e1efc30c826e4c9 + 278c922c6d8529edd15a2b2c11b574fb4320e0c2 + 136ba881ddcff5aa029e3648c69358c15a982afc 1.1.0 4.6.2 - 4.8.0 + 4.9.1 diff --git a/portal/portal-service-impl/impl/src/java/org/sakaiproject/portal/service/EditorRegistryImpl.java b/portal/portal-service-impl/impl/src/java/org/sakaiproject/portal/service/EditorRegistryImpl.java index 4d520459ec9b..3a2a58a987e9 100644 --- a/portal/portal-service-impl/impl/src/java/org/sakaiproject/portal/service/EditorRegistryImpl.java +++ b/portal/portal-service-impl/impl/src/java/org/sakaiproject/portal/service/EditorRegistryImpl.java @@ -36,8 +36,8 @@ public void init() { //TODO: pull this out to somewhere appropriate register("textarea", "textarea", "/library/editor/textarea/textarea.js", "/library/editor/textarea.launch.js", ""); register("fckeditor", "FCKeditor", "/library/editor/FCKeditor/fckeditor.js", "/library/editor/fckeditor.launch.js", ""); - register("ckeditor", "CKEditor", "/library/webjars/ckeditor/4.8.0/full/ckeditor.js", "/library/editor/ckeditor.launch.js", - "var CKEDITOR_BASEPATH='/library/webjars/ckeditor/4.8.0/full/';\n"); + register("ckeditor", "CKEditor", "/library/webjars/ckeditor/4.9.1/full/ckeditor.js", "/library/editor/ckeditor.launch.js", + "var CKEDITOR_BASEPATH='/library/webjars/ckeditor/4.9.1/full/';\n"); } public void destroy() { diff --git a/webjars/ckeditor-autosave/pom.xml b/webjars/ckeditor-autosave/pom.xml index 3be640c32332..fc2f827bd735 100644 --- a/webjars/ckeditor-autosave/pom.xml +++ b/webjars/ckeditor-autosave/pom.xml @@ -21,7 +21,7 @@ - 786318aefed553a62cebbe4cd10b67c3ab266437 + 278c922c6d8529edd15a2b2c11b574fb4320e0c2 UTF-8 diff --git a/webjars/ckeditor-image2/pom.xml b/webjars/ckeditor-image2/pom.xml index 8cd46ea83130..58ceedbb79e1 100644 --- a/webjars/ckeditor-image2/pom.xml +++ b/webjars/ckeditor-image2/pom.xml @@ -20,7 +20,7 @@ - 4.8.0 + 4.9.1 UTF-8 @@ -54,10 +54,10 @@ -- -- -- -- + + + + diff --git a/webjars/ckeditor-wordcount/pom.xml b/webjars/ckeditor-wordcount/pom.xml index 24d05951dd4f..cf231cf900b1 100644 --- a/webjars/ckeditor-wordcount/pom.xml +++ b/webjars/ckeditor-wordcount/pom.xml @@ -20,7 +20,7 @@ - b29a29d4dc8a42732ce46720e1efc30c826e4c9 + 136ba881ddcff5aa029e3648c69358c15a982afc UTF-8