Branch: refs/heads/hippo/4.5.x
Home: https://github.com/onehippo/ckeditor
Commit: f405655ae8e5bc26495759de363e50cf567294f7
https://github.com/onehippo/ckeditor/commit/f405655ae8e5bc26495759de363e50cf567294f7
Author: Mathijs den Burger <mathijs.denbur...@bloomreach.com>
Date: 2017-06-08 (Thu, 08 Jun 2017)
Changed paths:
M .gitignore
R config/pom.xml
R config/src/main/java/org/onehippo/ckeditor/CKEditorConfig.java
R
config/src/main/java/org/onehippo/ckeditor/DeclarativeKeystrokesConverter.java
R config/src/main/java/org/onehippo/ckeditor/HippoPicker.java
R config/src/main/java/org/onehippo/ckeditor/Json.java
R config/src/main/resources/ckeditor/hippocontents.css
R config/src/main/resources/ckeditor/hippostyles.js
R config/src/test/java/org/onehippo/ckeditor/CKEditorConfigTest.java
R
config/src/test/java/org/onehippo/ckeditor/DeclarativeKeystrokesConverterTest.java
R config/src/test/java/org/onehippo/ckeditor/JsonTest.java
M dev/builder/build-config.js
M maven-distribution-optimized.xml
R plugins/hippopicker/icons/hidpi/pickimage.png
R plugins/hippopicker/icons/hidpi/pickinternallink.png
R plugins/hippopicker/icons/pickimage.png
R plugins/hippopicker/icons/pickinternallink.png
R plugins/hippopicker/lang/de.js
R plugins/hippopicker/lang/en.js
R plugins/hippopicker/lang/es.js
R plugins/hippopicker/lang/fr.js
R plugins/hippopicker/lang/nl.js
R plugins/hippopicker/lang/zh.js
R plugins/hippopicker/plugin.js
M pom.xml
Log Message:
-----------
CMS-10778 Revert "Reintegrate feature/visual-editing-psp2"
The merge of Visual Editing is only needed in Hippo 12.
Revert it on this branch so hippo/4.5.x effectively becomes
a Hippo 11 maintenance branch.
This reverts commit 71301199c2a72e8991bb0bc1432668262618c36e, reversing
changes made to 9938a74ec6f50f5fb15686cbae04b6191cfe20f6.
_______________________________________________
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
