[HippoCMS-scm] [onehippo/ckeditor] 6b1085: CMS-10712 Enable customization of extraAllowedCont...

2017-04-28 Thread GitHub 
  Branch: refs/heads/feature/visual-editing-psp2-CMS-10715
  Home:   https://github.com/onehippo/ckeditor
  Commit: 6b10858be64e1aa87c95754ffe91e013c4738661
  
https://github.com/onehippo/ckeditor/commit/6b10858be64e1aa87c95754ffe91e013c4738661
  Author: Mathijs den Burger 
  Date:   2017-04-26 (Wed, 26 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:
  ---
  CMS-10712 Enable customization of extraAllowedContent rules

The string version of 'extraAllowedContent' cannot be extended
because appending an extra string of rules to it will add a comma
in between (the logic in Json#append for concatenating string
properties with a comma). Solution: use the object version of
'extraAllowedContent' instead so projects can overlay extra rules
into it, and/or append to the existing allowed attributes (which are
comma-separated).


  Commit: 5ff9a8be9340eb75f89123a04bd214a717be7656
  
https://github.com/onehippo/ckeditor/commit/5ff9a8be9340eb75f89123a04bd214a717be7656
  Author: Mathijs den Burger 
  Date:   2017-04-28 (Fri, 28 Apr 2017)

  Changed paths:
M maven-distribution-optimized.xml

  Log Message:
  ---
  CHANNELMGR-1032 Exclude 'config' module code from optimized JAR

The 'config' folder is a separate Maven module


  Commit: 43bce3bb0fb74a899d96db3f5a94e543de0842be
  
https://github.com/onehippo/ckeditor/commit/43bce3bb0fb74a899d96db3f5a94e543de0842be
  Author: Mathijs den Burger 
  Date:   2017-04-28 (Fri, 28 Apr 2017)

  Changed paths:
M config/src/main/java/org/onehippo/ckeditor/CKEditorConfig.java

  Log Message:
  ---
  CHANNELMGR-1032 Only log stack trace for invalid JSON at debug level

Avoids huge stack traces for a simple configuration error.


  Commit: cc1952d7ffba42ea31a1cad93ed06d33baf43bb8
  
https://github.com/onehippo/ckeditor/commit/cc1952d7ffba42ea31a1cad93ed06d33baf43bb8
  Author: Mathijs den Burger 
  Date:   2017-04-28 (Fri, 28 Apr 2017)

  Changed paths:
M config/src/main/java/org/onehippo/ckeditor/CKEditorConfig.java
M maven-distribution-optimized.xml

  Log Message:
  ---
  CHANNELMGR-1032 Reintegrate feature/visual-editing-psp2-CHANNELMGR-1032


  Commit: fc2405a7c457c4cea8411006e6fb72c07ffb014e
  
https://github.com/onehippo/ckeditor/commit/fc2405a7c457c4cea8411006e6fb72c07ffb014e
  Author: Mathijs den Burger 
  Date:   2017-04-28 (Fri, 28 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:
  ---
  CMS-10712 Reintegrate feature/visual-editing-psp2-CMS-10712


  Commit: f9e7853945ad540dddba85e8439265b3969e8848
  
https://github.com/onehippo/ckeditor/commit/f9e7853945ad540dddba85e8439265b3969e8848
  Author: Mathijs den Burger 
  Date:   2017-04-28 (Fri, 28 Apr 2017)

  Changed paths:
M config/src/main/java/org/onehippo/ckeditor/CKEditorConfig.java
M config/src/test/java/org/onehippo/ckeditor/CKEditorConfigTest.java
M maven-distribution-optimized.xml

  Log Message:
  ---
  CMS-10715 Merge feature/visual-editing-psp2 changes


Compare: 
https://github.com/onehippo/ckeditor/compare/b46d9b4f7e6f...f9e7853945ad___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn

[HippoCMS-scm] [onehippo/ckeditor] 6b1085: CMS-10712 Enable customization of extraAllowedCont...

2017-04-28 Thread GitHub 
  Branch: refs/heads/feature/visual-editing-psp2
  Home:   https://github.com/onehippo/ckeditor
  Commit: 6b10858be64e1aa87c95754ffe91e013c4738661
  
https://github.com/onehippo/ckeditor/commit/6b10858be64e1aa87c95754ffe91e013c4738661
  Author: Mathijs den Burger 
  Date:   2017-04-26 (Wed, 26 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:
  ---
  CMS-10712 Enable customization of extraAllowedContent rules

The string version of 'extraAllowedContent' cannot be extended
because appending an extra string of rules to it will add a comma
in between (the logic in Json#append for concatenating string
properties with a comma). Solution: use the object version of
'extraAllowedContent' instead so projects can overlay extra rules
into it, and/or append to the existing allowed attributes (which are
comma-separated).


  Commit: fc2405a7c457c4cea8411006e6fb72c07ffb014e
  
https://github.com/onehippo/ckeditor/commit/fc2405a7c457c4cea8411006e6fb72c07ffb014e
  Author: Mathijs den Burger 
  Date:   2017-04-28 (Fri, 28 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:
  ---
  CMS-10712 Reintegrate feature/visual-editing-psp2-CMS-10712


Compare: 
https://github.com/onehippo/ckeditor/compare/cc1952d7ffba...fc2405a7c457___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn

[HippoCMS-scm] [onehippo/ckeditor] 6b1085: CMS-10712 Enable customization of extraAllowedCont...

2017-04-26 Thread GitHub 
  Branch: refs/heads/feature/visual-editing-psp2-CMS-10712
  Home:   https://github.com/onehippo/ckeditor
  Commit: 6b10858be64e1aa87c95754ffe91e013c4738661
  
https://github.com/onehippo/ckeditor/commit/6b10858be64e1aa87c95754ffe91e013c4738661
  Author: Mathijs den Burger 
  Date:   2017-04-26 (Wed, 26 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:
  ---
  CMS-10712 Enable customization of extraAllowedContent rules

The string version of 'extraAllowedContent' cannot be extended
because appending an extra string of rules to it will add a comma
in between (the logic in Json#append for concatenating string
properties with a comma). Solution: use the object version of
'extraAllowedContent' instead so projects can overlay extra rules
into it, and/or append to the existing allowed attributes (which are
comma-separated).


___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn