[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager] Pushed new branch feature/visual-editing-psp2-CHANNELMGR-1232

[Arthur Bogaart]

Arthur Bogaart pushed new branch feature/visual-editing-psp2-CHANNELMGR-1232 at 
cms-community / hippo-addon-channel-manager
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn

[HippoCMS-scm] [Git][cms-community/hippo-cms-release][release/11.1] CMS-10513 Use released hippo-addon-channel-manager-4.1.2

[Arent-Jan Banck]

Arent-Jan Banck pushed to branch release/11.1 at cms-community / 
hippo-cms-release


Commits:
6ff69e69 by Arent-Jan Banck at 2017-04-25T14:38:51+00:00
CMS-10513 Use released hippo-addon-channel-manager-4.1.2

- - - - -


1 changed file:

- pom.xml


Changes:

=
pom.xml
=
--- a/pom.xml
+++ b/pom.xml
@@ -42,7 +42,7 @@
 11.1.2-SNAPSHOT
 
 
3.1.0
-
4.1.2-SNAPSHOT
+
4.1.2
 
3.1.1-SNAPSHOT
 3.1.0
 4.1.4-SNAPSHOT



View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-cms-release/commit/6ff69e695a0c4edd076f87b83d00b49b9e2b502d
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn

[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager] Pushed new tag hippo-addon-channel-manager-4.1.2

[Arent-Jan Banck]

Arent-Jan Banck pushed new tag hippo-addon-channel-manager-4.1.2 at 
cms-community / hippo-addon-channel-manager
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn

[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][release/4.1] 2 commits: CHANNELMGR-961 prepare release hippo-addon-channel-manager-4.1.2

[Arent-Jan Banck]

Arent-Jan Banck pushed to branch release/4.1 at cms-community / 
hippo-addon-channel-manager


Commits:
ac7d603e by Arent-Jan Banck at 2017-04-25T14:38:51+00:00
CHANNELMGR-961 prepare release hippo-addon-channel-manager-4.1.2

- - - - -
f6d168a0 by Arent-Jan Banck at 2017-04-25T14:38:54+00:00
CHANNELMGR-961 prepare for next development iteration

- - - - -


5 changed files:

- frontend-api/pom.xml
- frontend-ng/pom.xml
- frontend/pom.xml
- pom.xml
- repository/pom.xml


Changes:

=
frontend-api/pom.xml
=
--- a/frontend-api/pom.xml
+++ b/frontend-api/pom.xml
@@ -18,7 +18,7 @@
   
 hippo-addon-channel-manager
 org.onehippo.cms7
-4.1.2-SNAPSHOT
+4.1.3-SNAPSHOT
   
   4.0.0
 


=
frontend-ng/pom.xml
=
--- a/frontend-ng/pom.xml
+++ b/frontend-ng/pom.xml
@@ -20,7 +20,7 @@
   
 hippo-addon-channel-manager
 org.onehippo.cms7
-4.1.2-SNAPSHOT
+4.1.3-SNAPSHOT
   
 
   hippo-addon-channel-manager-frontend-ng


=
frontend/pom.xml
=
--- a/frontend/pom.xml
+++ b/frontend/pom.xml
@@ -20,7 +20,7 @@
   
 hippo-addon-channel-manager
 org.onehippo.cms7
-4.1.2-SNAPSHOT
+4.1.3-SNAPSHOT
   
 
   hippo-addon-channel-manager-frontend


=
pom.xml
=
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
 
 
   hippo-addon-channel-manager
-  4.1.2-SNAPSHOT
+  4.1.3-SNAPSHOT
   pom
   2011
 


=
repository/pom.xml
=
--- a/repository/pom.xml
+++ b/repository/pom.xml
@@ -20,7 +20,7 @@
   
 hippo-addon-channel-manager
 org.onehippo.cms7
-4.1.2-SNAPSHOT
+4.1.3-SNAPSHOT
   
 
   hippo-addon-channel-manager-repository



View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/compare/9076f39af36fec32f4f2e33dd1f3c34c410e9c90...f6d168a00daacdc5c3fbb217a073f4b0982bd3ac
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn

[HippoCMS-scm] [Git][cms-community/hippo-cms] Pushed new branch bugfix/CMS-10659

[Jasper Floor]

Jasper Floor pushed new branch bugfix/CMS-10659 at cms-community / hippo-cms
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn

[HippoCMS-scm] [Git][cms-community/hippo-essentials] Deleted branch bugfix/ESSENTIALS-1067

[Tobias Jeger]

Tobias Jeger deleted branch bugfix/ESSENTIALS-1067 at cms-community / 
hippo-essentials
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn

[HippoCMS-scm] [Git][cms-community/hippo-essentials][master] ESSENTIALS-1067 Fix tabs in selections plugin

[Tobias Jeger]

Tobias Jeger pushed to branch master at cms-community / hippo-essentials


Commits:
e40ce65d by Joeri de Gooijer at 2017-04-25T16:40:03+02:00
ESSENTIALS-1067 Fix tabs in selections plugin

- - - - -


1 changed file:

- 
plugins/selection/src/main/resources/META-INF/resources/tool/selectionPlugin/selectionPlugin.html


Changes:

=
plugins/selection/src/main/resources/META-INF/resources/tool/selectionPlugin/selectionPlugin.html
=
--- 
a/plugins/selection/src/main/resources/META-INF/resources/tool/selectionPlugin/selectionPlugin.html
+++ 
b/plugins/selection/src/main/resources/META-INF/resources/tool/selectionPlugin/selectionPlugin.html
@@ -1,5 +1,5 @@
 

[HippoCMS-scm] [Git][cms-community/hippo-site-toolkit][bugfix/HSTTWO-3926] HSTTWO-3926 reload version

[Jasper Floor]

Jasper Floor pushed to branch bugfix/HSTTWO-3926 at cms-community / 
hippo-site-toolkit


Commits:
46655e38 by Jasper Floor at 2017-04-25T15:30:07+02:00
HSTTWO-3926 reload version

- - - - -


1 changed file:

- toolkit-resources/addon/repository/src/main/resources/hippoecm-extension.xml


Changes:

=
toolkit-resources/addon/repository/src/main/resources/hippoecm-extension.xml
=
--- 
a/toolkit-resources/addon/repository/src/main/resources/hippoecm-extension.xml
+++ 
b/toolkit-resources/addon/repository/src/main/resources/hippoecm-extension.xml
@@ -52,7 +52,7 @@
   true
 
 
-  2.30.00
+  5.0.0
 
   
 



View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-site-toolkit/commit/46655e38917589e73db48694edafaeac3ebeb96c
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn

[HippoCMS-scm] [Git][cms-community/hippo-cms-release][release/11.2] CMS-10615 Use released hippo-addon-channel-manager-4.2.1

[Arent-Jan Banck]

Arent-Jan Banck pushed to branch release/11.2 at cms-community / 
hippo-cms-release


Commits:
1ad255fc by Arent-Jan Banck at 2017-04-25T12:43:50+00:00
CMS-10615 Use released hippo-addon-channel-manager-4.2.1

- - - - -


1 changed file:

- pom.xml


Changes:

=
pom.xml
=
--- a/pom.xml
+++ b/pom.xml
@@ -42,7 +42,7 @@
 11.2.1-SNAPSHOT
 
 
3.2.0
-
4.2.1-SNAPSHOT
+
4.2.1
 
3.2.1-SNAPSHOT
 3.2.0
 4.2.2-SNAPSHOT



View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-cms-release/commit/1ad255fc22e238c40325ab73006f05c346858f9a
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn

[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager] Pushed new tag hippo-addon-channel-manager-4.2.1

[Arent-Jan Banck]

Arent-Jan Banck pushed new tag hippo-addon-channel-manager-4.2.1 at 
cms-community / hippo-addon-channel-manager
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn

[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][release/4.2] 2 commits: CHANNELMGR-1164 prepare release hippo-addon-channel-manager-4.2.1

[Arent-Jan Banck]

Arent-Jan Banck pushed to branch release/4.2 at cms-community / 
hippo-addon-channel-manager


Commits:
ddb8eb5c by Arent-Jan Banck at 2017-04-25T12:43:50+00:00
CHANNELMGR-1164 prepare release hippo-addon-channel-manager-4.2.1

- - - - -
d41eea72 by Arent-Jan Banck at 2017-04-25T12:43:54+00:00
CHANNELMGR-1164 prepare for next development iteration

- - - - -


5 changed files:

- frontend-api/pom.xml
- frontend-ng/pom.xml
- frontend/pom.xml
- pom.xml
- repository/pom.xml


Changes:

=
frontend-api/pom.xml
=
--- a/frontend-api/pom.xml
+++ b/frontend-api/pom.xml
@@ -18,7 +18,7 @@
   
 hippo-addon-channel-manager
 org.onehippo.cms7
-4.2.1-SNAPSHOT
+4.2.2-SNAPSHOT
   
   4.0.0
 


=
frontend-ng/pom.xml
=
--- a/frontend-ng/pom.xml
+++ b/frontend-ng/pom.xml
@@ -20,7 +20,7 @@
   
 hippo-addon-channel-manager
 org.onehippo.cms7
-4.2.1-SNAPSHOT
+4.2.2-SNAPSHOT
   
 
   hippo-addon-channel-manager-frontend-ng


=
frontend/pom.xml
=
--- a/frontend/pom.xml
+++ b/frontend/pom.xml
@@ -20,7 +20,7 @@
   
 hippo-addon-channel-manager
 org.onehippo.cms7
-4.2.1-SNAPSHOT
+4.2.2-SNAPSHOT
   
 
 


=
pom.xml
=
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
 
 
   hippo-addon-channel-manager
-  4.2.1-SNAPSHOT
+  4.2.2-SNAPSHOT
   pom
   2011
 


=
repository/pom.xml
=
--- a/repository/pom.xml
+++ b/repository/pom.xml
@@ -20,7 +20,7 @@
   
 hippo-addon-channel-manager
 org.onehippo.cms7
-4.2.1-SNAPSHOT
+4.2.2-SNAPSHOT
   
 
   hippo-addon-channel-manager-repository



View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/compare/e77a9adfacc923f56bcfee8f7703654e609f61fd...d41eea72662f0eddc8e547516726b9d7ba2f2223
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn

[HippoCMS-scm] [Git][cms-community/hippo-cms] Deleted branch feature/CMS-9918

[Arthur Bogaart]

Arthur Bogaart deleted branch feature/CMS-9918 at cms-community / hippo-cms
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn

[HippoCMS-scm] [Git][cms-community/hippo-essentials][bugfix/ESSENTIALS-1067] ESSENTIALS-1067 Fix tabs in selections plugin

[Joeri de Gooijer]

Joeri de Gooijer pushed to branch bugfix/ESSENTIALS-1067 at cms-community / 
hippo-essentials


Commits:
90403ad7 by Joeri de Gooijer at 2017-04-25T13:38:18+02:00
ESSENTIALS-1067 Fix tabs in selections plugin

- - - - -


1 changed file:

- 
plugins/selection/src/main/resources/META-INF/resources/tool/selectionPlugin/selectionPlugin.html


Changes:

=
plugins/selection/src/main/resources/META-INF/resources/tool/selectionPlugin/selectionPlugin.html
=
--- 
a/plugins/selection/src/main/resources/META-INF/resources/tool/selectionPlugin/selectionPlugin.html
+++ 
b/plugins/selection/src/main/resources/META-INF/resources/tool/selectionPlugin/selectionPlugin.html
@@ -18,9 +18,9 @@
 
 Selections Configuration
 
-
-
-Document Types
+
+
+Document Types
 
 Add selection fields to document types
 
@@ -167,11 +167,11 @@
 
 
 
-
+
 
 
-
-Site Availability
+
+Site Availability
 Make value lists available to the site
 
 In this tab, you configure which value lists should be 
made available to the site by the
@@ -205,8 +205,8 @@
 Save 
settings
 
-
-
+
+
 
 
 



View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-essentials/commit/90403ad7b31f06cf3e8dd68d515f0c1691171805
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn

[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager] Deleted branch feature/visual-editing-psp2-CHANNELMGR-1032

[Mathijs den Burger]

Mathijs den Burger deleted branch feature/visual-editing-psp2-CHANNELMGR-1032 
at cms-community / hippo-addon-channel-manager
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn

[HippoCMS-scm] [Git][cms-community/hippo-essentials] Pushed new branch bugfix/ESSENTIALS-1067

[Joeri de Gooijer]

Joeri de Gooijer pushed new branch bugfix/ESSENTIALS-1067 at cms-community / 
hippo-essentials
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn

[HippoCMS-scm] [Git][cms-community/hippo-cms] Deleted branch feature/visual-editing-psp2-CMS-10706

[Mathijs den Burger]

Mathijs den Burger deleted branch feature/visual-editing-psp2-CMS-10706 at 
cms-community / hippo-cms
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn

[HippoCMS-scm] [Git][cms-community/hippo-cms][master] CMS-10389 Remove deprecated, path-based constructor

[Tobias Jeger]

Tobias Jeger pushed to branch master at cms-community / hippo-cms


Commits:
e684a5a6 by Tobias Jeger at 2017-04-25T13:23:06+02:00
CMS-10389 Remove deprecated, path-based constructor

- - - - -


1 changed file:

- api/src/main/java/org/hippoecm/frontend/model/JcrItemModel.java


Changes:

=
api/src/main/java/org/hippoecm/frontend/model/JcrItemModel.java
=
--- a/api/src/main/java/org/hippoecm/frontend/model/JcrItemModel.java
+++ b/api/src/main/java/org/hippoecm/frontend/model/JcrItemModel.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2008-2013 Hippo B.V. (http://www.onehippo.com)
+ *  Copyright 2008-2017 Hippo B.V. (http://www.onehippo.com)
  * 
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -78,18 +78,6 @@ public class JcrItemModel extends 
LoadableDetachableModel {
 }
 }
 
-@Deprecated
-public JcrItemModel(String path) {
-setUserId();
-absPath = path;
-try {
-final Item item = UserSession.get().getJcrSession().getItem(path);
-property = !item.isNode();
-} catch (RepositoryException e) {
-log.warn("Instantiation of item model by path failed: " + e);
-}
-}
-
 public JcrItemModel(String path, boolean property) {
 setUserId();
 uuid = null;



View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-cms/commit/e684a5a6bf82df8b356b31de75841546204a1bbe
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn

[HippoCMS-scm] [onehippo/ckeditor]

[GitHub]

  Branch: refs/heads/feature/visual-editing-psp2-CHANNELMGR-1032
  Home:   https://github.com/onehippo/ckeditor
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn

[HippoCMS-scm] [onehippo/ckeditor] f59154: CHANNELMGR-1032 Add Json utility class

[GitHub]

  Branch: refs/heads/feature/visual-editing-psp2
  Home:   https://github.com/onehippo/ckeditor
  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 
  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 
  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 
  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.


  Commit: c59257ec0f99da1d81d827ad22e4c2f2f7a46945
  
https://github.com/onehippo/ckeditor/commit/c59257ec0f99da1d81d827ad22e4c2f2f7a46945
  Author: Mathijs den Burger 
  Date:   2017-04-25 (Tue, 25 Apr 2017)

  Changed paths:
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 copyright header


  Commit: c3d5a79674e32fe1d0df09a8a464caa518568026
  
https://github.com/onehippo/ckeditor/commit/c3d5a79674e32fe1d0df09a8a464caa518568026
  Author: Mathijs den Burger 
  Date:   2017-04-25 (Tue, 25 Apr 2017)

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

  Log Message:
  ---
  CHANNELMGR-1032 Simplify if-statement


  Commit: 753e8fb4f8454ff4c97a9d319a9ed7d8c10ba1c9
  
https://github.com/onehippo/ckeditor/commit/753e8fb4f8454ff4c97a9d319a9ed7d8c10ba1c9
  Author: Mathijs den Burger 
  Date:   2017-04-25 (Tue, 25 Apr 2017)

  Changed paths:
M 
config/src/test/java/org/onehippo/ckeditor/DeclarativeKeystrokesConverterTest.java

  Log Message:
  ---
  CHANNELMGR-1032 Bump copyright year


  Commit: f262454f8417f0ac68ee7ccdf5bdf5024230fe51
  
https://github.com/onehippo/ckeditor/commit/f262454f8417f0ac68ee7ccdf5bdf5024230fe51
  Author: Mathijs den Burger 
  Date:   2017-04-25 (Tue, 25 Apr 2017)

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

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


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

[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][feature/visual-editing-psp2-CHANNELMGR-1032] CHANNELMGR-1032 Make method parameter final

[Mathijs den Burger]

Mathijs den Burger pushed to branch feature/visual-editing-psp2-CHANNELMGR-1032 
at cms-community / hippo-addon-channel-manager


Commits:
62eac9a6 by Mathijs den Burger at 2017-04-25T13:21:40+02:00
CHANNELMGR-1032 Make method parameter final

- - - - -


1 changed file:

- 
content-service/src/main/java/org/onehippo/cms/channelmanager/content/documenttype/field/type/FormattedTextFieldType.java


Changes:

=
content-service/src/main/java/org/onehippo/cms/channelmanager/content/documenttype/field/type/FormattedTextFieldType.java
=
--- 
a/content-service/src/main/java/org/onehippo/cms/channelmanager/content/documenttype/field/type/FormattedTextFieldType.java
+++ 
b/content-service/src/main/java/org/onehippo/cms/channelmanager/content/documenttype/field/type/FormattedTextFieldType.java
@@ -54,7 +54,7 @@ public class FormattedTextFieldType extends StringFieldType {
 }
 
 @Override
-public void init(FieldTypeContext fieldContext) {
+public void init(final FieldTypeContext fieldContext) {
 super.init(fieldContext);
 
 final String overlayedJson = 
NamespaceUtils.getConfigProperty(fieldContext, 
CKEDITOR_CONFIG_OVERLAYED_JSON).orElse("");



View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/62eac9a6b94b8a08463609281f677875935b1b56
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn

[HippoCMS-scm] [Git][cms-community/hippo-plugin-selections][master] HIPPLUG-1458 Stop using deprecated constructor of JcrItemModel

[Tobias Jeger]

Tobias Jeger pushed to branch master at cms-community / hippo-plugin-selections


Commits:
f98d1737 by Tobias Jeger at 2017-04-25T13:17:52+02:00
HIPPLUG-1458 Stop using deprecated constructor of JcrItemModel

- - - - -


1 changed file:

- 
addon-cms/src/main/java/org/onehippo/forge/selection/frontend/plugin/DynamicMultiSelectPlugin.java


Changes:

=
addon-cms/src/main/java/org/onehippo/forge/selection/frontend/plugin/DynamicMultiSelectPlugin.java
=
--- 
a/addon-cms/src/main/java/org/onehippo/forge/selection/frontend/plugin/DynamicMultiSelectPlugin.java
+++ 
b/addon-cms/src/main/java/org/onehippo/forge/selection/frontend/plugin/DynamicMultiSelectPlugin.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009-2016 Hippo B.V. (http://www.onehippo.com)
+ * Copyright 2009-2017 Hippo B.V. (http://www.onehippo.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -285,9 +285,10 @@ public class DynamicMultiSelectPlugin extends RenderPlugin 
{
 if (baseNodeModel != null && baseNodeModel.getNode() != null) {
 IFieldDescriptor field = helper.getField();
 try {
-if 
(baseNodeModel.getNode().getSession().itemExists(baseNodeModel.getItemModel().getPath()
 + '/' + field.getPath())) {
-JcrMultiPropertyValueModel baseModel = new 
JcrMultiPropertyValueModel<>(new JcrItemModel(
-baseNodeModel.getItemModel().getPath() + '/' + 
field.getPath()));
+if (baseNodeModel.getNode().hasProperty(field.getPath())) {
+JcrMultiPropertyValueModel baseModel = new 
JcrMultiPropertyValueModel<>(
+new 
JcrItemModel<>(baseNodeModel.getNode().getProperty(field.getPath()))
+);
 
 List baseOptions = baseModel.getObject();
 List currentOptions = model.getObject();



View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-plugin-selections/commit/f98d17373fd6ac19e886bbf1c2b6444fccdfb0ca
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn

[HippoCMS-scm] [onehippo/ckeditor] 753e8f: CHANNELMGR-1032 Bump copyright year

[GitHub]

  Branch: refs/heads/feature/visual-editing-psp2-CHANNELMGR-1032
  Home:   https://github.com/onehippo/ckeditor
  Commit: 753e8fb4f8454ff4c97a9d319a9ed7d8c10ba1c9
  
https://github.com/onehippo/ckeditor/commit/753e8fb4f8454ff4c97a9d319a9ed7d8c10ba1c9
  Author: Mathijs den Burger 
  Date:   2017-04-25 (Tue, 25 Apr 2017)

  Changed paths:
M 
config/src/test/java/org/onehippo/ckeditor/DeclarativeKeystrokesConverterTest.java

  Log Message:
  ---
  CHANNELMGR-1032 Bump copyright year


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

[HippoCMS-scm] [Git][cms-community/hippo-cms][bugfix/CMS-10695] 14 commits: CMS-9918 When using the search filter in the gallery (or image picker), I want to see thumbnails

[Joeri de Gooijer]

Joeri de Gooijer pushed to branch bugfix/CMS-10695 at cms-community / hippo-cms


Commits:
645d4b94 by Marijan Milicevic at 2017-03-21T15:21:11+01:00
CMS-9918 When using the search filter in the gallery (or image picker), I want 
to see thumbnails
- move classes from gallery plugin into cms API
- pass search scope to the SectionViewer plugin so we can detect when image 
search is done

- - - - -
37091fb7 by Bert Leunis at 2017-04-11T15:51:38+02:00
CMS-10690 use repository utils to do reference checks

- - - - -
f27611e6 by Mathijs den Burger at 2017-04-19T11:08:05+02:00
CMS-10671 Use double-checked locking to init resource guard

Using double-checked locking reduces the overhead to acquire the
lock. Once the guard is initialized, concurrent requests now no
longer have to wait for each other.

- - - - -
12f90d74 by Jasper Floor at 2017-04-20T16:08:53+02:00
CMS-10690 Merge master changes in feature/CMS-10690

- - - - -
1343751f by Jasper Floor at 2017-04-20T16:09:13+02:00
CMS-10690 Merge master changes in feature/CMS-10690

- - - - -
6823cbe0 by Jasper Floor at 2017-04-20T16:27:21+02:00
CMS-10690 Reintegrate feature/CMS-10690

- - - - -
64418232 by Arthur Bogaart at 2017-04-21T16:22:16+02:00
CMS-9918 Merge master changes in feature/CMS-9918

- - - - -
4bbe1702 by Arthur Bogaart at 2017-04-21T23:47:10+02:00
CMS-9918 Cleanup code

- formatting, add finals, remove serialVersionUID

- - - - -
293700cf by Ate Douma at 2017-04-23T02:40:45+02:00
CMS-10707 upgrade to latest log4j2

- - - - -
4d7746fa by Ate Douma at 2017-04-23T02:45:49+02:00
CMS-10707 upgrade to latest log4j2

Updating the log4j2.xml files after committed rename (to keep history)

- - - - -
367db240 by Arthur Bogaart at 2017-04-24T12:44:28+02:00
CMS-9918 Add ImageSearchViewPlugin

- Made queryCluster name configurable for TextSearchBuilder
- moved thumbnail related code from SearchViewPlugin to
ImageSearchViewPlugin
- added configuration for ImageSearchViewPlugin
- fixed undetached models in SearchingSectionPlugin

- - - - -
fb376df5 by Arthur Bogaart at 2017-04-24T16:56:04+02:00
CMS-9918 Bump hippo:version for cms-search-views

- - - - -
be0fd421 by Arthur Bogaart at 2017-04-24T16:59:18+02:00
CMS-9918 Reintegrate feature/CMS-9918

- - - - -
dfbf9df6 by Joeri de Gooijer at 2017-04-25T12:45:23+02:00
CMS-10695 Merge branch master into bugfix/CMS-10695

- - - - -


30 changed files:

- 
api/src/main/java/org/hippoecm/frontend/editor/workflow/model/ReferringDocumentsProvider.java
- 
gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/ImageContainer.html
 → api/src/main/java/org/hippoecm/frontend/plugins/gallery/ImageContainer.html
- 
gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/ImageContainer.java
 → api/src/main/java/org/hippoecm/frontend/plugins/gallery/ImageContainer.java
- 
gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/columns/Translations.java
 → api/src/main/java/org/hippoecm/frontend/plugins/gallery/Translations.java
- 
gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/columns/Translations.properties
 → 
api/src/main/java/org/hippoecm/frontend/plugins/gallery/Translations.properties
- 
gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/columns/FallbackImageGalleryListColumnProvider.java
 → 
api/src/main/java/org/hippoecm/frontend/plugins/gallery/columns/FallbackImageGalleryListColumnProvider.java
- 
gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/columns/ImageGalleryColumnProviderPlugin.java
 → 
api/src/main/java/org/hippoecm/frontend/plugins/gallery/columns/ImageGalleryColumnProviderPlugin.java
- 
gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/columns/compare/CalendarComparator.java
 → 
api/src/main/java/org/hippoecm/frontend/plugins/gallery/compare/CalendarComparator.java
- 
gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/columns/compare/LongPropertyComparator.java
 → 
api/src/main/java/org/hippoecm/frontend/plugins/gallery/compare/LongPropertyComparator.java
- 
gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/columns/compare/MimeTypeComparator.java
 → 
api/src/main/java/org/hippoecm/frontend/plugins/gallery/compare/MimeTypeComparator.java
- 
gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/columns/compare/PropertyComparator.java
 → 
api/src/main/java/org/hippoecm/frontend/plugins/gallery/compare/PropertyComparator.java
- 
gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/columns/compare/SizeComparator.java
 → 
api/src/main/java/org/hippoecm/frontend/plugins/gallery/compare/SizeComparator.java
- 
gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/columns/render/DatePropertyRenderer.java
 → 
api/src/main/java/org/hippoecm/frontend/plugins/standards/list/render/DatePropertyRenderer.java
- 
gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/columns/render/ImageIconRenderer.java
 → 

[HippoCMS-scm] [Git][cms-community/hippo-cms-translations][master] CMS-9918 Move gallery translations

[Arthur Bogaart]

Arthur Bogaart pushed to branch master at cms-community / hippo-cms-translations


Commits:
e2a8eff7 by Arthur Bogaart at 2017-04-25T12:09:11+02:00
CMS-9918 Move gallery translations

- - - - -


7 changed files:

- 
hippo-cms/resources/org/hippoecm/frontend/plugins/gallery/columns/Translations.properties
 → 
hippo-cms/resources/org/hippoecm/frontend/plugins/gallery/Translations.properties
- 
hippo-cms/resources/org/hippoecm/frontend/plugins/gallery/columns/Translations.registry.json
 → 
hippo-cms/resources/org/hippoecm/frontend/plugins/gallery/Translations.registry.json
- 
hippo-cms/resources/org/hippoecm/frontend/plugins/gallery/columns/Translations_de.properties
 → 
hippo-cms/resources/org/hippoecm/frontend/plugins/gallery/Translations_de.properties
- 
hippo-cms/resources/org/hippoecm/frontend/plugins/gallery/columns/Translations_es.properties
 → 
hippo-cms/resources/org/hippoecm/frontend/plugins/gallery/Translations_es.properties
- 
hippo-cms/resources/org/hippoecm/frontend/plugins/gallery/columns/Translations_fr.properties
 → 
hippo-cms/resources/org/hippoecm/frontend/plugins/gallery/Translations_fr.properties
- 
hippo-cms/resources/org/hippoecm/frontend/plugins/gallery/columns/Translations_nl.properties
 → 
hippo-cms/resources/org/hippoecm/frontend/plugins/gallery/Translations_nl.properties
- 
hippo-cms/resources/org/hippoecm/frontend/plugins/gallery/columns/Translations_zh.properties
 → 
hippo-cms/resources/org/hippoecm/frontend/plugins/gallery/Translations_zh.properties


Changes:

=
hippo-cms/resources/org/hippoecm/frontend/plugins/gallery/columns/Translations.properties
 → 
hippo-cms/resources/org/hippoecm/frontend/plugins/gallery/Translations.properties
=
--- 
a/hippo-cms/resources/org/hippoecm/frontend/plugins/gallery/columns/Translations.properties
+++ 
b/hippo-cms/resources/org/hippoecm/frontend/plugins/gallery/Translations.properties


=
hippo-cms/resources/org/hippoecm/frontend/plugins/gallery/columns/Translations.registry.json
 → 
hippo-cms/resources/org/hippoecm/frontend/plugins/gallery/Translations.registry.json
=
--- 
a/hippo-cms/resources/org/hippoecm/frontend/plugins/gallery/columns/Translations.registry.json
+++ 
b/hippo-cms/resources/org/hippoecm/frontend/plugins/gallery/Translations.registry.json


=
hippo-cms/resources/org/hippoecm/frontend/plugins/gallery/columns/Translations_de.properties
 → 
hippo-cms/resources/org/hippoecm/frontend/plugins/gallery/Translations_de.properties
=
--- 
a/hippo-cms/resources/org/hippoecm/frontend/plugins/gallery/columns/Translations_de.properties
+++ 
b/hippo-cms/resources/org/hippoecm/frontend/plugins/gallery/Translations_de.properties


=
hippo-cms/resources/org/hippoecm/frontend/plugins/gallery/columns/Translations_es.properties
 → 
hippo-cms/resources/org/hippoecm/frontend/plugins/gallery/Translations_es.properties
=
--- 
a/hippo-cms/resources/org/hippoecm/frontend/plugins/gallery/columns/Translations_es.properties
+++ 
b/hippo-cms/resources/org/hippoecm/frontend/plugins/gallery/Translations_es.properties


=
hippo-cms/resources/org/hippoecm/frontend/plugins/gallery/columns/Translations_fr.properties
 → 
hippo-cms/resources/org/hippoecm/frontend/plugins/gallery/Translations_fr.properties
=
--- 
a/hippo-cms/resources/org/hippoecm/frontend/plugins/gallery/columns/Translations_fr.properties
+++ 
b/hippo-cms/resources/org/hippoecm/frontend/plugins/gallery/Translations_fr.properties


=
hippo-cms/resources/org/hippoecm/frontend/plugins/gallery/columns/Translations_nl.properties
 → 
hippo-cms/resources/org/hippoecm/frontend/plugins/gallery/Translations_nl.properties
=
--- 
a/hippo-cms/resources/org/hippoecm/frontend/plugins/gallery/columns/Translations_nl.properties
+++ 
b/hippo-cms/resources/org/hippoecm/frontend/plugins/gallery/Translations_nl.properties


=
hippo-cms/resources/org/hippoecm/frontend/plugins/gallery/columns/Translations_zh.properties
 → 
hippo-cms/resources/org/hippoecm/frontend/plugins/gallery/Translations_zh.properties
=
--- 
a/hippo-cms/resources/org/hippoecm/frontend/plugins/gallery/columns/Translations_zh.properties
+++ 
b/hippo-cms/resources/org/hippoecm/frontend/plugins/gallery/Translations_zh.properties



View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-cms-translations/commit/e2a8eff7597a19fd169c61314e66545df478a984
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn

[HippoCMS-scm] [Git][cms-community/hippo-site-toolkit][master] HSTTWO-3975 fix typo 'configuraion'

[Jeroen Hoffman]

Jeroen Hoffman pushed to branch master at cms-community / hippo-site-toolkit


Commits:
991cda53 by Jeroen Hoffman at 2017-04-25T10:53:39+02:00
HSTTWO-3975 fix typo configuraion

- - - - -


1 changed file:

- 
components/core/src/main/java/org/hippoecm/hst/configuration/model/HstManagerImpl.java


Changes:

=
components/core/src/main/java/org/hippoecm/hst/configuration/model/HstManagerImpl.java
=
--- 
a/components/core/src/main/java/org/hippoecm/hst/configuration/model/HstManagerImpl.java
+++ 
b/components/core/src/main/java/org/hippoecm/hst/configuration/model/HstManagerImpl.java
@@ -207,7 +207,7 @@ public class HstManagerImpl implements HstManager, 
ServletContextAware {
 }
 
 public void setStaleConfigurationSupported(boolean 
staleConfigurationSupported) {
-log.info("Is stale configuraion for HST model supported : '{}'", 
staleConfigurationSupported);
+log.info("Is stale configuration for HST model supported: '{}'", 
staleConfigurationSupported);
 this.staleConfigurationSupported = staleConfigurationSupported;
 }
 



View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-site-toolkit/commit/991cda5357c9d9a6feed2288af83c09f7aba96fe
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn

[HippoCMS-scm] [onehippo/ckeditor] c3d5a7: CHANNELMGR-1032 Simplify if-statement

[GitHub]

  Branch: refs/heads/feature/visual-editing-psp2-CHANNELMGR-1032
  Home:   https://github.com/onehippo/ckeditor
  Commit: c3d5a79674e32fe1d0df09a8a464caa518568026
  
https://github.com/onehippo/ckeditor/commit/c3d5a79674e32fe1d0df09a8a464caa518568026
  Author: Mathijs den Burger 
  Date:   2017-04-25 (Tue, 25 Apr 2017)

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

  Log Message:
  ---
  CHANNELMGR-1032 Simplify if-statement


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

[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][feature/wpm] CHANNELMGR-1240 Fix karma test

[Michiel Eggermont]

Michiel Eggermont pushed to branch feature/wpm at cms-community / 
hippo-addon-channel-manager


Commits:
06a34870 by Michiel Eggermont at 2017-04-25T09:52:49+02:00
CHANNELMGR-1240 Fix karma test

- - - - -


1 changed file:

- frontend-ng/src/angularjs/services/project.service.spec.js


Changes:

=
frontend-ng/src/angularjs/services/project.service.spec.js
=
--- a/frontend-ng/src/angularjs/services/project.service.spec.js
+++ b/frontend-ng/src/angularjs/services/project.service.spec.js
@@ -21,6 +21,8 @@ describe('ProjectService', () => {
   let $httpBackend;
   let ProjectService;
 
+  const mountId = '12';
+
   beforeEach(() => {
 angular.mock.module('hippo-cm');
 
@@ -31,6 +33,13 @@ describe('ProjectService', () => {
   $provide.value('ConfigService', configServiceMock);
 });
 
+const channelServiceMock = jasmine.createSpyObj('ChannelService', 
['getChannel', 'initialize']);
+channelServiceMock.getChannel.and.returnValue({ mountId });
+
+angular.mock.module(($provide) => {
+  $provide.value('ChannelService', channelServiceMock);
+});
+
 inject((_$httpBackend_, _ProjectService_) => {
   $httpBackend = _$httpBackend_;
   ProjectService = _ProjectService_;
@@ -61,8 +70,7 @@ describe('ProjectService', () => {
 const returnFromRest = { withBranch, withoutBranch };
 let actual = null;
 
-$httpBackend.expectGET('/test/ws/projects').respond(404);
-$httpBackend.expectGET('/test/ws/projects/12/channel').respond(200, 
returnFromRest);
+
$httpBackend.expectGET(`/test/ws/projects/${mountId}/channel`).respond(200, 
returnFromRest);
 
 ProjectService.projects(12).then((returned) => {
   actual = returned;
@@ -71,11 +79,4 @@ describe('ProjectService', () => {
 
 expect(actual).toEqual(returnFromRest);
   });
-
-  it('can detect an absent REST url', () => {
-$httpBackend.expectGET('/test/ws/projects').respond(404);
-$httpBackend.flush();
-
-expect(ProjectService.available).toBe(false);
-  });
 });



View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/06a34870fb8ca880c7fdeae8c4ca9515862a339d
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn

[HippoCMS-scm] [onehippo/ckeditor] c59257: CHANNELMGR-1032 Add copyright header

[GitHub]

  Branch: refs/heads/feature/visual-editing-psp2-CHANNELMGR-1032
  Home:   https://github.com/onehippo/ckeditor
  Commit: c59257ec0f99da1d81d827ad22e4c2f2f7a46945
  
https://github.com/onehippo/ckeditor/commit/c59257ec0f99da1d81d827ad22e4c2f2f7a46945
  Author: Mathijs den Burger 
  Date:   2017-04-25 (Tue, 25 Apr 2017)

  Changed paths:
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 copyright header


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

[HippoCMS-scm] [Git][cms-community/hippo-cms][feature/visual-editing-psp2-CMS-10706] CMS-10706 Code improvements (add finals, remove unused constant)

[Mathijs den Burger]

Mathijs den Burger pushed to branch feature/visual-editing-psp2-CMS-10706 at 
cms-community / hippo-cms


Commits:
43840759 by Mathijs den Burger at 2017-04-25T09:45:07+02:00
CMS-10706 Code improvements (add finals, remove unused constant)

- - - - -


2 changed files:

- 
richtext/ckeditor/frontend/src/main/java/org/hippoecm/frontend/plugins/ckeditor/AbstractCKEditorPlugin.java
- 
richtext/ckeditor/frontend/src/main/java/org/hippoecm/frontend/plugins/ckeditor/CKEditorPanel.java


Changes:

=
richtext/ckeditor/frontend/src/main/java/org/hippoecm/frontend/plugins/ckeditor/AbstractCKEditorPlugin.java
=
--- 
a/richtext/ckeditor/frontend/src/main/java/org/hippoecm/frontend/plugins/ckeditor/AbstractCKEditorPlugin.java
+++ 
b/richtext/ckeditor/frontend/src/main/java/org/hippoecm/frontend/plugins/ckeditor/AbstractCKEditorPlugin.java
@@ -98,7 +98,7 @@ public abstract class AbstractCKEditorPlugin 
extends RenderPlugin {
 
 private String createEditorConfiguration(final String defaultJson) {
 try {
-IPluginConfig pluginConfig = getPluginConfig();
+final IPluginConfig pluginConfig = getPluginConfig();
 final String overlayedJson = 
pluginConfig.getString(CONFIG_CKEDITOR_CONFIG_OVERLAYED_JSON);
 final String appendedJson = 
pluginConfig.getString(CONFIG_CKEDITOR_CONFIG_APPENDED_JSON);
 return CKEditorConfig.combineConfig(defaultJson, overlayedJson, 
appendedJson).toString();


=
richtext/ckeditor/frontend/src/main/java/org/hippoecm/frontend/plugins/ckeditor/CKEditorPanel.java
=
--- 
a/richtext/ckeditor/frontend/src/main/java/org/hippoecm/frontend/plugins/ckeditor/CKEditorPanel.java
+++ 
b/richtext/ckeditor/frontend/src/main/java/org/hippoecm/frontend/plugins/ckeditor/CKEditorPanel.java
@@ -54,7 +54,6 @@ public class CKEditorPanel extends Panel {
 return Collections.singleton(CmsHeaderItem.get());
 }
 };
-private static final int LOGGED_EDITOR_CONFIG_INDENT_SPACES = 2;
 
 private static final Logger log = 
LoggerFactory.getLogger(CKEditorPanel.class);
 
@@ -114,7 +113,7 @@ public class CKEditorPanel extends Panel {
 
response.render(OnDomReadyHeaderItem.forScript(getJavaScriptForCKEditorTimestamp()));
 
response.render(JavaScriptUrlReferenceHeaderItem.forReference(CKEDITOR_PANEL_JS));
 
-ObjectNode editorConfig = getConfigurationForEditor();
+final ObjectNode editorConfig = getConfigurationForEditor();
 renderContentsCss(response, editorConfig);
 
response.render(OnDomReadyHeaderItem.forScript(getJavaScriptForEditor(editorConfig)));
 }



View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-cms/commit/4384075925c19d884e17a6d46c5d4e71af87c0d5
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn

[HippoCMS-scm] [Git][cms-community/hippo-site-toolkit][feature/wpm] HSTTWO-3980 Persist the creation of a new branch

[Michiel Rop]

Michiel Rop pushed to branch feature/wpm at cms-community / hippo-site-toolkit


Commits:
d7c806d2 by Michiel Rop at 2017-04-25T09:30:53+02:00
HSTTWO-3980 Persist the creation of a new branch

- - - - -


1 changed file:

- 
client-modules/page-composer/src/main/java/org/hippoecm/hst/pagecomposer/jaxrs/services/MountResource.java


Changes:

=
client-modules/page-composer/src/main/java/org/hippoecm/hst/pagecomposer/jaxrs/services/MountResource.java
=
--- 
a/client-modules/page-composer/src/main/java/org/hippoecm/hst/pagecomposer/jaxrs/services/MountResource.java
+++ 
b/client-modules/page-composer/src/main/java/org/hippoecm/hst/pagecomposer/jaxrs/services/MountResource.java
@@ -231,6 +231,7 @@ public class MountResource extends AbstractConfigResource {
 // TODO as well to the preview config, see HSTTWO-3965
 JcrUtils.copy(session, liveConfigurationPath + "/" + 
NODENAME_HST_WORKSPACE, liveBranchConfigNode.getPath() + "/" + 
NODENAME_HST_WORKSPACE);
 createMandatoryWorkspaceNodesIfMissing(liveBranchConfigNode.getPath());
+session.save();
 }
 
 private void assertValidName(final String branchId) {



View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-site-toolkit/commit/d7c806d220f7375d7d5513d68aac37652aeec641
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn

[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][feature/wpm] CHANNELMGR-1240 Change HTTP method and parameter

[Michiel Rop]

Michiel Rop pushed to branch feature/wpm at cms-community / 
hippo-addon-channel-manager


Commits:
4f9716fa by Michiel Rop at 2017-04-25T09:28:41+02:00
CHANNELMGR-1240 Change HTTP method and parameter

In order to make the channel manager REST API adhere to the REST
standards as much as practically feasible for now, make the methods use
PUT instead of POST and move the branchId from a parameter to a url
parameter.

- - - - -


1 changed file:

- frontend-ng/src/angularjs/services/project.service.js


Changes:

=
frontend-ng/src/angularjs/services/project.service.js
=
--- a/frontend-ng/src/angularjs/services/project.service.js
+++ b/frontend-ng/src/angularjs/services/project.service.js
@@ -36,15 +36,15 @@ class ProjectService {
   }
 
   doCreateBranch(project) {
-this.HstService.doPut(project.id, 
this.ChannelService.getChannel().mountId, 'createbranch');
+this.HstService.doPut(null, this.ChannelService.getChannel().mountId, 
'createbranch', project.id);
   }
 
   doSelectBranch(project) {
-this.HstService.doPost(project.id, 
this.ChannelService.getChannel().mountId, 'selectbranch');
+this.HstService.doPut(null, this.ChannelService.getChannel().mountId, 
'selectbranch', project.id);
   }
 
   doSelectMaster() {
-this.HstService.doPost(null, this.ChannelService.getChannel().mountId, 
'selectmaster');
+this.HstService.doPut(null, this.ChannelService.getChannel().mountId, 
'selectmaster');
   }
 
 }



View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/4f9716fa3c83a3c92b028dafa88a61c412e4de06
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn

[HippoCMS-scm] [Git][cms-community/hippo-cms][feature/visual-editing-psp2] 7 commits: CMS-9918 When using the search filter in the gallery (or image picker), I want to see thumbnails

[Mathijs den Burger]

Mathijs den Burger pushed to branch feature/visual-editing-psp2 at 
cms-community / hippo-cms


Commits:
645d4b94 by Marijan Milicevic at 2017-03-21T15:21:11+01:00
CMS-9918 When using the search filter in the gallery (or image picker), I want 
to see thumbnails
- move classes from gallery plugin into cms API
- pass search scope to the SectionViewer plugin so we can detect when image 
search is done

- - - - -
64418232 by Arthur Bogaart at 2017-04-21T16:22:16+02:00
CMS-9918 Merge master changes in feature/CMS-9918

- - - - -
4bbe1702 by Arthur Bogaart at 2017-04-21T23:47:10+02:00
CMS-9918 Cleanup code

- formatting, add finals, remove serialVersionUID

- - - - -
367db240 by Arthur Bogaart at 2017-04-24T12:44:28+02:00
CMS-9918 Add ImageSearchViewPlugin

- Made queryCluster name configurable for TextSearchBuilder
- moved thumbnail related code from SearchViewPlugin to
ImageSearchViewPlugin
- added configuration for ImageSearchViewPlugin
- fixed undetached models in SearchingSectionPlugin

- - - - -
fb376df5 by Arthur Bogaart at 2017-04-24T16:56:04+02:00
CMS-9918 Bump hippo:version for cms-search-views

- - - - -
be0fd421 by Arthur Bogaart at 2017-04-24T16:59:18+02:00
CMS-9918 Reintegrate feature/CMS-9918

- - - - -
e8dfb363 by Mathijs den Burger at 2017-04-25T09:10:44+02:00
CMS-10635 Merge master changes into feature/visual-editing-psp2

- - - - -


30 changed files:

- 
gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/ImageContainer.html
 → api/src/main/java/org/hippoecm/frontend/plugins/gallery/ImageContainer.html
- 
gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/ImageContainer.java
 → api/src/main/java/org/hippoecm/frontend/plugins/gallery/ImageContainer.java
- 
gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/columns/Translations.java
 → api/src/main/java/org/hippoecm/frontend/plugins/gallery/Translations.java
- 
gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/columns/Translations.properties
 → 
api/src/main/java/org/hippoecm/frontend/plugins/gallery/Translations.properties
- 
gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/columns/FallbackImageGalleryListColumnProvider.java
 → 
api/src/main/java/org/hippoecm/frontend/plugins/gallery/columns/FallbackImageGalleryListColumnProvider.java
- 
gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/columns/ImageGalleryColumnProviderPlugin.java
 → 
api/src/main/java/org/hippoecm/frontend/plugins/gallery/columns/ImageGalleryColumnProviderPlugin.java
- 
gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/columns/compare/CalendarComparator.java
 → 
api/src/main/java/org/hippoecm/frontend/plugins/gallery/compare/CalendarComparator.java
- 
gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/columns/compare/LongPropertyComparator.java
 → 
api/src/main/java/org/hippoecm/frontend/plugins/gallery/compare/LongPropertyComparator.java
- 
gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/columns/compare/MimeTypeComparator.java
 → 
api/src/main/java/org/hippoecm/frontend/plugins/gallery/compare/MimeTypeComparator.java
- 
gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/columns/compare/PropertyComparator.java
 → 
api/src/main/java/org/hippoecm/frontend/plugins/gallery/compare/PropertyComparator.java
- 
gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/columns/compare/SizeComparator.java
 → 
api/src/main/java/org/hippoecm/frontend/plugins/gallery/compare/SizeComparator.java
- 
gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/columns/render/DatePropertyRenderer.java
 → 
api/src/main/java/org/hippoecm/frontend/plugins/standards/list/render/DatePropertyRenderer.java
- 
gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/columns/render/ImageIconRenderer.java
 → 
api/src/main/java/org/hippoecm/frontend/plugins/standards/list/render/ImageIconRenderer.java
- 
gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/columns/render/MimeTypeIconRenderer.java
 → 
api/src/main/java/org/hippoecm/frontend/plugins/standards/list/render/MimeTypeIconRenderer.java
- 
gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/columns/render/PropertyRenderer.java
 → 
api/src/main/java/org/hippoecm/frontend/plugins/standards/list/render/PropertyRenderer.java
- 
gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/columns/render/SizeRenderer.java
 → 
api/src/main/java/org/hippoecm/frontend/plugins/standards/list/render/SizeRenderer.java
- 
gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/columns/render/StringPropertyRenderer.java
 → 
api/src/main/java/org/hippoecm/frontend/plugins/standards/list/render/StringPropertyRenderer.java
- 
gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/columns/render/ThumbnailRenderer.java
 → 

[HippoCMS-scm] [Git][cms-community/hippo-cms] Pushed new branch feature/visual-editing-psp2

[Mathijs den Burger]

Mathijs den Burger pushed new branch feature/visual-editing-psp2 at 
cms-community / hippo-cms
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn