[HippoCMS-scm] [onehippo/ckeditor] e6c320: CMS-10635 Set Visual Editing PSP2 development vers...

2017-05-24 Thread GitHub 
  Branch: refs/heads/hippo/4.5.x
  Home:   https://github.com/onehippo/ckeditor
  Commit: e6c3205ba4c15bb089f52c51a26b01a18f40e9e0
  
https://github.com/onehippo/ckeditor/commit/e6c3205ba4c15bb089f52c51a26b01a18f40e9e0
  Author: Mathijs den Burger 
  Date:   2017-03-20 (Mon, 20 Mar 2017)

  Changed paths:
M pom.xml

  Log Message:
  ---
  CMS-10635 Set Visual Editing PSP2 development version


  Commit: cfd79080099ff4c0e8fef6c63784bb2d0edf2aa3
  
https://github.com/onehippo/ckeditor/commit/cfd79080099ff4c0e8fef6c63784bb2d0edf2aa3
  Author: Mathijs den Burger 
  Date:   2017-03-20 (Mon, 20 Mar 2017)

  Changed paths:
M pom.xml

  Log Message:
  ---
  CMS-10635 Add empty parent relative path to prevent Maven warning

Otherwise Maven logs a warning when ckeditor is included as a
sub-module in a build.


  Commit: a2db22b80164bc2a396f67521cf753e89ca1657c
  
https://github.com/onehippo/ckeditor/commit/a2db22b80164bc2a396f67521cf753e89ca1657c
  Author: Mathijs den Burger 
  Date:   2017-03-23 (Thu, 23 Mar 2017)

  Changed paths:
A config/pom.xml
A config/src/main/java/org/onehippo/ckeditor/CKEditorConfig.java
A config/src/main/resources/ckeditor/hippocontents.css
A config/src/main/resources/ckeditor/hippostyles.js
A config/src/test/java/org/onehippo/ckeditor/CKEditorConfigTest.java
M pom.xml

  Log Message:
  ---
  CMS-10666 Add config module with default editor config for Hippo CMS

Also moved the hippostyles.js and hippocontents.css files that are
referenced in the config.


  Commit: 6251dd63dafd04c2dcaba3b2373489ac9bbd8a33
  
https://github.com/onehippo/ckeditor/commit/6251dd63dafd04c2dcaba3b2373489ac9bbd8a33
  Author: Mathijs den Burger 
  Date:   2017-03-23 (Thu, 23 Mar 2017)

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

  Log Message:
  ---
  CMS-10666 Add constants for CKEditor config properties


  Commit: e1536e0df918d108b92cf5516dc2ce80da2688ac
  
https://github.com/onehippo/ckeditor/commit/e1536e0df918d108b92cf5516dc2ce80da2688ac
  Author: Mathijs den Burger 
  Date:   2017-03-23 (Thu, 23 Mar 2017)

  Changed paths:
M .gitignore

  Log Message:
  ---
  CMS-10666 Add trailing slash to ignored directories


  Commit: 3a12e8b6909947a76f5e46ff545d1df77063b221
  
https://github.com/onehippo/ckeditor/commit/3a12e8b6909947a76f5e46ff545d1df77063b221
  Author: Mathijs den Burger 
  Date:   2017-03-23 (Thu, 23 Mar 2017)

  Changed paths:
M pom.xml

  Log Message:
  ---
  CMS-10666 Cleanup root pom


  Commit: 39cc78193bbcfc75218d9dea44d3ebf44973e89a
  
https://github.com/onehippo/ckeditor/commit/39cc78193bbcfc75218d9dea44d3ebf44973e89a
  Author: Mathijs den Burger 
  Date:   2017-03-23 (Thu, 23 Mar 2017)

  Changed paths:
M .gitignore
A config/pom.xml
A config/src/main/java/org/onehippo/ckeditor/CKEditorConfig.java
A config/src/main/resources/ckeditor/hippocontents.css
A config/src/main/resources/ckeditor/hippostyles.js
A config/src/test/java/org/onehippo/ckeditor/CKEditorConfigTest.java
M pom.xml

  Log Message:
  ---
  CMS-10666 Reintegrate feature/visual-editing-psp2-CMS-10666


  Commit: 8804ef6a4ee2e13b8c24ce50f338e2c18c879c14
  
https://github.com/onehippo/ckeditor/commit/8804ef6a4ee2e13b8c24ce50f338e2c18c879c14
  Author: Mathijs den Burger 
  Date:   2017-03-23 (Thu, 23 Mar 2017)

  Changed paths:
M config/pom.xml

  Log Message:
  ---
  CMS-10666 Copy resources to 'optimized' directory and run jslint


  Commit: 23094f4b7e8e27fb3f7d81ca99e0e33f776c362a
  
https://github.com/onehippo/ckeditor/commit/23094f4b7e8e27fb3f7d81ca99e0e33f776c362a
  Author: Arthur Bogaart 
  Date:   2017-04-18 (Tue, 18 Apr 2017)

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

  Log Message:
  ---
  CHANNELMGR-1237 Add hippopicker plugin


  Commit: f5915405209e985be02ac282c3f4907a48cdc8fe
  
https://github.com/onehippo/ckeditor/commit/f5915405209e985be02ac282c3f4907a48cdc8fe
  Author: Mathijs den Burger 
  Date:   2017-04-19 (Wed, 19 Apr 2017)

  Changed paths:
M config/pom.xml
A config/src/main/java/org/onehippo/ckeditor/Json.java
A config/src/test/java/org/onehippo/ckeditor/JsonTest.java

  Log Message:
  ---
  CHANNELMGR-1032 Add Json utility class

It's a copy of the JsonUtils in the CMS, but using Jackson instead
of the org.json library.


  Commit: 707bccf5b2ea0a148b34b268d5f6758a65540b52
  
https://github.com/onehippo/ckeditor/commit/707bccf5b2ea0a148b34b268d5f6758a65540b52
  Author: Mathijs den Burger

[HippoCMS-scm] [onehippo/ckeditor] e6c320: CMS-10635 Set Visual Editing PSP2 development vers...

2017-03-20 Thread GitHub 
  Branch: refs/heads/feature/visual-editing-psp2
  Home:   https://github.com/onehippo/ckeditor
  Commit: e6c3205ba4c15bb089f52c51a26b01a18f40e9e0
  
https://github.com/onehippo/ckeditor/commit/e6c3205ba4c15bb089f52c51a26b01a18f40e9e0
  Author: Mathijs den Burger 
  Date:   2017-03-20 (Mon, 20 Mar 2017)

  Changed paths:
M pom.xml

  Log Message:
  ---
  CMS-10635 Set Visual Editing PSP2 development version


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