[HippoCMS-scm] [Git][cms-community/hippo-cms-translations][release/12.0] CMS-10823 Bump plugin version
Arent-Jan Banck pushed to branch release/12.0 at cms-community / hippo-cms-translations Commits: 943ee594 by Arent-Jan Banck at 2017-09-15T00:14:45+02:00 CMS-10823 Bump plugin version - - - - - 1 changed file: - pom.xml Changes: = pom.xml = --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ 2016 -2.0.1-SNAPSHOT +2.0.2-SNAPSHOT fr,nl,de,zh,es excel View it on GitLab: https://code.onehippo.org/cms-community/hippo-cms-translations/commit/943ee594c099f0b492babfd6362657464649da7e --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-cms-translations/commit/943ee594c099f0b492babfd6362657464649da7e You're receiving this email because of your account on code.onehippo.org. ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-testsuite][feature/HSTTWO-4103] HSTTWO-4103: polishing annotation
Woonsan Ko pushed to branch feature/HSTTWO-4103 at cms-community /
hippo-testsuite
Commits:
8c768861 by Woonsan Ko at 2017-09-14T13:41:11-04:00
HSTTWO-4103: polishing annotation
- - - - -
2 changed files:
-
components/src/main/java/org/hippoecm/hst/demo/jaxrs/services/ProductPlainResource.java
-
components/src/main/java/org/hippoecm/hst/demo/jaxrs/services/TopProductsResource.java
Changes:
=
components/src/main/java/org/hippoecm/hst/demo/jaxrs/services/ProductPlainResource.java
=
---
a/components/src/main/java/org/hippoecm/hst/demo/jaxrs/services/ProductPlainResource.java
+++
b/components/src/main/java/org/hippoecm/hst/demo/jaxrs/services/ProductPlainResource.java
@@ -66,7 +66,7 @@ import io.swagger.annotations.ApiOperation;
* @version $Id$
*/
@Path("/products/")
-@Api(value = "/products/")
+@Api(value = "Products")
public class ProductPlainResource extends AbstractResource {
private static Logger log =
LoggerFactory.getLogger(ProductPlainResource.class);
=
components/src/main/java/org/hippoecm/hst/demo/jaxrs/services/TopProductsResource.java
=
---
a/components/src/main/java/org/hippoecm/hst/demo/jaxrs/services/TopProductsResource.java
+++
b/components/src/main/java/org/hippoecm/hst/demo/jaxrs/services/TopProductsResource.java
@@ -48,7 +48,7 @@ import io.swagger.annotations.ApiOperation;
* @version $Id$
*/
@Path("/topproducts/")
-@Api(value = "/topproducts/")
+@Api(value = "Top Products")
public class TopProductsResource extends AbstractResource {
private static Logger log =
LoggerFactory.getLogger(TopProductsResource.class);
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-testsuite/commit/8c768861a1deac5e6eaefbe2ffd118cba3ce6e51
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-testsuite/commit/8c768861a1deac5e6eaefbe2ffd118cba3ce6e51
You're receiving this email because of your account on code.onehippo.org.
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-testsuite][feature/HSTTWO-4103] HSTTWO-4103: polishing index.jsp
Woonsan Ko pushed to branch feature/HSTTWO-4103 at cms-community /
hippo-testsuite
Commits:
d2ea3bb3 by Woonsan Ko at 2017-09-14T13:36:26-04:00
HSTTWO-4103: polishing index.jsp
- - - - -
1 changed file:
- api-docs/src/main/webapp/index.jsp
Changes:
=
api-docs/src/main/webapp/index.jsp
=
--- a/api-docs/src/main/webapp/index.jsp
+++ b/api-docs/src/main/webapp/index.jsp
@@ -16,7 +16,7 @@
--%>
<%@ page import="java.io.*,java.util.*" %>
<%!
-private static final String SWAGGER_API_URI =
"/site/restservices/swagger.json";
+private static final String DEFAULT_SWAGGER_API_URI =
"/site/restservices/swagger.json";
private static final String SWAGGER_POM_PROPS_RESOURCE_PATH =
"META-INF/maven/org.webjars/swagger-ui/pom.properties";
private volatile String swaggerVersion;
@@ -52,6 +52,10 @@ response.setHeader("Cache-Control","no-cache");
response.setHeader("Pragma","no-cache");
response.setDateHeader ("Expires", -1);
-final String redirectPath = "/webjars/swagger-ui/" + getSwaggerModuleVersion()
+ "/index.html?url=" + SWAGGER_API_URI;
+String swaggerUrl = request.getParameter("url");
+if (swaggerUrl == null) {
+swaggerUrl = DEFAULT_SWAGGER_API_URI;
+}
+final String redirectPath = "/webjars/swagger-ui/" + getSwaggerModuleVersion()
+ "/index.html?url=" + swaggerUrl;
response.sendRedirect(request.getContextPath() + redirectPath);
%>
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-testsuite/commit/d2ea3bb39ef80095202c3e1b9656fe601414d5db
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-testsuite/commit/d2ea3bb39ef80095202c3e1b9656fe601414d5db
You're receiving this email because of your account on code.onehippo.org.
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-testsuite][feature/HSTTWO-4103] HSTTWO-4103: polishing example swagger beean config
Woonsan Ko pushed to branch feature/HSTTWO-4103 at cms-community / hippo-testsuite Commits: dbc44772 by Woonsan Ko at 2017-09-14T13:26:05-04:00 HSTTWO-4103: polishing example swagger beean config - - - - - 1 changed file: - components/src/main/resources/META-INF/hst-assembly/overrides/swagger-config.xml Changes: = components/src/main/resources/META-INF/hst-assembly/overrides/swagger-config.xml = --- a/components/src/main/resources/META-INF/hst-assembly/overrides/swagger-config.xml +++ b/components/src/main/resources/META-INF/hst-assembly/overrides/swagger-config.xml @@ -18,13 +18,15 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.1.xsd;> - + - - + + +http://www.example.com/terms-of-services.html; /> + +https://www.apache.org/licenses/LICENSE-2.0; /> - View it on GitLab: https://code.onehippo.org/cms-community/hippo-testsuite/commit/dbc4477258fe4bd97a0d81ffdac5af18d484dd39 --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-testsuite/commit/dbc4477258fe4bd97a0d81ffdac5af18d484dd39 You're receiving this email because of your account on code.onehippo.org. ___ 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/HSTTWO-4103] 7 commits: HSTTWO-4020 take enclosing writer into account when flushing child content
Woonsan Ko pushed to branch feature/HSTTWO-4103 at cms-community /
hippo-site-toolkit
Commits:
0315647f by Bert Leunis at 2017-08-24T14:15:42+02:00
HSTTWO-4020 take enclosing writer into account when flushing child content
- - - - -
4f87528e by Jasper Floor at 2017-09-06T17:20:33+02:00
HSTTWO-4020 merge master changes in bugfix/HSTTWO-4020-B
- - - - -
42804b09 by Jasper Floor at 2017-09-06T17:21:14+02:00
HSTTWO-4020 Reintegrate bugfix/HSTTWO-4020-B
- - - - -
3f32a251 by Arent-Jan Banck at 2017-09-07T17:32:45+02:00
HSTTWO-4124 Update ehcache to 2.10.4
- - - - -
0d328cce by Woonsan Ko at 2017-09-10T11:49:50-04:00
Merge branch master into feature/HSTTWO-4103
- - - - -
b5d5e309 by Arent-Jan Banck at 2017-09-14T13:55:42+02:00
HSTTWO-4089 use configuration-management version 1.1.0-SNAPSHOT
- - - - -
2fdeff20 by Woonsan Ko at 2017-09-14T12:10:29-04:00
Merge branch master into feature/HSTTWO-4103
- - - - -
2 changed files:
- client/src/main/java/org/hippoecm/hst/tag/HstIncludeTag.java
- pom.xml
Changes:
=
client/src/main/java/org/hippoecm/hst/tag/HstIncludeTag.java
=
--- a/client/src/main/java/org/hippoecm/hst/tag/HstIncludeTag.java
+++ b/client/src/main/java/org/hippoecm/hst/tag/HstIncludeTag.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.
@@ -21,6 +21,9 @@ import java.io.StringWriter;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.JspWriter;
+import javax.servlet.jsp.tagext.BodyTagSupport;
+import javax.servlet.jsp.tagext.Tag;
import javax.servlet.jsp.tagext.TagSupport;
import org.hippoecm.hst.core.component.HstResponse;
@@ -31,6 +34,7 @@ import org.slf4j.LoggerFactory;
/**
* Supporting class for including the content of a child component window.
+ *
* @version $Id$
*/
public class HstIncludeTag extends TagSupport {
@@ -42,15 +46,22 @@ public class HstIncludeTag extends TagSupport {
protected String ref = null;
protected String var;
protected String scope;
-
+private JspWriter enclosingWriter = null;
+
/* (non-Javadoc)
* @see javax.servlet.jsp.tagext.TagSupport#doStartTag()
*/
@Override
-public int doStartTag() throws JspException{
+public int doStartTag() throws JspException {
if (var != null) {
TagUtils.removeVar(var, pageContext, scope);
}
+
+final Tag parentTag = this.getParent();
+if (parentTag instanceof BodyTagSupport) {
+enclosingWriter = ((BodyTagSupport) parentTag).getBodyContent();
+}
+
return EVAL_BODY_INCLUDE;
}
@@ -59,7 +70,7 @@ public class HstIncludeTag extends TagSupport {
* @see javax.servlet.jsp.tagext.TagSupport#doEndTag()
*/
@Override
-public int doEndTag() throws JspException{
+public int doEndTag() throws JspException {
try {
HttpServletRequest servletRequest = (HttpServletRequest)
pageContext.getRequest();
HttpServletResponse servletResponse = (HttpServletResponse)
pageContext.getResponse();
@@ -72,7 +83,11 @@ public class HstIncludeTag extends TagSupport {
try {
pageContext.getOut().flush();
if (var == null) {
-hstResponse.flushChildContent(ref);
+if (enclosingWriter == null) {
+hstResponse.flushChildContent(ref);
+} else {
+hstResponse.flushChildContent(ref, enclosingWriter);
+}
} else {
StringWriter writer = new StringWriter();
hstResponse.flushChildContent(ref, writer);
@@ -80,9 +95,9 @@ public class HstIncludeTag extends TagSupport {
}
} catch (IOException e) {
if (log.isDebugEnabled()) {
-log.warn("Exception happened while including child content
for '"+ref+"'.", e);
+log.warn("Exception happened while including child content
for '" + ref + "'.", e);
} else {
-log.warn("Exception happened while including child content
for '{}' : {}",ref, e.toString());
+log.warn("Exception happened while including child content
for '{}' : {}", ref, e.toString());
}
}
@@ -96,10 +111,12 @@ public class HstIncludeTag extends TagSupport {
ref = null;
var = null;
scope = null;
+enclosingWriter = null;
}
/**
* Returns the referenced name of the child window content to include
+ *
*
[HippoCMS-scm] [Git][cms-community/hippo-jackrabbit][2.8] JCR-4079: incorrect PROPPATCH response error handling (ported to 2.8)
GitLab Mirror pushed to branch 2.8 at cms-community / hippo-jackrabbit
Commits:
ced2699a by Julian Reschke at 2017-09-14T15:48:53+00:00
JCR-4079: incorrect PROPPATCH response error handling (ported to 2.8)
git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/branches/2.8@1808363
13f79535-47bb-0310-9956-ffa450edef68
- - - - -
3 changed files:
-
jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/RepositoryServiceImpl.java
-
jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/MultiStatusResponse.java
-
jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/PropPatchMethod.java
Changes:
=
jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/RepositoryServiceImpl.java
=
---
a/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/RepositoryServiceImpl.java
+++
b/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/RepositoryServiceImpl.java
@@ -1791,8 +1791,11 @@ public class RepositoryServiceImpl implements
RepositoryService, DavConstants {
PropPatchMethod method = new PropPatchMethod(getItemUri(nodeId,
sessionInfo), changeList);
execute(method, sessionInfo);
+method.checkSuccess();
} catch (IOException e) {
throw new RepositoryException(e);
+} catch (DavException e) {
+throw ExceptionConverter.generate(e);
}
}
=
jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/MultiStatusResponse.java
=
---
a/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/MultiStatusResponse.java
+++
b/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/MultiStatusResponse.java
@@ -268,6 +268,13 @@ public class MultiStatusResponse implements
XmlSerializable, DavConstants {
}
/**
+ * @return {@code true} if the response is of type "propstat" (containing
information about individual properties)
+ */
+public boolean isPropStat() {
+return this.type == TYPE_PROPSTAT;
+}
+
+/**
* @param document
* @see
org.apache.jackrabbit.webdav.xml.XmlSerializable#toXml(org.w3c.dom.Document)
*/
=
jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/PropPatchMethod.java
=
---
a/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/PropPatchMethod.java
+++
b/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/PropPatchMethod.java
@@ -102,33 +102,46 @@ public class PropPatchMethod extends DavMethodBase
implements DavConstants {
// check of OK response contains all set/remove properties
MultiStatusResponse[] resp = multiStatus.getResponses();
if (resp.length != 1) {
-log.warn("Expected a single multi-status response in PROPPATCH.");
+log.warn("Expected a single multi-status response in PROPPATCH,
but got " + resp.length + " elements.");
}
boolean success = true;
+
// only check the first ms-response
-for (int i = 0; i < 1; i++) {
-DavPropertyNameSet okSet =
resp[i].getPropertyNames(DavServletResponse.SC_OK);
-if (okSet.isEmpty()) {
-log.debug("PROPPATCH failed: No 'OK' response found for
resource " + resp[i].getHref());
-success = false;
-} else {
-DavPropertyNameIterator it = propertyNames.iterator();
-while (it.hasNext()) {
-DavPropertyName pn = it.nextPropertyName();
-success = okSet.remove(pn);
+if (resp.length == 1) {
+MultiStatusResponse r = resp[0];
+
+if (r.isPropStat()) {
+DavPropertyNameSet okSet =
r.getPropertyNames(DavServletResponse.SC_OK);
+if (okSet.isEmpty()) {
+log.debug("PROPPATCH failed: No 'OK' response found for
resource " + r.getHref());
+success = false;
+} else {
+DavPropertyNameIterator it = propertyNames.iterator();
+while (it.hasNext()) {
+DavPropertyName pn = it.nextPropertyName();
+success = okSet.remove(pn);
+}
+}
+if (!okSet.isEmpty()) {
+StringBuffer b = new StringBuffer("The following
properties outside of the original request where set or removed: ");
+DavPropertyNameIterator it = okSet.iterator();
+while (it.hasNext()) {
+b.append(it.nextPropertyName().toString()).append(";
");
+}
+log.warn(b.toString());
}
}
-if
[HippoCMS-scm] [Git][cms-community/hippo-cms-translations][master] CHANNELMGR-1393 Add translation for key 'ERROR_FIELD_DOUBLE_PATTERN'
Ariel Weinberger pushed to branch master at cms-community /
hippo-cms-translations
Commits:
1efc3128 by Ariel Weinberger at 2017-09-14T17:10:51+02:00
CHANNELMGR-1393 Add translation for key ERROR_FIELD_DOUBLE_PATTERN
- - - - -
2 changed files:
- channel-manager/resources/angular/hippo-cm/i18n/en.json
- channel-manager/resources/angular/hippo-cm/i18n/registry.json
Changes:
=
channel-manager/resources/angular/hippo-cm/i18n/en.json
=
--- a/channel-manager/resources/angular/hippo-cm/i18n/en.json
+++ b/channel-manager/resources/angular/hippo-cm/i18n/en.json
@@ -13,6 +13,7 @@
"CLOSE": "Close",
"CONFIRM_DELETE_COMPONENT_MESSAGE": "Delete component '{{component}}' from
this template?",
"ERROR_CHANNEL_DELETE_FAILED": "Failed to delete channel",
+ "ERROR_FIELD_DOUBLE_PATTERN": "Use decimal numbers only",
"SUBPAGE_PAGE_PROPERTIES_LABEL_PRIMARY_DOCUMENT": "Primary Document",
"VIEWPORT_TABLET": "Tablet",
"FEEDBACK_SWITCH_TO_CONTENT_EDITOR": "Switch to content editor",
=
channel-manager/resources/angular/hippo-cm/i18n/registry.json
=
--- a/channel-manager/resources/angular/hippo-cm/i18n/registry.json
+++ b/channel-manager/resources/angular/hippo-cm/i18n/registry.json
@@ -758,6 +758,16 @@
"zh" : "UNRESOLVED",
"es" : "UNRESOLVED"
}
+},
+"ERROR_FIELD_DOUBLE_PATTERN" : {
+ "status" : "ADDED",
+ "locales" : {
+"de" : "UNRESOLVED",
+"fr" : "UNRESOLVED",
+"nl" : "UNRESOLVED",
+"zh" : "UNRESOLVED",
+"es" : "UNRESOLVED"
+ }
}
}
}
\ No newline at end of file
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-cms-translations/commit/1efc312856cd091832d2162a541ed593ea5bfec8
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-cms-translations/commit/1efc312856cd091832d2162a541ed593ea5bfec8
You're receiving this email because of your account on code.onehippo.org.
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-repository] Pushed new branch bugfix/REPO-1779
Bert Leunis pushed new branch bugfix/REPO-1779 at cms-community / hippo-repository --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-repository/tree/bugfix/REPO-1779 You're receiving this email because of your account on code.onehippo.org. ___ 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/CHANNELMGR-1393] 2 commits: CHANNELMGR-1393 Fix regular expression to match commas and not only dots
Ariel Weinberger pushed to branch feature/CHANNELMGR-1393 at cms-community / hippo-addon-channel-manager Commits: 46d9edc4 by Ariel Weinberger at 2017-09-14T16:57:45+02:00 CHANNELMGR-1393 Fix regular expression to match commas and not only dots - - - - - e0c3a1b4 by Ariel Weinberger at 2017-09-14T17:01:34+02:00 CHANNELMGR-1393 Append regular expression with /^ to make it accepted by ng-pattern - - - - - 1 changed file: - frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields/primitiveField/primitiveField.html Changes: = frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields/primitiveField/primitiveField.html = --- a/frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields/primitiveField/primitiveField.html +++ b/frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields/primitiveField/primitiveField.html @@ -70,7 +70,7 @@ ng-focus="$ctrl.focusPrimitive($event)" ng-blur="$ctrl.blurPrimitive($event)" ng-required="::$ctrl.fieldType.required" - ng-pattern="/^[+-]?((\d+(\.\d*)?)|(\.\d+))$/"> + ng-pattern="/^[+-]?((\d+((\.|,)\d*)?)|((\.|,)\d+))$/"> https://code.onehippo.org/cms-community/hippo-addon-channel-manager/compare/c1f514d08c7ba5a32c329a602c7edf36128fbe3d...e0c3a1b47f617e3daf55d4b8604b79ee79cd14cd --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-addon-channel-manager/compare/c1f514d08c7ba5a32c329a602c7edf36128fbe3d...e0c3a1b47f617e3daf55d4b8604b79ee79cd14cd You're receiving this email because of your account on code.onehippo.org. ___ 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 bugfix/CHANNELMGR-1380
Arent-Jan Banck deleted branch bugfix/CHANNELMGR-1380 at cms-community / hippo-addon-channel-manager --- You're receiving this email because of your account on code.onehippo.org. ___ 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 bugfix/CHANNELMGR-1380-htmlselect
Arent-Jan Banck deleted branch bugfix/CHANNELMGR-1380-htmlselect at cms-community / hippo-addon-channel-manager --- You're receiving this email because of your account on code.onehippo.org. ___ 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/CHANNELMGR-1393] CHANNELMGR-1393 Impement front end of Double field, as well as error handling for incorrect pattern
Ariel Weinberger pushed to branch feature/CHANNELMGR-1393 at cms-community /
hippo-addon-channel-manager
Commits:
c1f514d0 by Ariel Weinberger at 2017-09-14T16:49:34+02:00
CHANNELMGR-1393 Impement front end of Double field, as well as error handling
for incorrect pattern
- - - - -
2 changed files:
-
frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields/primitiveField/primitiveField.html
- frontend-ng/src/i18n/en.json
Changes:
=
frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields/primitiveField/primitiveField.html
=
---
a/frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields/primitiveField/primitiveField.html
+++
b/frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields/primitiveField/primitiveField.html
@@ -62,6 +62,16 @@
ng-required="::$ctrl.fieldType.required"
ng-pattern="/^(0|[1-9][0-9]*)$/">
+
+
{{ ::'ERROR_FIELD_REQUIRED' |
translate:$ctrl.fieldType }}
{{
::'ERROR_FIELD_LONG_PATTERN' | translate }}
+ {{
::'ERROR_FIELD_DOUBLE_PATTERN' | translate }}
=
frontend-ng/src/i18n/en.json
=
--- a/frontend-ng/src/i18n/en.json
+++ b/frontend-ng/src/i18n/en.json
@@ -45,6 +45,7 @@
"ERROR_DELETE_COMPONENT_ITEM_ALREADY_LOCKED": "Cannot delete
'{{component}}': the container is locked by '{{lockedBy}}'",
"ERROR_DELETE_PAGE": "Failed to delete page",
"ERROR_ENTER_EDIT": "Failed to enter Edit mode",
+ "ERROR_FIELD_DOUBLE_PATTERN": "Use decimal numbers only",
"ERROR_FIELD_LONG_PATTERN": "Use numbers only",
"ERROR_FIELD_REQUIRED": "{{displayName}} is a required field",
"ERROR_MENU_LOAD_FAILED": "Failed to load menu",
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/c1f514d08c7ba5a32c329a602c7edf36128fbe3d
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/c1f514d08c7ba5a32c329a602c7edf36128fbe3d
You're receiving this email because of your account on code.onehippo.org.
___
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 branch feature/CHANNELMGR-1393
Michael Metternich pushed new branch feature/CHANNELMGR-1393 at cms-community / hippo-addon-channel-manager --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-addon-channel-manager/tree/feature/CHANNELMGR-1393 You're receiving this email because of your account on code.onehippo.org. ___ 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/CHANNELMGR-1323
Arent-Jan Banck deleted branch feature/CHANNELMGR-1323 at cms-community / hippo-addon-channel-manager --- You're receiving this email because of your account on code.onehippo.org. ___ 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 bugfix/CHANNELMGR-1445
Arent-Jan Banck deleted branch bugfix/CHANNELMGR-1445 at cms-community / hippo-addon-channel-manager --- You're receiving this email because of your account on code.onehippo.org. ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms-translations] Pushed new branch bugfix/CHANNELMGR-1462
Joeri de Gooijer pushed new branch bugfix/CHANNELMGR-1462 at cms-community / hippo-cms-translations --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-cms-translations/tree/bugfix/CHANNELMGR-1462 You're receiving this email because of your account on code.onehippo.org. ___ 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/5.0] CMS-10891 [Back port CMS 10836 to 12.0] new constructor that accepts context and…
Jeroen Hoffman pushed to branch release/5.0 at cms-community / hippo-cms
Commits:
b2230ad5 by Jeroen Hoffman at 2017-09-14T15:49:44+02:00
CMS-10891 [Back port CMS 10836 to 12.0] new constructor that accepts context
and config for crop dialog
(cherry picked from commit 9f1766134b57aace9248188ba928b6319c13bacf)
- - - - -
2 changed files:
-
gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/editor/ImageCropEditorDialog.java
-
gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/editor/ImageCropPlugin.java
Changes:
=
gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/editor/ImageCropEditorDialog.java
=
---
a/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/editor/ImageCropEditorDialog.java
+++
b/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/editor/ImageCropEditorDialog.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2011-2016 Hippo B.V. (http://www.onehippo.com)
+ * Copyright 2011-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.
@@ -49,6 +49,8 @@ import org.apache.wicket.util.value.ValueMap;
import org.hippoecm.frontend.dialog.Dialog;
import org.hippoecm.frontend.editor.plugins.resource.ResourceHelper;
import org.hippoecm.frontend.model.JcrNodeModel;
+import org.hippoecm.frontend.plugin.IPluginContext;
+import org.hippoecm.frontend.plugin.config.IPluginConfig;
import org.hippoecm.frontend.plugins.gallery.editor.crop.ImageCropBehavior;
import org.hippoecm.frontend.plugins.gallery.editor.crop.ImageCropSettings;
import org.hippoecm.frontend.plugins.gallery.imageutil.ImageUtils;
@@ -91,10 +93,25 @@ public class ImageCropEditorDialog extends Dialog {
private Dimension thumbnailDimension;
private float compressionQuality;
private final ImageCropSettings cropSettings;
+@SuppressWarnings("unused")
+private IPluginConfig config;
+@SuppressWarnings("unused")
+private IPluginContext context;
-public ImageCropEditorDialog(IModel jcrImageNodeModel,
GalleryProcessor galleryProcessor) {
+/**
+ * A dialog to crop an image variant.
+ *
+ * @param jcrImageNodeModel node where the variant to be cropped is stored.
+ * @param galleryProcessor with configuration for scaling parameters and
dimensions.
+ * @param config Config of the instantiating Plugin.
+ * @param context Context of the instantiating Plugin.
+ */
+public ImageCropEditorDialog(final IModel jcrImageNodeModel, final
GalleryProcessor galleryProcessor, final IPluginConfig config, final
IPluginContext context) {
super(jcrImageNodeModel);
+this.config = config;
+this.context = context;
+
setSize(DIALOG_SIZE);
setTitleKey(DIALOG_TITLE);
@@ -202,6 +219,15 @@ public class ImageCropEditorDialog extends Dialog {
} catch (RepositoryException e) {
log.info("Cannot retrieve compression quality.", e);
}
+
+}
+
+/**
+ * @deprecated use {@link ImageCropEditorDialog(IModel, GalleryProcessor,
IPluginConfig, IPluginContext)} instead.
+ */
+@Deprecated
+public ImageCropEditorDialog(IModel jcrImageNodeModel,
GalleryProcessor galleryProcessor) {
+this(jcrImageNodeModel, galleryProcessor, null, null);
}
/**
=
gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/editor/ImageCropPlugin.java
=
---
a/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/editor/ImageCropPlugin.java
+++
b/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/editor/ImageCropPlugin.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2011-2016 Hippo B.V. (http://www.onehippo.com)
+ * Copyright 2011-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.
@@ -47,7 +47,7 @@ public class ImageCropPlugin extends RenderPlugin {
private static final long serialVersionUID = 1L;
-static final Logger log = LoggerFactory.getLogger(ImageCropPlugin.class);
+private static final Logger log =
LoggerFactory.getLogger(ImageCropPlugin.class);
private static final CssResourceReference CROP_SKIN = new
CssResourceReference(ImageCropPlugin.class, "crop-plugin.css");
@@ -110,7 +110,7 @@ public class ImageCropPlugin extends RenderPlugin {
@Override
protected void onEvent(final AjaxRequestTarget target) {
IDialogService dialogService =
context.getService(IDialogService.class.getName(), IDialogService.class);
-dialogService.show(new
ImageCropEditorDialog(jcrImageNodeModel,
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager] Pushed new branch bugfix/CHANNELMGR-1462
Joeri de Gooijer pushed new branch bugfix/CHANNELMGR-1462 at cms-community / hippo-addon-channel-manager --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-addon-channel-manager/tree/bugfix/CHANNELMGR-1462 You're receiving this email because of your account on code.onehippo.org. ___ 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 bugfix/CMS-10904
Michael Metternich deleted branch bugfix/CMS-10904 at cms-community / hippo-cms --- You're receiving this email because of your account on code.onehippo.org. ___ 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-10904 Enable 'add' button(s) only after making valid selection(s)
Michael Metternich pushed to branch master at cms-community / hippo-cms
Commits:
ba828203 by Arthur Bogaart at 2017-09-14T15:04:12+02:00
CMS-10904 Enable add button(s) only after making valid selection(s)
- - - - -
2 changed files:
-
perspectives/src/main/java/org/hippoecm/frontend/plugins/cms/admin/permissions/SetPermissionsPanel.java
-
perspectives/src/main/java/org/hippoecm/frontend/plugins/cms/admin/users/SetMembershipsPanel.java
Changes:
=
perspectives/src/main/java/org/hippoecm/frontend/plugins/cms/admin/permissions/SetPermissionsPanel.java
=
---
a/perspectives/src/main/java/org/hippoecm/frontend/plugins/cms/admin/permissions/SetPermissionsPanel.java
+++
b/perspectives/src/main/java/org/hippoecm/frontend/plugins/cms/admin/permissions/SetPermissionsPanel.java
@@ -23,6 +23,7 @@ import javax.jcr.RepositoryException;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
import org.apache.wicket.ajax.markup.html.form.AjaxButton;
import org.apache.wicket.extensions.breadcrumb.IBreadCrumbModel;
import org.apache.wicket.markup.html.basic.Label;
@@ -105,6 +106,11 @@ public class SetPermissionsPanel extends
AdminBreadCrumbPanel {
log.error("Failed to add permission", e);
}
}
+
+@Override
+public boolean isEnabled() {
+return selectedGroup != null && selectedRole != null;
+}
};
hippoForm.add(submit);
@@ -112,14 +118,24 @@ public class SetPermissionsPanel extends
AdminBreadCrumbPanel {
final DropDownChoice roleChoice = new
DropDownChoice<>("roles-select",
new PropertyModel<>(this, "selectedRole"), allRoles);
roleChoice.setNullValid(false);
-roleChoice.setRequired(true);
+roleChoice.add(new AjaxFormComponentUpdatingBehavior("onchange") {
+@Override
+protected void onUpdate(final AjaxRequestTarget target) {
+target.add(submit);
+}
+});
hippoForm.add(roleChoice);
final List allGroups = Group.getAllGroups();
final DropDownChoice groupChoice = new
DropDownChoice<>("groups-select",
new PropertyModel<>(this, "selectedGroup"), allGroups, new
ChoiceRenderer<>("groupname"));
groupChoice.setNullValid(false);
-groupChoice.setRequired(true);
+groupChoice.add(new AjaxFormComponentUpdatingBehavior("onchange") {
+@Override
+protected void onUpdate(final AjaxRequestTarget target) {
+target.add(submit);
+}
+});
hippoForm.add(groupChoice);
add(hippoForm);
=
perspectives/src/main/java/org/hippoecm/frontend/plugins/cms/admin/users/SetMembershipsPanel.java
=
---
a/perspectives/src/main/java/org/hippoecm/frontend/plugins/cms/admin/users/SetMembershipsPanel.java
+++
b/perspectives/src/main/java/org/hippoecm/frontend/plugins/cms/admin/users/SetMembershipsPanel.java
@@ -24,6 +24,7 @@ import javax.jcr.RepositoryException;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
import org.apache.wicket.ajax.markup.html.form.AjaxButton;
import org.apache.wicket.event.Broadcast;
import org.apache.wicket.extensions.breadcrumb.IBreadCrumbModel;
@@ -89,6 +90,7 @@ public class SetMembershipsPanel extends Panel {
hippoForm.add(externalMembershipsContainer);
final AjaxButton submit = new AjaxButton("submit", hippoForm) {
+
@Override
protected void onSubmit(final AjaxRequestTarget target, final Form
form) {
hippoForm.clearFeedbackMessages();
@@ -109,6 +111,11 @@ public class SetMembershipsPanel extends Panel {
}
target.add(localMembershipContainer);
}
+
+@Override
+public boolean isEnabled() {
+return selectedGroup != null;
+}
};
hippoForm.add(submit);
@@ -116,7 +123,12 @@ public class SetMembershipsPanel extends Panel {
final DropDownChoice ddc = new DropDownChoice<>("local-groups",
PropertyModel.of(this, "selectedGroup"),
localGroups, new ChoiceRenderer<>("groupname"));
ddc.setNullValid(false);
-ddc.setRequired(true);
+ddc.add(new AjaxFormComponentUpdatingBehavior("onchange") {
+@Override
+protected void onUpdate(final AjaxRequestTarget target) {
+target.add(submit);
+}
+});
hippoForm.add(ddc);
add(hippoForm);
View it on GitLab:
[HippoCMS-scm] [Git][cms-community/hippo-cms] Pushed new branch bugfix/CMS-10904
Arthur Bogaart pushed new branch bugfix/CMS-10904 at cms-community / hippo-cms --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-cms/tree/bugfix/CMS-10904 You're receiving this email because of your account on code.onehippo.org. ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-repository] Pushed new branch feature/REPO-1811-2
Ard Schrijvers pushed new branch feature/REPO-1811-2 at cms-community / hippo-repository --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-repository/tree/feature/REPO-1811-2 You're receiving this email because of your account on code.onehippo.org. ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-services-api][feature/CMS-10897] CMS-10897 Also store the lock thread in Lock object
Ard Schrijvers pushed to branch feature/CMS-10897 at cms-community /
hippo-services-api
Commits:
5eb8911b by Ard Schrijvers at 2017-09-14T14:31:05+02:00
CMS-10897 Also store the lock thread in Lock object
- - - - -
2 changed files:
- src/main/java/org/onehippo/cms7/services/lock/Lock.java
- src/main/java/org/onehippo/cms7/services/lock/LockManager.java
Changes:
=
src/main/java/org/onehippo/cms7/services/lock/Lock.java
=
--- a/src/main/java/org/onehippo/cms7/services/lock/Lock.java
+++ b/src/main/java/org/onehippo/cms7/services/lock/Lock.java
@@ -23,11 +23,14 @@ public class Lock {
String lockOwner;
+String lockThread;
+
long lockTime;
-public Lock(final String lockKey, final String lockOwner, final long
lockTime) {
+public Lock(final String lockKey, final String lockOwner, final String
lockThread, final long lockTime) {
this.lockKey = lockKey;
this.lockOwner = lockOwner;
+this.lockThread = lockThread;
this.lockTime = lockTime;
}
@@ -35,10 +38,20 @@ public class Lock {
return lockKey;
}
+/**
+ * @return the cluster node id and in case of no clustering, it will be
'default'
+ */
public String getLockOwner() {
return lockOwner;
}
+/**
+ * @return the name of the thread that holds the lock
+ */
+public String getLockThread() {
+return lockThread;
+}
+
public long getLockTime() {
return lockTime;
}
=
src/main/java/org/onehippo/cms7/services/lock/LockManager.java
=
--- a/src/main/java/org/onehippo/cms7/services/lock/LockManager.java
+++ b/src/main/java/org/onehippo/cms7/services/lock/LockManager.java
@@ -62,7 +62,7 @@ public interface LockManager {
List getLocks();
/**
- * Releases all locks and destroys this {@link LockManager}
+ * Releases all locks and destroys this {@link LockManager}.
*/
void destroy();
}
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-services-api/commit/5eb8911b9d3d3a431e21e61051cd5cd75d056f3c
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-services-api/commit/5eb8911b9d3d3a431e21e61051cd5cd75d056f3c
You're receiving this email because of your account on code.onehippo.org.
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-repository][feature/REPO-1817] REPO-1817 tweak DefinitionMergeService.recursiveAdd/Copy to embrance accumulator…
Peter Centgraf pushed to branch feature/REPO-1817 at cms-community /
hippo-repository
Commits:
5253ec1f by Peter Centgraf at 2017-09-14T13:56:22+02:00
REPO-1817 tweak DefinitionMergeService.recursiveAdd/Copy to embrance
accumulator style and not return values
- - - - -
1 changed file:
-
engine/src/main/java/org/onehippo/cm/engine/autoexport/DefinitionMergeService.java
Changes:
=
engine/src/main/java/org/onehippo/cm/engine/autoexport/DefinitionMergeService.java
=
---
a/engine/src/main/java/org/onehippo/cm/engine/autoexport/DefinitionMergeService.java
+++
b/engine/src/main/java/org/onehippo/cm/engine/autoexport/DefinitionMergeService.java
@@ -,13 +,12 @@ public class DefinitionMergeService {
* {@link #shouldPathCreateNewSource(JcrPath)}.
* @param from the definition we want to copy as a child of toParent
* @param toParent the parent of the desired new definition node
- * @param newDefs accumulator List for root definition nodes of
definitions created here (or by recursive descent)
- * @return the newly created child nodes (including separate defs by
recursive descent), already populated with
- * properties and descendants
+ * @param newDefs accumulator List for root definition nodes of
definitions created here (or by recursive descent),
+ * already populated with properties and descendants
*/
-protected List recursiveAdd(final DefinitionNodeImpl
from,
-final DefinitionNodeImpl
toParent,
-final
List newDefs) {
+protected void recursiveAdd(final DefinitionNodeImpl from,
+final DefinitionNodeImpl toParent,
+final List newDefs) {
log.debug("Adding new node definition to existing definition: {}",
from.getJcrPath());
@@ -1145,7 +1144,6 @@ public class DefinitionMergeService {
newDefs.add(to);
recursiveCopy(from, to, newDefs);
-return newDefs;
}
/**
@@ -1154,10 +1152,9 @@ public class DefinitionMergeService {
* @param from the definition we want to copy
* @param to the definition we are copying into
* @param newDefs accumulator List for root definition nodes of
definitions created here (or by recursive descent)
- * @return a list of new DefinitionNodes created here (or by recursive
descent)
*/
-protected List recursiveCopy(final DefinitionNodeImpl
from, final DefinitionNodeImpl to,
- final
List newDefs) {
+protected void recursiveCopy(final DefinitionNodeImpl from, final
DefinitionNodeImpl to,
+ final List newDefs) {
// Add the 'to' path to the reorder registry, whether it is a delete,
or if new content gets copied in here
reorderRegistry.add(to.getJcrPath().getParent());
@@ -1165,7 +1162,7 @@ public class DefinitionMergeService {
if (from.isDelete()) {
// delete clears everything, so there's no point continuing with
other properties or recursion
to.delete();
-return newDefs;
+return;
}
to.setOrderBefore(from.getOrderBefore());
@@ -1190,7 +1187,6 @@ public class DefinitionMergeService {
recursiveAdd(childNode, to, newDefs);
}
}
-return newDefs;
}
/**
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-repository/commit/5253ec1f4ba793bffcca5ace95caddb775008099
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-repository/commit/5253ec1f4ba793bffcca5ace95caddb775008099
You're receiving this email because of your account on code.onehippo.org.
___
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-4089 use configuration-management version 1.1.0-SNAPSHOT
Arent-Jan Banck pushed to branch master at cms-community / hippo-site-toolkit Commits: b5d5e309 by Arent-Jan Banck at 2017-09-14T13:55:42+02:00 HSTTWO-4089 use configuration-management version 1.1.0-SNAPSHOT - - - - - 1 changed file: - pom.xml Changes: = pom.xml = --- a/pom.xml +++ b/pom.xml @@ -83,7 +83,7 @@ 2.14.0-h2 4.1.0-SNAPSHOT 5.1.0-SNAPSHOT - 1.0.1-SNAPSHOT + 1.1.0-SNAPSHOT 5.1.0-SNAPSHOT 4.1.0-SNAPSHOT 4.1.0-SNAPSHOT View it on GitLab: https://code.onehippo.org/cms-community/hippo-site-toolkit/commit/b5d5e309932ee5d1373e750904ec2472180bfbb9 --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-site-toolkit/commit/b5d5e309932ee5d1373e750904ec2472180bfbb9 You're receiving this email because of your account on code.onehippo.org. ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-repository][feature/REPO-1817] REPO-1817 small fix for delete case of DefinitionMergeService.recursiveCopy
Peter Centgraf pushed to branch feature/REPO-1817 at cms-community /
hippo-repository
Commits:
4c163c70 by Peter Centgraf at 2017-09-14T13:51:09+02:00
REPO-1817 small fix for delete case of DefinitionMergeService.recursiveCopy
- - - - -
1 changed file:
-
engine/src/main/java/org/onehippo/cm/engine/autoexport/DefinitionMergeService.java
Changes:
=
engine/src/main/java/org/onehippo/cm/engine/autoexport/DefinitionMergeService.java
=
---
a/engine/src/main/java/org/onehippo/cm/engine/autoexport/DefinitionMergeService.java
+++
b/engine/src/main/java/org/onehippo/cm/engine/autoexport/DefinitionMergeService.java
@@ -1165,7 +1165,7 @@ public class DefinitionMergeService {
if (from.isDelete()) {
// delete clears everything, so there's no point continuing with
other properties or recursion
to.delete();
-return emptyList();
+return newDefs;
}
to.setOrderBefore(from.getOrderBefore());
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-repository/commit/4c163c70f739414844338bab1c18fe76bcd88e92
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-repository/commit/4c163c70f739414844338bab1c18fe76bcd88e92
You're receiving this email because of your account on code.onehippo.org.
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-repository] Pushed new branch feature/REPO-1817
Peter Centgraf pushed new branch feature/REPO-1817 at cms-community / hippo-repository --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-repository/tree/feature/REPO-1817 You're receiving this email because of your account on code.onehippo.org. ___ 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/5.0] 4 commits: CHANNELMGR-1456 Prevent CKEditor sharedspace toolbar from re-sliding when…
Ariel Weinberger pushed to branch release/5.0 at cms-community /
hippo-addon-channel-manager
Commits:
b15e9cb0 by Ariel Weinberger at 2017-09-14T13:39:08+02:00
CHANNELMGR-1456 Prevent CKEditor sharedspace toolbar from re-sliding when
focusing on a field if the toolbar is already visible
- - - - -
874150ed by Ariel Weinberger at 2017-09-14T13:39:08+02:00
CHANNELMGR-1456 Removed console.log and renamed variable from isVisible to
isToolbarVisible
- - - - -
1c387782 by Ariel Weinberger at 2017-09-14T13:39:09+02:00
CHANNELMGR-1456 Rename variable, fixes unit tests
- - - - -
8b1308f5 by Ariel Weinberger at 2017-09-14T13:40:05+02:00
CHANNELMGR-1460 Backport CHANNELMGR-1456 to 5.0
- - - - -
3 changed files:
-
frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields/ckeditor/ckeditor.controller.js
-
frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields/ckeditor/sharedspace-toolbar/sharedspace-toolbar.controller.js
-
frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields/ckeditor/sharedspace-toolbar/sharedspace-toolbar.controller.spec.js
Changes:
=
frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields/ckeditor/ckeditor.controller.js
=
---
a/frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields/ckeditor/ckeditor.controller.js
+++
b/frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields/ckeditor/ckeditor.controller.js
@@ -72,7 +72,9 @@ class CKEditorController {
this.editableElement.on('blur', ($event) => { this.blurEvent = $event;
});
this.editor.on('blur', () => this.onEditorBlur(this.blurEvent));
-this.editor.on('dialogShow', () => {
this.SharedSpaceToolbarService.isToolbarPinned = true; });
+this.editor.on('dialogShow', () => {
+ this.SharedSpaceToolbarService.isToolbarPinned = true;
+});
this.editor.on('dialogHide', () => {
this.SharedSpaceToolbarService.isToolbarPinned = false; });
});
this._validate();
@@ -125,9 +127,11 @@ class CKEditorController {
},
});
-this.SharedSpaceToolbarService.showToolbar({
- hasBottomToolbar: this.config.hippo &&
this.config.hippo.hasBottomToolbar,
-});
+if (!this.SharedSpaceToolbarService.isToolbarVisible) {
+ this.SharedSpaceToolbarService.showToolbar({
+hasBottomToolbar: this.config.hippo &&
this.config.hippo.hasBottomToolbar,
+ });
+}
this._validate();
}
@@ -150,8 +154,8 @@ class CKEditorController {
this.SharedSpaceToolbarService.isToolbarPinned = false;
}, () => {
// Cancel callback
- this.SharedSpaceToolbarService.isToolbarPinned = false;
this.editor.focus();
+ this.SharedSpaceToolbarService.isToolbarPinned = false;
});
}
@@ -167,8 +171,8 @@ class CKEditorController {
this.SharedSpaceToolbarService.isToolbarPinned = false;
}, () => {
// Cancel callback
- this.SharedSpaceToolbarService.isToolbarPinned = false;
this.editor.focus();
+ this.SharedSpaceToolbarService.isToolbarPinned = false;
});
}
=
frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields/ckeditor/sharedspace-toolbar/sharedspace-toolbar.controller.js
=
---
a/frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields/ckeditor/sharedspace-toolbar/sharedspace-toolbar.controller.js
+++
b/frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields/ckeditor/sharedspace-toolbar/sharedspace-toolbar.controller.js
@@ -40,6 +40,7 @@ class SharedSpaceToolbar {
setToolbarVisible(state, options = {}) {
this.isVisible = state;
+this.SharedSpaceToolbarService.isToolbarVisible = this.isVisible;
this.showBottomToolbar = options.hasBottomToolbar || false;
this.$rootScope.$apply();
this._fixScrollingPosition(state);
=
frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields/ckeditor/sharedspace-toolbar/sharedspace-toolbar.controller.spec.js
=
---
a/frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields/ckeditor/sharedspace-toolbar/sharedspace-toolbar.controller.spec.js
+++
b/frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields/ckeditor/sharedspace-toolbar/sharedspace-toolbar.controller.spec.js
@@ -61,6 +61,7 @@ describe('Sharedspace toolbar component controller', () => {
expect($ctrl.isVisible).toEqual(true);
expect($ctrl.showBottomToolbar).toEqual(false);
+expect(SharedSpaceToolbarService.isToolbarVisible).toEqual(true);
});
describe('fix scrolling position', () => {
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/compare/c5699f1f061f4cc8593388f46e753f94149a8818...8b1308f5aeeaf6b9cee56684c41b44463e323350
---
View it on GitLab:
[HippoCMS-scm] [Git][cms-community/hippo-cms][master] CMS-10823 Bump configuration-management version to 1.1.0-SNAPSHOT
Arent-Jan Banck pushed to branch master at cms-community / hippo-cms Commits: 1871f5cc by Arent-Jan Banck at 2017-09-14T13:31:05+02:00 CMS-10823 Bump configuration-management version to 1.1.0-SNAPSHOT - - - - - 1 changed file: - pom.xml Changes: = pom.xml = --- a/pom.xml +++ b/pom.xml @@ -90,7 +90,7 @@ 4.1.0-SNAPSHOT 1.1.0-SNAPSHOT 5.1.0-SNAPSHOT - 1.0.1-SNAPSHOT + 1.1.0-SNAPSHOT 3.4 View it on GitLab: https://code.onehippo.org/cms-community/hippo-cms/commit/1871f5ccd1b456a998fa0338032d59637a6c4525 --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-cms/commit/1871f5ccd1b456a998fa0338032d59637a6c4525 You're receiving this email because of your account on code.onehippo.org. ___ 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][release/5.0] 2 commits: HSTTWO-4122 take enclosing writer into account when flushing child content
Bert Leunis pushed to branch release/5.0 at cms-community / hippo-site-toolkit
Commits:
56570120 by Bert Leunis at 2017-09-14T13:19:01+02:00
HSTTWO-4122 take enclosing writer into account when flushing child content
(cherry picked from commit 0315647f492f4403675dc813c18615c423f43d78)
- - - - -
223d3d1f by Bert Leunis at 2017-09-14T13:21:10+02:00
HSTTWO-4122 Reintegrate bugfix/HSTTWO-4122
- - - - -
1 changed file:
- client/src/main/java/org/hippoecm/hst/tag/HstIncludeTag.java
Changes:
=
client/src/main/java/org/hippoecm/hst/tag/HstIncludeTag.java
=
--- a/client/src/main/java/org/hippoecm/hst/tag/HstIncludeTag.java
+++ b/client/src/main/java/org/hippoecm/hst/tag/HstIncludeTag.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.
@@ -21,6 +21,9 @@ import java.io.StringWriter;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.JspWriter;
+import javax.servlet.jsp.tagext.BodyTagSupport;
+import javax.servlet.jsp.tagext.Tag;
import javax.servlet.jsp.tagext.TagSupport;
import org.hippoecm.hst.core.component.HstResponse;
@@ -31,6 +34,7 @@ import org.slf4j.LoggerFactory;
/**
* Supporting class for including the content of a child component window.
+ *
* @version $Id$
*/
public class HstIncludeTag extends TagSupport {
@@ -42,15 +46,22 @@ public class HstIncludeTag extends TagSupport {
protected String ref = null;
protected String var;
protected String scope;
-
+private JspWriter enclosingWriter = null;
+
/* (non-Javadoc)
* @see javax.servlet.jsp.tagext.TagSupport#doStartTag()
*/
@Override
-public int doStartTag() throws JspException{
+public int doStartTag() throws JspException {
if (var != null) {
TagUtils.removeVar(var, pageContext, scope);
}
+
+final Tag parentTag = this.getParent();
+if (parentTag instanceof BodyTagSupport) {
+enclosingWriter = ((BodyTagSupport) parentTag).getBodyContent();
+}
+
return EVAL_BODY_INCLUDE;
}
@@ -59,7 +70,7 @@ public class HstIncludeTag extends TagSupport {
* @see javax.servlet.jsp.tagext.TagSupport#doEndTag()
*/
@Override
-public int doEndTag() throws JspException{
+public int doEndTag() throws JspException {
try {
HttpServletRequest servletRequest = (HttpServletRequest)
pageContext.getRequest();
HttpServletResponse servletResponse = (HttpServletResponse)
pageContext.getResponse();
@@ -72,7 +83,11 @@ public class HstIncludeTag extends TagSupport {
try {
pageContext.getOut().flush();
if (var == null) {
-hstResponse.flushChildContent(ref);
+if (enclosingWriter == null) {
+hstResponse.flushChildContent(ref);
+} else {
+hstResponse.flushChildContent(ref, enclosingWriter);
+}
} else {
StringWriter writer = new StringWriter();
hstResponse.flushChildContent(ref, writer);
@@ -80,9 +95,9 @@ public class HstIncludeTag extends TagSupport {
}
} catch (IOException e) {
if (log.isDebugEnabled()) {
-log.warn("Exception happened while including child content
for '"+ref+"'.", e);
+log.warn("Exception happened while including child content
for '" + ref + "'.", e);
} else {
-log.warn("Exception happened while including child content
for '{}' : {}",ref, e.toString());
+log.warn("Exception happened while including child content
for '{}' : {}", ref, e.toString());
}
}
@@ -96,10 +111,12 @@ public class HstIncludeTag extends TagSupport {
ref = null;
var = null;
scope = null;
+enclosingWriter = null;
}
/**
* Returns the referenced name of the child window content to include
+ *
* @return String
*/
public String getRef() {
@@ -112,8 +129,8 @@ public class HstIncludeTag extends TagSupport {
/**
* Sets the ref property.
+ *
* @param ref The referenced name of the child window content to include
- * @return void
*/
public void setRef(String ref) {
this.ref = ref;
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-site-toolkit/compare/989019d023066e0ac8de3365ce48f12647271ed1...223d3d1f51cb44c547fde14d85d7299724190c59
---
View it
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager] Pushed new branch bugfix/CHANNELMGR-1461
Joeri de Gooijer pushed new branch bugfix/CHANNELMGR-1461 at cms-community / hippo-addon-channel-manager --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-addon-channel-manager/tree/bugfix/CHANNELMGR-1461 You're receiving this email because of your account on code.onehippo.org. ___ 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][master] 2 commits: CHANNELMGR-1456 Fix another failing unit test by renaming a variable in the spec file
Ariel Weinberger pushed to branch master at cms-community /
hippo-addon-channel-manager
Commits:
ccd55b66 by Ariel Weinberger at 2017-09-14T13:13:28+02:00
CHANNELMGR-1456 Fix another failing unit test by renaming a variable in the
spec file
- - - - -
122e8f09 by Ariel Weinberger at 2017-09-14T13:14:53+02:00
Merge branch feature/CHANNELMGR-1456
- - - - -
1 changed file:
-
frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields/ckeditor/sharedspace-toolbar/sharedspace-toolbar.controller.spec.js
Changes:
=
frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields/ckeditor/sharedspace-toolbar/sharedspace-toolbar.controller.spec.js
=
---
a/frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields/ckeditor/sharedspace-toolbar/sharedspace-toolbar.controller.spec.js
+++
b/frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields/ckeditor/sharedspace-toolbar/sharedspace-toolbar.controller.spec.js
@@ -59,9 +59,9 @@ describe('Sharedspace toolbar component controller', () => {
hasBottomToolbar: false,
});
-expect($ctrl.isToolbarVisible).toEqual(true);
+expect($ctrl.isVisible).toEqual(true);
expect($ctrl.showBottomToolbar).toEqual(false);
-expect(SharedSpaceToolbarService.isVisible).toEqual(true);
+expect(SharedSpaceToolbarService.isToolbarVisible).toEqual(true);
});
describe('fix scrolling position', () => {
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/compare/6850ea95248f7d7c7a872de9de0791dd472bbee5...122e8f09ef227ed8df6f55d2eb61cd95c0ef5128
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/compare/6850ea95248f7d7c7a872de9de0791dd472bbee5...122e8f09ef227ed8df6f55d2eb61cd95c0ef5128
You're receiving this email because of your account on code.onehippo.org.
___
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/CHANNELMGR-1456] CHANNELMGR-1456 Fix another failing unit test by renaming a variable in the spec file
Ariel Weinberger pushed to branch feature/CHANNELMGR-1456 at cms-community /
hippo-addon-channel-manager
Commits:
ccd55b66 by Ariel Weinberger at 2017-09-14T13:13:28+02:00
CHANNELMGR-1456 Fix another failing unit test by renaming a variable in the
spec file
- - - - -
1 changed file:
-
frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields/ckeditor/sharedspace-toolbar/sharedspace-toolbar.controller.spec.js
Changes:
=
frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields/ckeditor/sharedspace-toolbar/sharedspace-toolbar.controller.spec.js
=
---
a/frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields/ckeditor/sharedspace-toolbar/sharedspace-toolbar.controller.spec.js
+++
b/frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields/ckeditor/sharedspace-toolbar/sharedspace-toolbar.controller.spec.js
@@ -59,9 +59,9 @@ describe('Sharedspace toolbar component controller', () => {
hasBottomToolbar: false,
});
-expect($ctrl.isToolbarVisible).toEqual(true);
+expect($ctrl.isVisible).toEqual(true);
expect($ctrl.showBottomToolbar).toEqual(false);
-expect(SharedSpaceToolbarService.isVisible).toEqual(true);
+expect(SharedSpaceToolbarService.isToolbarVisible).toEqual(true);
});
describe('fix scrolling position', () => {
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/ccd55b66b9d242bd1824199137cd27b9b4ef883a
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/ccd55b66b9d242bd1824199137cd27b9b4ef883a
You're receiving this email because of your account on code.onehippo.org.
___
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][release/4.2] 2 commits: HSTTWO-4125 take enclosing writer into account when flushing child content
Bert Leunis pushed to branch release/4.2 at cms-community / hippo-site-toolkit
Commits:
2c3ddc8f by Bert Leunis at 2017-09-14T13:03:11+02:00
HSTTWO-4125 take enclosing writer into account when flushing child content
(cherry picked from commit 0315647f492f4403675dc813c18615c423f43d78)
# Conflicts:
# client/src/main/java/org/hippoecm/hst/tag/HstIncludeTag.java
- - - - -
3027d2c1 by Bert Leunis at 2017-09-14T13:07:09+02:00
HSTTWO-4125 Reintegrate bugfix/HSTTWO-4125
- - - - -
1 changed file:
- client/src/main/java/org/hippoecm/hst/tag/HstIncludeTag.java
Changes:
=
client/src/main/java/org/hippoecm/hst/tag/HstIncludeTag.java
=
--- a/client/src/main/java/org/hippoecm/hst/tag/HstIncludeTag.java
+++ b/client/src/main/java/org/hippoecm/hst/tag/HstIncludeTag.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.
@@ -21,7 +21,10 @@ import java.io.StringWriter;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.JspWriter;
+import javax.servlet.jsp.tagext.BodyTagSupport;
import javax.servlet.jsp.PageContext;
+import javax.servlet.jsp.tagext.Tag;
import javax.servlet.jsp.tagext.TagSupport;
import org.hippoecm.hst.core.component.HstResponse;
@@ -31,6 +34,7 @@ import org.slf4j.LoggerFactory;
/**
* Supporting class for including the content of a child component window.
+ *
* @version $Id$
*/
public class HstIncludeTag extends TagSupport {
@@ -41,15 +45,22 @@ public class HstIncludeTag extends TagSupport {
protected String ref = null;
protected String var;
-
+private JspWriter enclosingWriter = null;
+
/* (non-Javadoc)
* @see javax.servlet.jsp.tagext.TagSupport#doStartTag()
*/
@Override
-public int doStartTag() throws JspException{
+public int doStartTag() throws JspException {
if (var != null) {
pageContext.removeAttribute(var, PageContext.PAGE_SCOPE);
}
+
+final Tag parentTag = this.getParent();
+if (parentTag instanceof BodyTagSupport) {
+enclosingWriter = ((BodyTagSupport) parentTag).getBodyContent();
+}
+
return EVAL_BODY_INCLUDE;
}
@@ -58,7 +69,7 @@ public class HstIncludeTag extends TagSupport {
* @see javax.servlet.jsp.tagext.TagSupport#doEndTag()
*/
@Override
-public int doEndTag() throws JspException{
+public int doEndTag() throws JspException {
try {
HttpServletRequest servletRequest = (HttpServletRequest)
pageContext.getRequest();
HttpServletResponse servletResponse = (HttpServletResponse)
pageContext.getResponse();
@@ -71,7 +82,11 @@ public class HstIncludeTag extends TagSupport {
try {
pageContext.getOut().flush();
if (var == null) {
-hstResponse.flushChildContent(ref);
+if (enclosingWriter == null) {
+hstResponse.flushChildContent(ref);
+} else {
+hstResponse.flushChildContent(ref, enclosingWriter);
+}
} else {
StringWriter writer = new StringWriter();
hstResponse.flushChildContent(ref, writer);
@@ -79,9 +94,9 @@ public class HstIncludeTag extends TagSupport {
}
} catch (IOException e) {
if (log.isDebugEnabled()) {
-log.warn("Exception happened while including child content
for '"+ref+"'.", e);
+log.warn("Exception happened while including child content
for '" + ref + "'.", e);
} else {
-log.warn("Exception happened while including child content
for '{}' : {}",ref, e.toString());
+log.warn("Exception happened while including child content
for '{}' : {}", ref, e.toString());
}
}
@@ -94,20 +109,22 @@ public class HstIncludeTag extends TagSupport {
protected void cleanup() {
ref = null;
var = null;
+enclosingWriter = null;
}
/**
* Returns the referenced name of the child window content to include
+ *
* @return String
*/
public String getRef() {
return this.ref;
}
-
+
/**
* Sets the ref property.
+ *
* @param ref The referenced name of the child window content to include
- * @return void
*/
public void setRef(String ref) {
this.ref = ref;
View it on GitLab:
[HippoCMS-scm] [Git][cms-community/hippo-cms][master] CMS-10846 Prevent javascript wicket.ajax error on hidden minutes field
Arthur Bogaart pushed to branch master at cms-community / hippo-cms
Commits:
724ba63b by Arthur Bogaart at 2017-09-14T13:02:53+02:00
CMS-10846 Prevent javascript wicket.ajax error on hidden minutes field
- - - - -
1 changed file:
-
api/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/YuiGMTDateField.java
Changes:
=
api/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/YuiGMTDateField.java
=
---
a/api/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/YuiGMTDateField.java
+++
b/api/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/YuiGMTDateField.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016 Hippo B.V. (http://www.onehippo.com)
+ * Copyright 2016-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.
@@ -30,10 +30,12 @@ public class YuiGMTDateField extends YuiDateTimeField {
// hiding the "hours" component hides the entire "hours"
wicket:enclosure
get(HOURS).setVisibilityAllowed(false);
+// hide the minutes field to prevent wicket.ajax javascript errors
+get(MINUTES).setVisibilityAllowed(false);
}
@Override
protected TimeZone getClientTimeZone() {
return TimeZone.getTimeZone("GMT");
}
-}
\ No newline at end of file
+}
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-cms/commit/724ba63b00b8f3e34d30f6736ab469d8f6b02895
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-cms/commit/724ba63b00b8f3e34d30f6736ab469d8f6b02895
You're receiving this email because of your account on code.onehippo.org.
___
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][master] 2 commits: CHANNELMGR-1456 Rename variable, fixes unit tests
Ariel Weinberger pushed to branch master at cms-community /
hippo-addon-channel-manager
Commits:
2bcb4782 by Ariel Weinberger at 2017-09-14T12:58:34+02:00
CHANNELMGR-1456 Rename variable, fixes unit tests
- - - - -
6850ea95 by Ariel Weinberger at 2017-09-14T12:59:21+02:00
Merge branch feature/CHANNELMGR-1456
- - - - -
1 changed file:
-
frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields/ckeditor/sharedspace-toolbar/sharedspace-toolbar.controller.spec.js
Changes:
=
frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields/ckeditor/sharedspace-toolbar/sharedspace-toolbar.controller.spec.js
=
---
a/frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields/ckeditor/sharedspace-toolbar/sharedspace-toolbar.controller.spec.js
+++
b/frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields/ckeditor/sharedspace-toolbar/sharedspace-toolbar.controller.spec.js
@@ -59,7 +59,7 @@ describe('Sharedspace toolbar component controller', () => {
hasBottomToolbar: false,
});
-expect($ctrl.isVisible).toEqual(true);
+expect($ctrl.isToolbarVisible).toEqual(true);
expect($ctrl.showBottomToolbar).toEqual(false);
expect(SharedSpaceToolbarService.isVisible).toEqual(true);
});
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/compare/15dca7819b25b354b19f0c8516ae0f8e8606ee35...6850ea95248f7d7c7a872de9de0791dd472bbee5
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/compare/15dca7819b25b354b19f0c8516ae0f8e8606ee35...6850ea95248f7d7c7a872de9de0791dd472bbee5
You're receiving this email because of your account on code.onehippo.org.
___
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/CHANNELMGR-1456] CHANNELMGR-1456 Rename variable, fixes unit tests
Ariel Weinberger pushed to branch feature/CHANNELMGR-1456 at cms-community /
hippo-addon-channel-manager
Commits:
2bcb4782 by Ariel Weinberger at 2017-09-14T12:58:34+02:00
CHANNELMGR-1456 Rename variable, fixes unit tests
- - - - -
1 changed file:
-
frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields/ckeditor/sharedspace-toolbar/sharedspace-toolbar.controller.spec.js
Changes:
=
frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields/ckeditor/sharedspace-toolbar/sharedspace-toolbar.controller.spec.js
=
---
a/frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields/ckeditor/sharedspace-toolbar/sharedspace-toolbar.controller.spec.js
+++
b/frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields/ckeditor/sharedspace-toolbar/sharedspace-toolbar.controller.spec.js
@@ -59,7 +59,7 @@ describe('Sharedspace toolbar component controller', () => {
hasBottomToolbar: false,
});
-expect($ctrl.isVisible).toEqual(true);
+expect($ctrl.isToolbarVisible).toEqual(true);
expect($ctrl.showBottomToolbar).toEqual(false);
expect(SharedSpaceToolbarService.isVisible).toEqual(true);
});
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/2bcb478277e0ab0793a9b37e518beb577956ceef
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/2bcb478277e0ab0793a9b37e518beb577956ceef
You're receiving this email because of your account on code.onehippo.org.
___
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][master] CMS-10903 Use release ckeditor 4.7.1-h1
Arent-Jan Banck pushed to branch master at cms-community / hippo-cms-release Commits: 4d0f7ebd by Arent-Jan Banck at 2017-09-14T12:07:25+02:00 CMS-10903 Use release ckeditor 4.7.1-h1 - - - - - 1 changed file: - pom.xml Changes: = pom.xml = --- a/pom.xml +++ b/pom.xml @@ -46,7 +46,7 @@ 1.1.0-SNAPSHOT 5.1.0-SNAPSHOT 4.1.0-SNAPSHOT -4.7.1-h1-SNAPSHOT +4.7.1-h1 4.1.0-SNAPSHOT 5.1.0-SNAPSHOT 4.1.0-SNAPSHOT View it on GitLab: https://code.onehippo.org/cms-community/hippo-cms-release/commit/4d0f7ebd12fb935b80609e9e6fbb626f98da10b5 --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-cms-release/commit/4d0f7ebd12fb935b80609e9e6fbb626f98da10b5 You're receiving this email because of your account on code.onehippo.org. ___ 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][master] 3 commits: CHANNELMGR-1456 Prevent CKEditor sharedspace toolbar from re-sliding when…
Ariel Weinberger pushed to branch master at cms-community /
hippo-addon-channel-manager
Commits:
930a0c51 by Ariel Weinberger at 2017-09-14T11:33:40+02:00
CHANNELMGR-1456 Prevent CKEditor sharedspace toolbar from re-sliding when
focusing on a field if the toolbar is already visible
- - - - -
7f83d96f by Ariel Weinberger at 2017-09-14T12:03:32+02:00
CHANNELMGR-1456 Removed console.log and renamed variable from isVisible to
isToolbarVisible
- - - - -
15dca781 by Ariel Weinberger at 2017-09-14T12:04:03+02:00
Merge branch feature/CHANNELMGR-1456
- - - - -
3 changed files:
-
frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields/ckeditor/ckeditor.controller.js
-
frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields/ckeditor/sharedspace-toolbar/sharedspace-toolbar.controller.js
-
frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields/ckeditor/sharedspace-toolbar/sharedspace-toolbar.controller.spec.js
Changes:
=
frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields/ckeditor/ckeditor.controller.js
=
---
a/frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields/ckeditor/ckeditor.controller.js
+++
b/frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields/ckeditor/ckeditor.controller.js
@@ -72,7 +72,9 @@ class CKEditorController {
this.editableElement.on('blur', ($event) => { this.blurEvent = $event;
});
this.editor.on('blur', () => this.onEditorBlur(this.blurEvent));
-this.editor.on('dialogShow', () => {
this.SharedSpaceToolbarService.isToolbarPinned = true; });
+this.editor.on('dialogShow', () => {
+ this.SharedSpaceToolbarService.isToolbarPinned = true;
+});
this.editor.on('dialogHide', () => {
this.SharedSpaceToolbarService.isToolbarPinned = false; });
});
this._validate();
@@ -125,9 +127,11 @@ class CKEditorController {
},
});
-this.SharedSpaceToolbarService.showToolbar({
- hasBottomToolbar: this.config.hippo &&
this.config.hippo.hasBottomToolbar,
-});
+if (!this.SharedSpaceToolbarService.isToolbarVisible) {
+ this.SharedSpaceToolbarService.showToolbar({
+hasBottomToolbar: this.config.hippo &&
this.config.hippo.hasBottomToolbar,
+ });
+}
this._validate();
}
@@ -150,8 +154,8 @@ class CKEditorController {
this.SharedSpaceToolbarService.isToolbarPinned = false;
}, () => {
// Cancel callback
- this.SharedSpaceToolbarService.isToolbarPinned = false;
this.editor.focus();
+ this.SharedSpaceToolbarService.isToolbarPinned = false;
});
}
@@ -167,8 +171,8 @@ class CKEditorController {
this.SharedSpaceToolbarService.isToolbarPinned = false;
}, () => {
// Cancel callback
- this.SharedSpaceToolbarService.isToolbarPinned = false;
this.editor.focus();
+ this.SharedSpaceToolbarService.isToolbarPinned = false;
});
}
=
frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields/ckeditor/sharedspace-toolbar/sharedspace-toolbar.controller.js
=
---
a/frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields/ckeditor/sharedspace-toolbar/sharedspace-toolbar.controller.js
+++
b/frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields/ckeditor/sharedspace-toolbar/sharedspace-toolbar.controller.js
@@ -40,6 +40,7 @@ class SharedSpaceToolbar {
setToolbarVisible(state, options = {}) {
this.isVisible = state;
+this.SharedSpaceToolbarService.isToolbarVisible = this.isVisible;
this.showBottomToolbar = options.hasBottomToolbar || false;
this.$rootScope.$apply();
this._fixScrollingPosition(state);
=
frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields/ckeditor/sharedspace-toolbar/sharedspace-toolbar.controller.spec.js
=
---
a/frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields/ckeditor/sharedspace-toolbar/sharedspace-toolbar.controller.spec.js
+++
b/frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields/ckeditor/sharedspace-toolbar/sharedspace-toolbar.controller.spec.js
@@ -61,6 +61,7 @@ describe('Sharedspace toolbar component controller', () => {
expect($ctrl.isVisible).toEqual(true);
expect($ctrl.showBottomToolbar).toEqual(false);
+expect(SharedSpaceToolbarService.isVisible).toEqual(true);
});
describe('fix scrolling position', () => {
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/compare/0592d1743b2e157326910e4bf35f466868f763e5...15dca7819b25b354b19f0c8516ae0f8e8606ee35
---
View it on GitLab:
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][feature/CHANNELMGR-1456] CHANNELMGR-1456 Removed console.log and renamed variable from isVisible to isToolbarVisible
Ariel Weinberger pushed to branch feature/CHANNELMGR-1456 at cms-community /
hippo-addon-channel-manager
Commits:
7f83d96f by Ariel Weinberger at 2017-09-14T12:03:32+02:00
CHANNELMGR-1456 Removed console.log and renamed variable from isVisible to
isToolbarVisible
- - - - -
2 changed files:
-
frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields/ckeditor/ckeditor.controller.js
-
frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields/ckeditor/sharedspace-toolbar/sharedspace-toolbar.controller.js
Changes:
=
frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields/ckeditor/ckeditor.controller.js
=
---
a/frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields/ckeditor/ckeditor.controller.js
+++
b/frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields/ckeditor/ckeditor.controller.js
@@ -73,7 +73,6 @@ class CKEditorController {
this.editor.on('blur', () => this.onEditorBlur(this.blurEvent));
this.editor.on('dialogShow', () => {
- console.log('test');
this.SharedSpaceToolbarService.isToolbarPinned = true;
});
this.editor.on('dialogHide', () => {
this.SharedSpaceToolbarService.isToolbarPinned = false; });
@@ -128,7 +127,7 @@ class CKEditorController {
},
});
-if (!this.SharedSpaceToolbarService.isVisible) {
+if (!this.SharedSpaceToolbarService.isToolbarVisible) {
this.SharedSpaceToolbarService.showToolbar({
hasBottomToolbar: this.config.hippo &&
this.config.hippo.hasBottomToolbar,
});
=
frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields/ckeditor/sharedspace-toolbar/sharedspace-toolbar.controller.js
=
---
a/frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields/ckeditor/sharedspace-toolbar/sharedspace-toolbar.controller.js
+++
b/frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields/ckeditor/sharedspace-toolbar/sharedspace-toolbar.controller.js
@@ -40,7 +40,7 @@ class SharedSpaceToolbar {
setToolbarVisible(state, options = {}) {
this.isVisible = state;
-this.SharedSpaceToolbarService.isVisible = this.isVisible;
+this.SharedSpaceToolbarService.isToolbarVisible = this.isVisible;
this.showBottomToolbar = options.hasBottomToolbar || false;
this.$rootScope.$apply();
this._fixScrollingPosition(state);
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/7f83d96f6925e2876f61d055d4773aa9816e0090
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/7f83d96f6925e2876f61d055d4773aa9816e0090
You're receiving this email because of your account on code.onehippo.org.
___
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][master] CMS-10823 Correct configuration-management version
Arent-Jan Banck pushed to branch master at cms-community / hippo-cms-release Commits: 1409f6a6 by Arent-Jan Banck at 2017-09-14T12:02:37+02:00 CMS-10823 Correct configuration-management version - - - - - 1 changed file: - pom.xml Changes: = pom.xml = --- a/pom.xml +++ b/pom.xml @@ -43,7 +43,7 @@ 2.14.0-h2 - 1.0.1-SNAPSHOT + 1.1.0-SNAPSHOT 5.1.0-SNAPSHOT 4.1.0-SNAPSHOT 4.7.1-h1-SNAPSHOT View it on GitLab: https://code.onehippo.org/cms-community/hippo-cms-release/commit/1409f6a6eaed368ad6471e52815310dbf1796bf1 --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-cms-release/commit/1409f6a6eaed368ad6471e52815310dbf1796bf1 You're receiving this email because of your account on code.onehippo.org. ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms-l10n-tooling][master] CMS-10902 Add license header
Oscar Scholten pushed to branch master at cms-community / hippo-cms-l10n-tooling Commits: 3c52c522 by Oscar Scholten at 2017-09-14T11:54:14+02:00 CMS-10902 Add license header - - - - - 1 changed file: - scripts/hippo-cms-l10n.sh Changes: = scripts/hippo-cms-l10n.sh = --- a/scripts/hippo-cms-l10n.sh +++ b/scripts/hippo-cms-l10n.sh @@ -1,5 +1,19 @@ #!/bin/bash +# Copyright 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. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + locales="nl de fr zh es" release="12.1" workingfolder_base="$HOME/tmp" View it on GitLab: https://code.onehippo.org/cms-community/hippo-cms-l10n-tooling/commit/3c52c52257af9cb075ae2d1c8febb72e94fc78a5 --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-cms-l10n-tooling/commit/3c52c52257af9cb075ae2d1c8febb72e94fc78a5 You're receiving this email because of your account on code.onehippo.org. ___ 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 branch feature/CHANNELMGR-1456
Ariel Weinberger pushed new branch feature/CHANNELMGR-1456 at cms-community / hippo-addon-channel-manager --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-addon-channel-manager/tree/feature/CHANNELMGR-1456 You're receiving this email because of your account on code.onehippo.org. ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-essentials][feature/ESSENTIALS-1096] ESSENTIALS-1096 move plugin images from dashboard to plugins themselves
Bert Leunis pushed to branch feature/ESSENTIALS-1096 at cms-community / hippo-essentials Commits: a62f0e3d by Bert Leunis at 2017-09-14T11:32:52+02:00 ESSENTIALS-1096 move plugin images from dashboard to plugins themselves - - - - - 30 changed files: - dashboard/src/main/webapp/images/icons/bean-writer.png → plugins/bean-writer/src/main/resources/META-INF/resources/tool/images/bean-writer-icon.png - plugins/bean-writer/src/main/resources/plugin-descriptor.json - dashboard/src/main/webapp/images/icons/blog.png → plugins/blog/src/main/resources/META-INF/resources/feature/images/blog-plugin-icon.png - dashboard/src/main/webapp/images/screenshots/blog01.png → plugins/blog/src/main/resources/META-INF/resources/feature/images/screenshots/blog01.png - dashboard/src/main/webapp/images/screenshots/blog02.png → plugins/blog/src/main/resources/META-INF/resources/feature/images/screenshots/blog02.png - dashboard/src/main/webapp/images/screenshots/blog03.png → plugins/blog/src/main/resources/META-INF/resources/feature/images/screenshots/blog03.png - dashboard/src/main/webapp/images/screenshots/blog04.png → plugins/blog/src/main/resources/META-INF/resources/feature/images/screenshots/blog04.png - plugins/blog/src/main/resources/plugin-descriptor.json - dashboard/src/main/webapp/images/icons/content-blocks.png → plugins/content-blocks/src/main/resources/META-INF/resources/feature/images/content-blocks-plugin-icon.png - dashboard/src/main/webapp/images/screenshots/contentblocks01.png → plugins/content-blocks/src/main/resources/META-INF/resources/feature/images/screenshots/contentblocks01.png - plugins/content-blocks/src/main/resources/plugin-descriptor.json - dashboard/src/main/webapp/images/icons/documents-wizard.png → plugins/document-wizard/src/main/resources/META-INF/resources/feature/images/documents-wizard-plugin-icon.png - dashboard/src/main/webapp/images/screenshots/documentwizard01.png → plugins/document-wizard/src/main/resources/META-INF/resources/feature/images/screenshots/documentwizard01.png - dashboard/src/main/webapp/images/screenshots/documentwizard02.png → plugins/document-wizard/src/main/resources/META-INF/resources/feature/images/screenshots/documentwizard02.png - plugins/document-wizard/src/main/resources/plugin-descriptor.json - dashboard/src/main/webapp/images/icons/events.png → plugins/events/src/main/resources/META-INF/resources/feature/images/events-plugin-icon.png - dashboard/src/main/webapp/images/screenshots/events01.png → plugins/events/src/main/resources/META-INF/resources/feature/images/screenshots/events01.png - dashboard/src/main/webapp/images/screenshots/events02.png → plugins/events/src/main/resources/META-INF/resources/feature/images/screenshots/events02.png - dashboard/src/main/webapp/images/screenshots/events03.png → plugins/events/src/main/resources/META-INF/resources/feature/images/screenshots/events03.png - plugins/events/src/main/resources/plugin-descriptor.json - dashboard/src/main/webapp/images/icons/faq.png → plugins/faq/src/main/resources/META-INF/resources/feature/images/faq-plugin-icon.png - dashboard/src/main/webapp/images/screenshots/faq01.png → plugins/faq/src/main/resources/META-INF/resources/feature/images/screenshots/faq01.png - dashboard/src/main/webapp/images/screenshots/faq02.png → plugins/faq/src/main/resources/META-INF/resources/feature/images/screenshots/faq02.png - dashboard/src/main/webapp/images/screenshots/faq03.png → plugins/faq/src/main/resources/META-INF/resources/feature/images/screenshots/faq03.png - dashboard/src/main/webapp/images/screenshots/faq04.png → plugins/faq/src/main/resources/META-INF/resources/feature/images/screenshots/faq04.png - plugins/faq/src/main/resources/plugin-descriptor.json - dashboard/src/main/webapp/images/icons/gallery-manager.png → plugins/gallery-manager/src/main/resources/META-INF/resources/tool/images/gallery-manager-icon.png - plugins/gallery-manager/src/main/resources/plugin-descriptor.json - dashboard/src/main/webapp/images/icons/googlemaps.png → plugins/google-maps/src/main/resources/META-INF/resources/feature/images/googlemaps-plugin-icon.png - dashboard/src/main/webapp/images/screenshots/googlemaps01.png → plugins/google-maps/src/main/resources/META-INF/resources/feature/images/screenshots/googlemaps01.png The diff was not included because it is too large. View it on GitLab: https://code.onehippo.org/cms-community/hippo-essentials/commit/a62f0e3df4b4aedfa00a2cf76365a6390670bc0c --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-essentials/commit/a62f0e3df4b4aedfa00a2cf76365a6390670bc0c You're receiving this email because of your account on code.onehippo.org. ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms-l10n-tooling] Deleted branch feature/CMS-10902
Tobias Jeger deleted branch feature/CMS-10902 at cms-community / hippo-cms-l10n-tooling --- You're receiving this email because of your account on code.onehippo.org. ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
