Branch: refs/heads/bugfix/CHANNELMGR-1177
Home: https://github.com/onehippo/ckeditor
Commit: 478fbc9e8972ebe7c11d42c89141a193b33e96fe
https://github.com/onehippo/ckeditor/commit/478fbc9e8972ebe7c11d42c89141a193b33e96fe
Author: Joeri de Gooijer <joeri...@gmail.com>
Date: 2017-03-02 (Thu, 02 Mar 2017)
Changed paths:
M .gitignore
M README.md
M dev/builder/build.sh
M package.json
R plugins/codemirror/css/codemirror.ckeditor.css
R plugins/codemirror/css/codemirror.css
R plugins/codemirror/css/codemirror.min.css
R plugins/codemirror/icons/autocomplete.png
R plugins/codemirror/icons/autoformat.png
R plugins/codemirror/icons/commentselectedrange.png
R plugins/codemirror/icons/searchcode.png
R plugins/codemirror/icons/uncommentselectedrange.png
R plugins/codemirror/js/addon/comment/comment.js
R plugins/codemirror/js/addon/comment/continuecomment.js
R plugins/codemirror/js/addon/dialog/dialog.css
R plugins/codemirror/js/addon/dialog/dialog.js
R plugins/codemirror/js/addon/edit/closebrackets.js
R plugins/codemirror/js/addon/edit/closetag.js
R plugins/codemirror/js/addon/edit/continuelist.js
R plugins/codemirror/js/addon/edit/matchbrackets.js
R plugins/codemirror/js/addon/edit/matchtags.js
R plugins/codemirror/js/addon/edit/trailingspace.js
R plugins/codemirror/js/addon/fold/brace-fold.js
R plugins/codemirror/js/addon/fold/comment-fold.js
R plugins/codemirror/js/addon/fold/foldcode.js
R plugins/codemirror/js/addon/fold/foldgutter.css
R plugins/codemirror/js/addon/fold/foldgutter.js
R plugins/codemirror/js/addon/fold/indent-fold.js
R plugins/codemirror/js/addon/fold/markdown-fold.js
R plugins/codemirror/js/addon/fold/xml-fold.js
R plugins/codemirror/js/addon/format/autoFormatAll.js
R plugins/codemirror/js/addon/format/formatting.js
R plugins/codemirror/js/addon/mode/loadmode.js
R plugins/codemirror/js/addon/mode/multiplex.js
R plugins/codemirror/js/addon/mode/multiplex_test.js
R plugins/codemirror/js/addon/mode/overlay.js
R plugins/codemirror/js/addon/mode/simple.js
R plugins/codemirror/js/addon/search/jump-to-line.js
R plugins/codemirror/js/addon/search/match-highlighter.js
R plugins/codemirror/js/addon/search/matchesonscrollbar.css
R plugins/codemirror/js/addon/search/matchesonscrollbar.js
R plugins/codemirror/js/addon/search/search.js
R plugins/codemirror/js/addon/search/searchcursor.js
R plugins/codemirror/js/addon/selection/active-line.js
R plugins/codemirror/js/addon/selection/mark-selection.js
R plugins/codemirror/js/addon/selection/selection-pointer.js
R plugins/codemirror/js/beautify-html.js
R plugins/codemirror/js/beautify.js
R plugins/codemirror/js/beautify.min.js
R plugins/codemirror/js/codemirror.addons.min.js
R plugins/codemirror/js/codemirror.addons.search.min.js
R plugins/codemirror/js/codemirror.js
R plugins/codemirror/js/codemirror.min.js
R plugins/codemirror/js/codemirror.mode.bbcode.min.js
R plugins/codemirror/js/codemirror.mode.bbcodemixed.min.js
R plugins/codemirror/js/codemirror.mode.htmlmixed.min.js
R plugins/codemirror/js/codemirror.mode.javascript.min.js
R plugins/codemirror/js/codemirror.mode.php.min.js
R plugins/codemirror/js/mode/bbcode/bbcode.js
R plugins/codemirror/js/mode/bbcode/index.html
R plugins/codemirror/js/mode/bbcodemixed/bbcodemixed.js
R plugins/codemirror/js/mode/bbcodemixed/index.html
R plugins/codemirror/js/mode/clike/clike.js
R plugins/codemirror/js/mode/clike/index.html
R plugins/codemirror/js/mode/clike/scala.html
R plugins/codemirror/js/mode/clike/test.js
R plugins/codemirror/js/mode/css/css.js
R plugins/codemirror/js/mode/css/gss.html
R plugins/codemirror/js/mode/css/gss_test.js
R plugins/codemirror/js/mode/css/index.html
R plugins/codemirror/js/mode/css/less.html
R plugins/codemirror/js/mode/css/less_test.js
R plugins/codemirror/js/mode/css/scss.html
R plugins/codemirror/js/mode/css/scss_test.js
R plugins/codemirror/js/mode/css/test.js
R plugins/codemirror/js/mode/htmlembedded/htmlembedded.js
R plugins/codemirror/js/mode/htmlembedded/index.html
R plugins/codemirror/js/mode/htmlmixed/htmlmixed.js
R plugins/codemirror/js/mode/htmlmixed/index.html
R plugins/codemirror/js/mode/javascript/index.html
R plugins/codemirror/js/mode/javascript/javascript.js
R plugins/codemirror/js/mode/javascript/json-ld.html
R plugins/codemirror/js/mode/javascript/test.js
R plugins/codemirror/js/mode/javascript/typescript.html
R plugins/codemirror/js/mode/php/index.html
R plugins/codemirror/js/mode/php/php.js
R plugins/codemirror/js/mode/php/test.js
R plugins/codemirror/js/mode/xml/index.html
R plugins/codemirror/js/mode/xml/test.js
R plugins/codemirror/js/mode/xml/xml.js
R plugins/codemirror/lang/af.js
R plugins/codemirror/lang/ar.js
R plugins/codemirror/lang/bg.js
R plugins/codemirror/lang/bn.js
R plugins/codemirror/lang/bs.js
R plugins/codemirror/lang/ca.js
R plugins/codemirror/lang/cs.js
R plugins/codemirror/lang/cy.js
R plugins/codemirror/lang/da.js
R plugins/codemirror/lang/de.js
R plugins/codemirror/lang/el.js
R plugins/codemirror/lang/en-au.js
R plugins/codemirror/lang/en-ca.js
R plugins/codemirror/lang/en-gb.js
R plugins/codemirror/lang/en.js
R plugins/codemirror/lang/eo.js
R plugins/codemirror/lang/es.js
R plugins/codemirror/lang/et.js
R plugins/codemirror/lang/eu.js
R plugins/codemirror/lang/fa.js
R plugins/codemirror/lang/fi.js
R plugins/codemirror/lang/fo.js
R plugins/codemirror/lang/fr-ca.js
R plugins/codemirror/lang/fr.js
R plugins/codemirror/lang/gl.js
R plugins/codemirror/lang/gu.js
R plugins/codemirror/lang/he.js
R plugins/codemirror/lang/hi.js
R plugins/codemirror/lang/hr.js
R plugins/codemirror/lang/hu.js
R plugins/codemirror/lang/is.js
R plugins/codemirror/lang/it.js
R plugins/codemirror/lang/ja.js
R plugins/codemirror/lang/ka.js
R plugins/codemirror/lang/km.js
R plugins/codemirror/lang/ko.js
R plugins/codemirror/lang/ku.js
R plugins/codemirror/lang/lt.js
R plugins/codemirror/lang/lv.js
R plugins/codemirror/lang/mk.js
R plugins/codemirror/lang/mn.js
R plugins/codemirror/lang/ms.js
R plugins/codemirror/lang/nb.js
R plugins/codemirror/lang/nl.js
R plugins/codemirror/lang/no.js
R plugins/codemirror/lang/pl.js
R plugins/codemirror/lang/pt-br.js
R plugins/codemirror/lang/pt.js
R plugins/codemirror/lang/ro.js
R plugins/codemirror/lang/ru.js
R plugins/codemirror/lang/sk.js
R plugins/codemirror/lang/sl.js
R plugins/codemirror/lang/sr-latn.js
R plugins/codemirror/lang/sr.js
R plugins/codemirror/lang/sv.js
R plugins/codemirror/lang/th.js
R plugins/codemirror/lang/tr.js
R plugins/codemirror/lang/ug.js
R plugins/codemirror/lang/uk.js
R plugins/codemirror/lang/vi.js
R plugins/codemirror/lang/zh-cn.js
R plugins/codemirror/lang/zh.js
R plugins/codemirror/plugin.js
R plugins/codemirror/theme/3024-day.css
R plugins/codemirror/theme/3024-night.css
R plugins/codemirror/theme/abcdef.css
R plugins/codemirror/theme/ambiance-mobile.css
R plugins/codemirror/theme/ambiance.css
R plugins/codemirror/theme/base16-dark.css
R plugins/codemirror/theme/base16-light.css
R plugins/codemirror/theme/bespin.css
R plugins/codemirror/theme/blackboard.css
R plugins/codemirror/theme/cobalt.css
R plugins/codemirror/theme/colorforth.css
R plugins/codemirror/theme/dracula.css
R plugins/codemirror/theme/eclipse.css
R plugins/codemirror/theme/elegant.css
R plugins/codemirror/theme/erlang-dark.css
R plugins/codemirror/theme/hopscotch.css
R plugins/codemirror/theme/icecoder.css
R plugins/codemirror/theme/isotope.css
R plugins/codemirror/theme/lesser-dark.css
R plugins/codemirror/theme/liquibyte.css
R plugins/codemirror/theme/material.css
R plugins/codemirror/theme/mbo.css
R plugins/codemirror/theme/mdn-like.css
R plugins/codemirror/theme/midnight.css
R plugins/codemirror/theme/monokai.css
R plugins/codemirror/theme/neat.css
R plugins/codemirror/theme/neo.css
R plugins/codemirror/theme/night.css
R plugins/codemirror/theme/paraiso-dark.css
R plugins/codemirror/theme/paraiso-light.css
R plugins/codemirror/theme/pastel-on-dark.css
R plugins/codemirror/theme/railscasts.css
R plugins/codemirror/theme/rubyblue.css
R plugins/codemirror/theme/seti.css
R plugins/codemirror/theme/solarized.css
R plugins/codemirror/theme/the-matrix.css
R plugins/codemirror/theme/tomorrow-night-bright.css
R plugins/codemirror/theme/tomorrow-night-eighties.css
R plugins/codemirror/theme/ttcn.css
R plugins/codemirror/theme/twilight.css
R plugins/codemirror/theme/vibrant-ink.css
R plugins/codemirror/theme/xq-dark.css
R plugins/codemirror/theme/xq-light.css
R plugins/codemirror/theme/yeti.css
R plugins/codemirror/theme/zenburn.css
R plugins/textselection/plugin.js
R plugins/textselection/samples/textselection.html
R plugins/wordcount/css/wordcount.css
R plugins/wordcount/lang/ca.js
R plugins/wordcount/lang/de.js
R plugins/wordcount/lang/el.js
R plugins/wordcount/lang/en.js
R plugins/wordcount/lang/es.js
R plugins/wordcount/lang/fr.js
R plugins/wordcount/lang/hr.js
R plugins/wordcount/lang/it.js
R plugins/wordcount/lang/jp.js
R plugins/wordcount/lang/nl.js
R plugins/wordcount/lang/no.js
R plugins/wordcount/lang/pl.js
R plugins/wordcount/lang/pt-br.js
R plugins/wordcount/lang/ru.js
R plugins/wordcount/lang/sv.js
R plugins/wordcount/lang/tr.js
R plugins/wordcount/plugin.js
R plugins/wordcount/samples/wordcount.html
R plugins/wordcount/samples/wordcountWithMaxCount.html
R plugins/youtube/images/icon.png
R plugins/youtube/lang/ar.js
R plugins/youtube/lang/cs.js
R plugins/youtube/lang/de.js
R plugins/youtube/lang/el.js
R plugins/youtube/lang/en.js
R plugins/youtube/lang/es.js
R plugins/youtube/lang/et.js
R plugins/youtube/lang/fi.js
R plugins/youtube/lang/fr.js
R plugins/youtube/lang/he.js
R plugins/youtube/lang/hu.js
R plugins/youtube/lang/it.js
R plugins/youtube/lang/ja.js
R plugins/youtube/lang/nb.js
R plugins/youtube/lang/nl.js
R plugins/youtube/lang/nn.js
R plugins/youtube/lang/pl.js
R plugins/youtube/lang/pt.js
R plugins/youtube/lang/ru.js
R plugins/youtube/lang/sk.js
R plugins/youtube/lang/tr.js
R plugins/youtube/lang/vi.js
R plugins/youtube/lang/zh.js
R plugins/youtube/plugin.js
M pom.xml
Log Message:
-----------
CHANNELMGR-1179 Reintegrate branch 'bugfix/CHANNELMGR-1179' into hippo/4.5.x
Commit: 29caf15946b532b9062ed4c07daa6b73d70f481c
https://github.com/onehippo/ckeditor/commit/29caf15946b532b9062ed4c07daa6b73d70f481c
Author: Joeri de Gooijer <joeri...@gmail.com>
Date: 2017-03-02 (Thu, 02 Mar 2017)
Log Message:
-----------
CHANNELMGR-1177 Merge branch 'hippo/4.5.x' into bugfix/CHANNELMGR-1177
Compare:
https://github.com/onehippo/ckeditor/compare/66d0dd698b7b...29caf15946b5_______________________________________________
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
