Branch: refs/heads/feature/visual-editing-psp2-CHANNELMGR-1032
Home: https://github.com/onehippo/ckeditor
Commit: 707bccf5b2ea0a148b34b268d5f6758a65540b52
https://github.com/onehippo/ckeditor/commit/707bccf5b2ea0a148b34b268d5f6758a65540b52
Author: Mathijs den Burger <mathijs.denbur...@bloomreach.com>
Date: 2017-04-21 (Fri, 21 Apr 2017)
Changed paths:
M config/pom.xml
M config/src/main/java/org/onehippo/ckeditor/Json.java
M config/src/test/java/org/onehippo/ckeditor/JsonTest.java
Log Message:
-----------
CHANNELMGR-1032 Add Json#prettyString
Commit: 4dd879f26f1d1afc3713da6125338a949a9d3489
https://github.com/onehippo/ckeditor/commit/4dd879f26f1d1afc3713da6125338a949a9d3489
Author: Mathijs den Burger <mathijs.denbur...@bloomreach.com>
Date: 2017-04-21 (Fri, 21 Apr 2017)
Changed paths:
M config/src/main/java/org/onehippo/ckeditor/CKEditorConfig.java
A
config/src/main/java/org/onehippo/ckeditor/DeclarativeKeystrokesConverter.java
A
config/src/test/java/org/onehippo/ckeditor/DeclarativeKeystrokesConverterTest.java
Log Message:
-----------
CHANNELMGR-1032 Add declarative keystrokes converter
It's a copy of the DeclarativeKeystrokesConverter in the CMS, but
using Jackson instead of the org.json library. It will replace the
one in the CMS.
Commit: 0bbc7a0c3d7c7f8bc4a41932ebd630ab773371b8
https://github.com/onehippo/ckeditor/commit/0bbc7a0c3d7c7f8bc4a41932ebd630ab773371b8
Author: Mathijs den Burger <mathijs.denbur...@bloomreach.com>
Date: 2017-04-21 (Fri, 21 Apr 2017)
Changed paths:
M config/src/main/java/org/onehippo/ckeditor/CKEditorConfig.java
M config/src/test/java/org/onehippo/ckeditor/CKEditorConfigTest.java
Log Message:
-----------
CHANNELMGR-1032 Add logic to combine CKEditor config and set defaults
It's a generalization of the code used in the CMS, and will
replace it.
Compare:
https://github.com/onehippo/ckeditor/compare/f5915405209e...0bbc7a0c3d7c
_______________________________________________
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn