[HippoCMS-scm] [Git][cms-community/hippo-essentials][master] ESSENTIALS-1106 Fix regression
Tobias Jeger pushed to branch master at cms-community / hippo-essentials
Commits:
448b35d0 by Tobias Jeger at 2018-01-16T23:23:47+01:00
ESSENTIALS-1106 Fix regression
- - - - -
1 changed file:
-
plugins/related-documents/src/main/resources/META-INF/resources/feature/relatedDocumentsPlugin/relatedDocumentsPlugin.html
Changes:
=
plugins/related-documents/src/main/resources/META-INF/resources/feature/relatedDocumentsPlugin/relatedDocumentsPlugin.html
=
---
a/plugins/related-documents/src/main/resources/META-INF/resources/feature/relatedDocumentsPlugin/relatedDocumentsPlugin.html
+++
b/plugins/related-documents/src/main/resources/META-INF/resources/feature/relatedDocumentsPlugin/relatedDocumentsPlugin.html
@@ -47,7 +47,7 @@
end-point="{{endpoint}}"/>
-
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-essentials/commit/448b35d0cf79fa2a5908a60d9c54a7417d15f8bd
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-essentials/commit/448b35d0cf79fa2a5908a60d9c54a7417d15f8bd
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-jackrabbit][2.6] JCR-4177: move Mockito version to parent pom (ported to 2.6)
GitLab Mirror pushed to branch 2.6 at cms-community / hippo-jackrabbit Commits: 13d9dbe5 by Julian Reschke at 2018-01-16T20:45:49+00:00 JCR-4177: move Mockito version to parent pom (ported to 2.6) git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/branches/2.6@1821312 13f79535-47bb-0310-9956-ffa450edef68 - - - - - 2 changed files: - jackrabbit-core/pom.xml - jackrabbit-parent/pom.xml Changes: = jackrabbit-core/pom.xml = --- a/jackrabbit-core/pom.xml +++ b/jackrabbit-core/pom.xml @@ -329,6 +329,11 @@ org.apache.jackrabbit.core.ReplacePropertyWhileOthersReadTest 1.3.149 test + + org.mockito + mockito-core + test + = jackrabbit-parent/pom.xml = --- a/jackrabbit-parent/pom.xml +++ b/jackrabbit-parent/pom.xml @@ -497,6 +497,11 @@ junit 4.12 + +org.mockito +mockito-core +1.10.19 + View it on GitLab: https://code.onehippo.org/cms-community/hippo-jackrabbit/commit/13d9dbe51fad2654679ffbff40257058c60b7278 --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-jackrabbit/commit/13d9dbe51fad2654679ffbff40257058c60b7278 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-jackrabbit][2.6] JCR-4165: jackrabbit-server doesn't handle content-codings properly (ported to 2.6)
GitLab Mirror pushed to branch 2.6 at cms-community / hippo-jackrabbit
Commits:
6970e263 by Julian Reschke at 2018-01-16T19:21:52+00:00
JCR-4165: jackrabbit-server doesnt handle content-codings properly (ported
to 2.6)
Reject all requests with non-empty Content-Encoding header fields with status
415.
git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/branches/2.6@1821292
13f79535-47bb-0310-9956-ffa450edef68
- - - - -
1 changed file:
-
jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/server/AbstractWebdavServlet.java
Changes:
=
jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/server/AbstractWebdavServlet.java
=
---
a/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/server/AbstractWebdavServlet.java
+++
b/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/server/AbstractWebdavServlet.java
@@ -88,6 +88,8 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Enumeration;
import java.util.List;
/**
@@ -282,6 +284,17 @@ abstract public class AbstractWebdavServlet extends
HttpServlet implements DavCo
return;
}
+// JCR-4165: reject any content-coding in request until we can
+// support it (see JCR-4166)
+List ces = getContentCodings(request);
+if (!ces.isEmpty()) {
+
webdavResponse.setStatus(HttpServletResponse.SC_UNSUPPORTED_MEDIA_TYPE);
+webdavResponse.setHeader("Accept-Encoding", "identity");
+webdavResponse.setContentType("text/plain; charset=UTF-8");
+webdavResponse.getWriter().println("Content-Encodings not
supported, but received: " + ces);
+webdavResponse.getWriter().flush();
+}
+
// check matching if=header for lock-token relevant operations
DavResource resource =
getResourceFactory().createResource(webdavRequest.getRequestLocator(),
webdavRequest, webdavResponse);
if (!isPreconditionValid(webdavRequest, resource)) {
@@ -1389,4 +1402,21 @@ abstract public class AbstractWebdavServlet extends
HttpServlet implements DavCo
protected OutputContext getOutputContext(DavServletResponse response,
OutputStream out) {
return new OutputContextImpl(response, out);
}
+
+private List getContentCodings(HttpServletRequest request) {
+List result = Collections.emptyList();
+for (@SuppressWarnings("unchecked")
+Enumeration ceh = request.getHeaders("Content-Encoding");
ceh.hasMoreElements();) {
+for (String h : ceh.nextElement().split(",")) {
+if (!h.trim().isEmpty()) {
+if (result.isEmpty()) {
+result = new ArrayList();
+}
+result.add(h.trim());
+}
+}
+}
+
+return result;
+}
}
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-jackrabbit/commit/6970e263cb7655252cab35d9e9b86c74833153f5
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-jackrabbit/commit/6970e263cb7655252cab35d9e9b86c74833153f5
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-jackrabbit][2.6] JCR-4145: upgrade clirr plugin to 2.8 (ported to 2.6)
GitLab Mirror pushed to branch 2.6 at cms-community / hippo-jackrabbit Commits: 5beda7b7 by Julian Reschke at 2018-01-16T17:55:32+00:00 JCR-4145: upgrade clirr plugin to 2.8 (ported to 2.6) git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/branches/2.6@1821279 13f79535-47bb-0310-9956-ffa450edef68 - - - - - 1 changed file: - jackrabbit-parent/pom.xml Changes: = jackrabbit-parent/pom.xml = --- a/jackrabbit-parent/pom.xml +++ b/jackrabbit-parent/pom.xml @@ -271,6 +271,11 @@ cobertura-maven-plugin 2.5.1 + + org.codehaus.mojo + clirr-maven-plugin + 2.8 + View it on GitLab: https://code.onehippo.org/cms-community/hippo-jackrabbit/commit/5beda7b7ce13a92b01a550f658d55bdee44a4f1b --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-jackrabbit/commit/5beda7b7ce13a92b01a550f658d55bdee44a4f1b 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-jackrabbit][2.6] JCR-4079: incorrect PROPPATCH response error handling (ported to 2.6)
GitLab Mirror pushed to branch 2.6 at cms-community / hippo-jackrabbit
Commits:
d966bd91 by Julian Reschke at 2018-01-16T17:07:41+00:00
JCR-4079: incorrect PROPPATCH response error handling (ported to 2.6)
git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/branches/2.6@1821270
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
@@ -1878,8 +1878,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
@@ -171,33 +171,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-addon-channel-manager][feature/CHANNELMGR-1660] CHANNELMGR-1660 Remove unused translation for confirming editor switch
Mathijs den Burger pushed to branch feature/CHANNELMGR-1660 at cms-community /
hippo-addon-channel-manager
Commits:
b3d05bcd by Mathijs den Burger at 2018-01-16T16:33:00+01:00
CHANNELMGR-1660 Remove unused translation for confirming editor switch
When auto-draft was implemented the confirmation for switching to the
content editor was removed.
- - - - -
1 changed file:
- frontend-ng/src/i18n/en.json
Changes:
=
frontend-ng/src/i18n/en.json
=
--- a/frontend-ng/src/i18n/en.json
+++ b/frontend-ng/src/i18n/en.json
@@ -125,7 +125,6 @@
"SAVE_CHANGES_ON_BLUR_MESSAGE": "'{{documentName}}' has unsaved changes. Do
you want to save or discard these changes before opening a new document?",
"SAVE_CHANGES_ON_CLOSE_CHANNEL": "'{{documentName}}' has unsaved changes. Do
you want to save or discard these changes before closing the channel?",
"SAVE_CHANGES_ON_PUBLISH_MESSAGE": "'{{documentName}}' has unsaved changes.
Do you want to save or discard these changes before publishing?",
- "SAVE_CHANGES_ON_SWITCH_TO_CONTENT_EDITOR_MESSAGE": "'{{documentName}}' has
unsaved changes. Do you want to save or discard these changes before switching
to the content editor?",
"SHOW_COMPONENTS": "Show components",
"SHOW_CONTENT": "Show content",
"SUBPAGE_CHANGEMANAGEMENT_SUFFIX_YOU": " (you)",
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/b3d05bcd3ebb79b6605f9711192b80b07f7bd2d3
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/b3d05bcd3ebb79b6605f9711192b80b07f7bd2d3
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 bugfix/CHANNELMGR-1678
Bert Leunis pushed new branch bugfix/CHANNELMGR-1678 at cms-community / hippo-addon-channel-manager --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-addon-channel-manager/tree/bugfix/CHANNELMGR-1678 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-jackrabbit][2.6] JCR-4142: update junit dependency to 4.12 (ported to 2.6)
GitLab Mirror pushed to branch 2.6 at cms-community / hippo-jackrabbit Commits: 54736dae by Julian Reschke at 2018-01-16T15:37:19+00:00 JCR-4142: update junit dependency to 4.12 (ported to 2.6) git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/branches/2.6@1821257 13f79535-47bb-0310-9956-ffa450edef68 - - - - - 1 changed file: - jackrabbit-parent/pom.xml Changes: = jackrabbit-parent/pom.xml = --- a/jackrabbit-parent/pom.xml +++ b/jackrabbit-parent/pom.xml @@ -490,7 +490,7 @@ junit junit -4.10 +4.12 View it on GitLab: https://code.onehippo.org/cms-community/hippo-jackrabbit/commit/54736dae9c4652d954a92b35d8fad6d818899f55 --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-jackrabbit/commit/54736dae9c4652d954a92b35d8fad6d818899f55 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-project-archetype][release/12.1] ARCHE-568 Update description of repository-data/development module in README
Peter Centgraf pushed to branch release/12.1 at cms-community / hippo-project-archetype Commits: 56c7ec54 by Peter Centgraf at 2018-01-16T16:27:49+01:00 ARCHE-568 Update description of repository-data/development module in README (cherry picked from commit 3266575bd355e3ff28dfebf3f32f905e41f298f9) - - - - - 1 changed file: - src/main/resources/archetype-resources/README.txt Changes: = src/main/resources/archetype-resources/README.txt = --- a/src/main/resources/archetype-resources/README.txt +++ b/src/main/resources/archetype-resources/README.txt @@ -37,7 +37,8 @@ shared libraries. The 'dist-with-development-data' profile will produce a distribution-with-development-data tarball, also containing the repository-data-development jar in the shared/lib directory. This kind of distribution is meant to be used for deployments to development environments, for instance local deployments or deployments to a continuous integration (CI) -system. +system. (Initially, this module contains only "author" and "editor" example users for use in testing. Other data must be +placed in this module explicitly by developers, for demo or testing purposes, etc.) See also src/main/assembly/*.xml if you need to customize the distributions. View it on GitLab: https://code.onehippo.org/cms-community/hippo-project-archetype/commit/56c7ec5471d6edf0b88bc694596b451c7daf2d58 --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-project-archetype/commit/56c7ec5471d6edf0b88bc694596b451c7daf2d58 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-project-archetype][master] ARCHE-568 Update description of repository-data/development module in README
Peter Centgraf pushed to branch master at cms-community / hippo-project-archetype Commits: 3266575b by Peter Centgraf at 2018-01-10T12:49:21+01:00 ARCHE-568 Update description of repository-data/development module in README - - - - - 1 changed file: - src/main/resources/archetype-resources/README.txt Changes: = src/main/resources/archetype-resources/README.txt = --- a/src/main/resources/archetype-resources/README.txt +++ b/src/main/resources/archetype-resources/README.txt @@ -37,7 +37,8 @@ shared libraries. The 'dist-with-development-data' profile will produce a distribution-with-development-data tarball, also containing the repository-data-development jar in the shared/lib directory. This kind of distribution is meant to be used for deployments to development environments, for instance local deployments or deployments to a continuous integration (CI) -system. +system. (Initially, this module contains only "author" and "editor" example users for use in testing. Other data must be +placed in this module explicitly by developers, for demo or testing purposes, etc.) See also src/main/assembly/*.xml if you need to customize the distributions. View it on GitLab: https://code.onehippo.org/cms-community/hippo-project-archetype/commit/3266575bd355e3ff28dfebf3f32f905e41f298f9 --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-project-archetype/commit/3266575bd355e3ff28dfebf3f32f905e41f298f9 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/projectdocs] REPO-1907 Get action from args when method is triggerAction
Michiel Eggermont pushed to branch feature/projectdocs at cms-community /
hippo-repository
Commits:
8045f48c by Michiel Eggermont at 2018-01-16T15:55:34+01:00
REPO-1907 Get action from args when method is triggerAction
We introduced DocumentWorkflow#triggerAction() and implemented it in the
DocumentWorkflowImpl.As a consequence when this new method is used the
WorkflowInvocationHandler invokes the triggerAction method while the
actual action is contained in the args array. After invocation of the
method an event is published. The published event does however not
contain the action that was actually performed, but only the method.
I fixed this by explicity checking the method name for triggerAction
and then finding the corresponding Action in the args. If an action
exists it will be set on the event.
- - - - -
1 changed file:
- engine/src/main/java/org/hippoecm/repository/impl/WorkflowLogger.java
Changes:
=
engine/src/main/java/org/hippoecm/repository/impl/WorkflowLogger.java
=
--- a/engine/src/main/java/org/hippoecm/repository/impl/WorkflowLogger.java
+++ b/engine/src/main/java/org/hippoecm/repository/impl/WorkflowLogger.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2012-2014 Hippo B.V. (http://www.onehippo.com)
+ * Copyright 2012-2018 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.
@@ -16,12 +16,15 @@
package org.hippoecm.repository.impl;
import java.util.Arrays;
+import java.util.Optional;
+import java.util.stream.Stream;
import javax.jcr.ItemNotFoundException;
import javax.jcr.Node;
import javax.jcr.RepositoryException;
import javax.jcr.Session;
+import org.hippoecm.repository.api.ActionAware;
import org.hippoecm.repository.api.Document;
import org.hippoecm.repository.api.HippoNodeType;
import org.hippoecm.repository.api.HippoWorkspace;
@@ -66,11 +69,24 @@ public class WorkflowLogger {
if (arguments != null) {
event.arguments(Arrays.asList(arguments));
}
+getAction(methodName, args)
+.ifPresent(event::action);
eventBus.post(event);
}
}
+private Optional getAction(final String methodName, final Object[]
args) {
+if ("triggerAction".equals(methodName) && args != null && args.length
> 0) {
+return Stream.of(args)
+.filter(ActionAware.class::isInstance)
+.map(ActionAware.class::cast)
+.map(ActionAware::getAction)
+.findFirst();
+}
+return Optional.empty();
+}
+
private Boolean isSystemUser(String userName) {
try {
final SecurityService securityService = ((HippoWorkspace)
session.getWorkspace()).getSecurityService();
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-repository/commit/8045f48c4c8500be74824ac4c776b11e150d10a5
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-repository/commit/8045f48c4c8500be74824ac4c776b11e150d10a5
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-1674
Bert Leunis pushed new branch feature/CHANNELMGR-1674 at cms-community / hippo-addon-channel-manager --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-addon-channel-manager/tree/feature/CHANNELMGR-1674 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-1676
Bert Leunis deleted branch feature/CHANNELMGR-1676 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-jackrabbit][trunk] JCR-4247: Update commons-io dependency
GitLab Mirror pushed to branch trunk at cms-community / hippo-jackrabbit Commits: f289903e by Julian Reschke at 2018-01-16T14:02:29+00:00 JCR-4247: Update commons-io dependency git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/trunk@1821247 13f79535-47bb-0310-9956-ffa450edef68 - - - - - 1 changed file: - jackrabbit-parent/pom.xml Changes: = jackrabbit-parent/pom.xml = --- a/jackrabbit-parent/pom.xml +++ b/jackrabbit-parent/pom.xml @@ -431,7 +431,7 @@ commons-io commons-io -2.5 +2.6 javax.transaction View it on GitLab: https://code.onehippo.org/cms-community/hippo-jackrabbit/commit/f289903e436bcced59e81dd1fa15a41b960b275e --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-jackrabbit/commit/f289903e436bcced59e81dd1fa15a41b960b275e 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-1676] CHANNELMGR-1676 more license header fixes
Bert Leunis pushed to branch feature/CHANNELMGR-1676 at cms-community / hippo-addon-channel-manager Commits: 3e5fad64 by Bert Leunis at 2018-01-16T14:24:16+01:00 CHANNELMGR-1676 more license header fixes - - - - - 3 changed files: - frontend-ng/src/app/channel/channel.controller.spec.js - frontend-ng/src/app/channel/overlayToggle/overlayToggle.component.js - frontend-ng/src/app/channel/overlayToggle/overlayToggle.html Changes: = frontend-ng/src/app/channel/channel.controller.spec.js = --- a/frontend-ng/src/app/channel/channel.controller.spec.js +++ b/frontend-ng/src/app/channel/channel.controller.spec.js @@ -1,5 +1,5 @@ /* - * Copyright 2015-2017 Hippo B.V. (http://www.onehippo.com) + * Copyright 2015-2018 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. = frontend-ng/src/app/channel/overlayToggle/overlayToggle.component.js = --- a/frontend-ng/src/app/channel/overlayToggle/overlayToggle.component.js +++ b/frontend-ng/src/app/channel/overlayToggle/overlayToggle.component.js @@ -1,5 +1,5 @@ /* - * Copyright 2017 Hippo B.V. (http://www.onehippo.com) + * Copyright 2017-2018 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. = frontend-ng/src/app/channel/overlayToggle/overlayToggle.html = --- a/frontend-ng/src/app/channel/overlayToggle/overlayToggle.html +++ b/frontend-ng/src/app/channel/overlayToggle/overlayToggle.html @@ -1,5 +1,5 @@
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][feature/CHANNELMGR-1660] CHANNELMGR-1660 Remove leftover debug statement
Mathijs den Burger pushed to branch feature/CHANNELMGR-1660 at cms-community /
hippo-addon-channel-manager
Commits:
b79bdb8e by Mathijs den Burger at 2018-01-16T14:23:37+01:00
CHANNELMGR-1660 Remove leftover debug statement
- - - - -
1 changed file:
-
frontend-ng/src/app/channel/sidePanels/rightSidePanel/editContent/editContentMain.controller.js
Changes:
=
frontend-ng/src/app/channel/sidePanels/rightSidePanel/editContent/editContentMain.controller.js
=
---
a/frontend-ng/src/app/channel/sidePanels/rightSidePanel/editContent/editContentMain.controller.js
+++
b/frontend-ng/src/app/channel/sidePanels/rightSidePanel/editContent/editContentMain.controller.js
@@ -28,7 +28,6 @@ class EditContentMainCtrl {
}
switchEditor() {
-console.log('SWITCH!');
this.CmsService.publish('open-content',
this.ContentEditor.getDocumentId(), 'edit');
this.ContentEditor.close();
this.EditContentService.stopEditing();
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/b79bdb8eeaac16ed0a9eacb87510746feb6d97ca
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/b79bdb8eeaac16ed0a9eacb87510746feb6d97ca
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] Deleted branch bugfix/REPO-1912
Jeroen Hoffman deleted branch bugfix/REPO-1912 at cms-community / hippo-repository --- 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][release/4.2] REPO-1927 [Back port to 11.2] SecurityManager doesn't sanitize userId in case of…
Jeroen Hoffman pushed to branch release/4.2 at cms-community / hippo-repository
Commits:
981a89fa by Jeroen Hoffman at 2018-01-16T12:36:40+01:00
REPO-1927 [Back port to 11.2] SecurityManager doesnt sanitize userId in
case of external providers to get memberships
- sanitize user id
- - - - -
1 changed file:
- engine/src/main/java/org/hippoecm/repository/security/SecurityManager.java
Changes:
=
engine/src/main/java/org/hippoecm/repository/security/SecurityManager.java
=
--- a/engine/src/main/java/org/hippoecm/repository/security/SecurityManager.java
+++ b/engine/src/main/java/org/hippoecm/repository/security/SecurityManager.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2008-2013 Hippo B.V. (http://www.onehippo.com)
+ * Copyright 2008-2018 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.
@@ -362,10 +362,11 @@ public class SecurityManager implements
HippoSecurityManager {
*/
private Set getMemberships(String rawUserId, String providerId) {
try {
+final String sanitizedUserId = sanitizeUserId(rawUserId,
providerId);
if (providers.containsKey(providerId)) {
-return
providers.get(providerId).getGroupManager().getMembershipIds(rawUserId);
+return
providers.get(providerId).getGroupManager().getMembershipIds(sanitizedUserId);
} else {
-return
providers.get(INTERNAL_PROVIDER).getGroupManager().getMembershipIds(sanitizeUserId(rawUserId,
providerId));
+return
providers.get(INTERNAL_PROVIDER).getGroupManager().getMembershipIds(sanitizedUserId);
}
} catch (RepositoryException e) {
log.warn("Unable to get memberships for userId: " + rawUserId, e);
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-repository/commit/981a89fad7a30c81d4acba8f3ac4c19f260c97c1
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-repository/commit/981a89fad7a30c81d4acba8f3ac4c19f260c97c1
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][release/5.0] REPO-1926 [Back port to 12.0] SecurityManager doesn't sanitize userId in case of…
Jeroen Hoffman pushed to branch release/5.0 at cms-community / hippo-repository
Commits:
4cdd86d4 by Jeroen Hoffman at 2018-01-16T12:34:00+01:00
REPO-1926 [Back port to 12.0] SecurityManager doesnt sanitize userId in
case of external providers to get memberships
- sanitize user id
- - - - -
1 changed file:
- engine/src/main/java/org/hippoecm/repository/security/SecurityManager.java
Changes:
=
engine/src/main/java/org/hippoecm/repository/security/SecurityManager.java
=
--- a/engine/src/main/java/org/hippoecm/repository/security/SecurityManager.java
+++ b/engine/src/main/java/org/hippoecm/repository/security/SecurityManager.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2008-2013 Hippo B.V. (http://www.onehippo.com)
+ * Copyright 2008-2018 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.
@@ -362,10 +362,11 @@ public class SecurityManager implements
HippoSecurityManager {
*/
private Set getMemberships(String rawUserId, String providerId) {
try {
+final String sanitizedUserId = sanitizeUserId(rawUserId,
providerId);
if (providers.containsKey(providerId)) {
-return
providers.get(providerId).getGroupManager().getMembershipIds(rawUserId);
+return
providers.get(providerId).getGroupManager().getMembershipIds(sanitizedUserId);
} else {
-return
providers.get(INTERNAL_PROVIDER).getGroupManager().getMembershipIds(sanitizeUserId(rawUserId,
providerId));
+return
providers.get(INTERNAL_PROVIDER).getGroupManager().getMembershipIds(sanitizedUserId);
}
} catch (RepositoryException e) {
log.warn("Unable to get memberships for userId: " + rawUserId, e);
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-repository/commit/4cdd86d4e663a94e745c2459c7932c081f90348b
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-repository/commit/4cdd86d4e663a94e745c2459c7932c081f90348b
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][release/5.1] REPO-1925 [Back port to 12.1] SecurityManager doesn't sanitize userId in case of…
Jeroen Hoffman pushed to branch release/5.1 at cms-community / hippo-repository
Commits:
b3560a0b by Jeroen Hoffman at 2018-01-16T12:29:20+01:00
REPO-1925 [Back port to 12.1] SecurityManager doesnt sanitize userId in
case of external providers to get memberships
- sanitize user id
- - - - -
1 changed file:
- engine/src/main/java/org/hippoecm/repository/security/SecurityManager.java
Changes:
=
engine/src/main/java/org/hippoecm/repository/security/SecurityManager.java
=
--- a/engine/src/main/java/org/hippoecm/repository/security/SecurityManager.java
+++ b/engine/src/main/java/org/hippoecm/repository/security/SecurityManager.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2008-2013 Hippo B.V. (http://www.onehippo.com)
+ * Copyright 2008-2018 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.
@@ -362,10 +362,11 @@ public class SecurityManager implements
HippoSecurityManager {
*/
private Set getMemberships(String rawUserId, String providerId) {
try {
+final String sanitizedUserId = sanitizeUserId(rawUserId,
providerId);
if (providers.containsKey(providerId)) {
-return
providers.get(providerId).getGroupManager().getMembershipIds(rawUserId);
+return
providers.get(providerId).getGroupManager().getMembershipIds(sanitizedUserId);
} else {
-return
providers.get(INTERNAL_PROVIDER).getGroupManager().getMembershipIds(sanitizeUserId(rawUserId,
providerId));
+return
providers.get(INTERNAL_PROVIDER).getGroupManager().getMembershipIds(sanitizedUserId);
}
} catch (RepositoryException e) {
log.warn("Unable to get memberships for userId: " + rawUserId, e);
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-repository/commit/b3560a0be1f02acb21cca463055f62e2dfeaa751
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-repository/commit/b3560a0be1f02acb21cca463055f62e2dfeaa751
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][master] 3 commits: REPO-1912 SecurityManager doesn't sanitize userId in case of external providers to get memberships
Jeroen Hoffman pushed to branch master at cms-community / hippo-repository
Commits:
df32033d by Marijan Milicevic at 2018-01-11T11:16:19+01:00
REPO-1912 SecurityManager doesnt sanitize userId in case of external
providers to get memberships
- sanitize user id
- - - - -
48a7f040 by Jeroen Hoffman at 2018-01-16T12:05:31+01:00
REPO-1912 Merge branch master into bugfix/REPO-1912
- - - - -
260a816a by Jeroen Hoffman at 2018-01-16T12:16:09+01:00
REPO-1912 Reintegrate branch bugfix/REPO-1912 into master
- - - - -
1 changed file:
- engine/src/main/java/org/hippoecm/repository/security/SecurityManager.java
Changes:
=
engine/src/main/java/org/hippoecm/repository/security/SecurityManager.java
=
--- a/engine/src/main/java/org/hippoecm/repository/security/SecurityManager.java
+++ b/engine/src/main/java/org/hippoecm/repository/security/SecurityManager.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2008-2013 Hippo B.V. (http://www.onehippo.com)
+ * Copyright 2008-2018 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.
@@ -362,10 +362,11 @@ public class SecurityManager implements
HippoSecurityManager {
*/
private Set getMemberships(String rawUserId, String providerId) {
try {
+final String sanitizedUserId = sanitizeUserId(rawUserId,
providerId);
if (providers.containsKey(providerId)) {
-return
providers.get(providerId).getGroupManager().getMembershipIds(rawUserId);
+return
providers.get(providerId).getGroupManager().getMembershipIds(sanitizedUserId);
} else {
-return
providers.get(INTERNAL_PROVIDER).getGroupManager().getMembershipIds(sanitizeUserId(rawUserId,
providerId));
+return
providers.get(INTERNAL_PROVIDER).getGroupManager().getMembershipIds(sanitizedUserId);
}
} catch (RepositoryException e) {
log.warn("Unable to get memberships for userId: " + rawUserId, e);
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-repository/compare/2d82cbed0bb9b923d38c2e3538e069fc3959aa14...260a816ae0c1b75209c5719546de2cfd2b51781b
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-repository/compare/2d82cbed0bb9b923d38c2e3538e069fc3959aa14...260a816ae0c1b75209c5719546de2cfd2b51781b
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][release/12.1] CMS-16 bump cms version
Ate Douma pushed to branch release/12.1 at cms-community / hippo-cms-release Commits: c37b5d73 by Ate Douma at 2018-01-16T12:14:39+01:00 CMS-16 bump cms version - - - - - 1 changed file: - pom.xml Changes: = pom.xml = --- a/pom.xml +++ b/pom.xml @@ -48,7 +48,7 @@ 4.1.0 4.7.1-h12.1.0 4.1.0 -5.1.0 +5.1.1-SNAPSHOT 4.1.0 4.1.0 5.1.1-SNAPSHOT View it on GitLab: https://code.onehippo.org/cms-community/hippo-cms-release/commit/c37b5d737f3f2cc3fd8238b10f6cf46576c0f009 --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-cms-release/commit/c37b5d737f3f2cc3fd8238b10f6cf46576c0f009 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 feature/CMS-10015
Jeroen Hoffman deleted branch feature/CMS-10015 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] 9 commits: CMS-10015 made update editor left column resizable
Jeroen Hoffman pushed to branch master at cms-community / hippo-cms
Commits:
cccd9a62 by Jasper Floor at 2017-09-22T14:33:11+02:00
CMS-10015 made update editor left column resizable
- - - - -
47a7417c by Jasper Floor at 2017-10-04T14:41:25+02:00
CMS-10015 Merge master changes in feature/CMS-10015
- - - - -
363894bd by Bert Leunis at 2017-10-09T15:18:20+02:00
CMS-10015 make the whole left column resizable
- - - - -
fd0a962f by Bert Leunis at 2017-10-16T11:41:42+02:00
CMS-10015 no height calc necessary for tree; no grow on button
- - - - -
4604053e by Bert Leunis at 2017-11-21T10:48:40+01:00
CMS-10015 Merge master changes in feature/CMS-10015
- - - - -
494da7f5 by Bert Leunis at 2017-11-21T12:00:25+01:00
CMS-10015 Hide vertical scroll bar in Edge
- - - - -
30c9e942 by Jeroen Hoffman at 2018-01-09T13:37:27+01:00
CMS-10015 Merge branch master into feature/CMS-10015
- - - - -
d6d55253 by Jeroen Hoffman at 2018-01-16T10:52:54+01:00
CMS-10015 Merge branch master into feature/CMS-10015
- - - - -
0dc9102c by Jeroen Hoffman at 2018-01-16T10:52:57+01:00
CMS-10015 Reintegrate branch feature/CMS-10015 into master
- - - - -
2 changed files:
- api/src/main/styling/styles/_admin-perspective.scss
-
perspectives/src/main/java/org/hippoecm/frontend/plugins/cms/admin/updater/UpdaterPanel.html
Changes:
=
api/src/main/styling/styles/_admin-perspective.scss
=
--- a/api/src/main/styling/styles/_admin-perspective.scss
+++ b/api/src/main/styling/styles/_admin-perspective.scss
@@ -270,33 +270,50 @@
height: 100%;
width: 100%;
display: flex;
- flex-flow: column;
+ flex-flow: row;
overflow: hidden;
> * {
display: flex;
+flex-flow: column;
}
.updater-left {
-min-width: 200px;
-max-width: 200px;
border-right: 1px solid $dark-gray;
+overflow: auto;
+resize: horizontal;
+width: 200px;
+
+.updater-tree {
+ border-top: 1px solid $dark-gray;
+
+ padding: 4px 0 0 0;
+ flex: 0;
+
+ > div.hippo-tree > div.wicket-tree {
+.row {
+ padding-left: 5px;
+}
+.row-selected {
+ background: $primary;
+}
+ }
+}
}
- .updater-editor-top > .updater-left {
+ .updater-left-top {
display: flex;
justify-content: center;
align-items: center;
-
-border-bottom: 1px solid $dark-gray;
+flex: 0 0 auto;
> input {
flex: 1 1 auto;
- margin: 0 8px;
+ margin: 6px 8px;
}
}
- .updater-editor-top-right {
+ .updater-right-top {
padding: 8px;
h2 {
@@ -304,25 +321,12 @@
}
}
- > .updater-editor-main {
-height: calc(100% - 32px);
-
-.updater-tree {
- overflow: auto;
- border-right: 1px solid $dark-gray;
- padding: 4px 0 0 0;
-
- > div.hippo-tree > div.wicket-tree {
-.row {
- padding-left: 5px;
-}
-.row-selected {
- background: $primary;
-}
- }
-}
-
+ > .updater-right {
+width: 100%;
+
.updater-details {
+ height: calc(100% - 32px);
+
display: flex;
overflow-y: auto;
=
perspectives/src/main/java/org/hippoecm/frontend/plugins/cms/admin/updater/UpdaterPanel.html
=
---
a/perspectives/src/main/java/org/hippoecm/frontend/plugins/cms/admin/updater/UpdaterPanel.html
+++
b/perspectives/src/main/java/org/hippoecm/frontend/plugins/cms/admin/updater/UpdaterPanel.html
@@ -1,7 +1,7 @@
[HippoCMS-scm] [Git][cms-community/hippo-cms][feature/CMS-10015] 32 commits: CMS-11002 Fix obvious NPE possibility
Jeroen Hoffman pushed to branch feature/CMS-10015 at cms-community / hippo-cms Commits: f5ae5cf2 by Ard Schrijvers at 2017-11-29T10:18:58+01:00 CMS-11002 Fix obvious NPE possibility - - - - - 7110516f by Arent-Jan Banck at 2017-11-29T12:18:58+01:00 CMS-11005 Use CKEDitor 4.7.1-h12.1.0 - - - - - 55debee2 by Ate Douma at 2017-11-29T15:43:14+01:00 CMS-10813 Fix non-serializable problem with ConfigurationService instance - - - - - f85c6dab by Arent-Jan Banck at 2017-12-07T23:29:09+01:00 CMS-11019 Remove println statement and remove xerces from the performance test - - - - - 22da7e3b by Arent-Jan Banck at 2017-12-07T23:34:15+01:00 CMS-11019 Remove testPerformance. It was never executed as the html was invalid and the dom parser throws an exception that is silently swallowed, test still passed successful. Even when fixed its not testing anything relevent, only that Dom parsing is slower than directly using a string. - - - - - 9e3db9cb by Bert Leunis at 2017-12-12T13:47:24+01:00 CMS-10864 restyling of search field in users panel - - - - - 99fc343b by Bert Leunis at 2017-12-12T16:09:28+01:00 CMS-10864 toggle icon and search term - - - - - eb207493 by Bert Leunis at 2017-12-14T10:56:22+01:00 CMS-10864 make SubmittingTextField accessible for other plugins - - - - - d29d14bc by Bert Leunis at 2017-12-14T10:56:59+01:00 CMS-10864 search can be done by enter or spy glass - - - - - cd6c5243 by Bert Leunis at 2017-12-14T13:10:32+01:00 CMS-10864 new SearchTermPanel, used in ListGroupsPanel - - - - - 17d9560a by Bert Leunis at 2017-12-14T13:50:53+01:00 CMS-10864 use search term panel in user list and set members panels - - - - - c0d60d53 by Bert Leunis at 2017-12-14T14:21:47+01:00 CMS-10864 remove spacing between table rows in set group members panel - - - - - 62cc9014 by Bert Leunis at 2017-12-14T14:26:19+01:00 CMS-10864 remove obsolete properties - - - - - 573bf679 by Bert Leunis at 2017-12-14T14:50:33+01:00 CMS-10864 improve generics - - - - - efb97fc0 by Bert Leunis at 2017-12-14T16:55:32+01:00 CMS-10862 results for user or group name case insensitive - - - - - bffdd96a by Bert Leunis at 2017-12-15T10:07:59+01:00 CMS-10864 clear search term when moving up in the bread crumb path - - - - - 39154935 by Bert Leunis at 2017-12-15T14:54:52+01:00 CMS-10864 improve userlist sorting - - - - - 3acd248d by Bert Leunis at 2017-12-15T15:05:47+01:00 CMS-10864 improve group list sorting - - - - - f62598dc by Bert Leunis at 2017-12-15T15:29:26+01:00 CMS-10864 revert improve group list sorting This reverts commit 3acd248dbe93c9919956b7c74934fce283540599. - - - - - 43deeab2 by Bert Leunis at 2017-12-15T15:31:36+01:00 CMS-10864 revert improve userlist sorting This reverts commit 39154935f323c2b5491cc8740b460e7573c60aed. - - - - - 0872cc50 by Bert Leunis at 2017-12-15T15:40:34+01:00 CMS-10862 improve sorting of user and group list - - - - - 5a6d3890 by Bert Leunis at 2017-12-18T14:14:00+01:00 CMS-10864 use css variable name. use ReadOnlyModel. - - - - - 54a06f1e by Bert Leunis at 2017-12-18T14:17:32+01:00 CMS-10864 Reintegrate feature/CMS-10864 - - - - - 6b2776ad by Bert Leunis at 2017-12-18T15:42:49+01:00 CMS-10862 Merge master changes in feature/CMS-10862 - - - - - efaf23ee by Bert Leunis at 2017-12-22T13:31:51+01:00 CMS-10862 use search builder for content also for users and groups - - - - - 4e227d43 by Bert Leunis at 2017-12-22T16:39:49+01:00 CMS-10862 small improvements after review. move unit tests to correct classes. - - - - - f57b181e by Bert Leunis at 2017-12-22T16:43:18+01:00 CMS-10862 Reintegrate feature/CMS-10862 - - - - - 0dd26c17 by Sergey Shepelevich at 2018-01-12T11:30:16+01:00 CMS-11037 Improvement on validation of svg images - - - - - 7532232a by Sergey Shepelevich at 2018-01-12T11:53:33+01:00 CMS-11037 Improvement of validation message - - - - - 698949d2 by Sergey Shepelevich at 2018-01-12T14:51:45+01:00 CMS-16 License header fix - - - - - 72f67873 by Sergey Shepelevich at 2018-01-15T11:00:03+01:00 CMS-11037 Case insensitive substring search - - - - - 72124a37 by Jeroen Hoffman at 2018-01-15T16:54:16+01:00 CMS-10015 Merge branch master into feature/CMS-10015 - - - - - 30 changed files: - + api/src/main/java/org/hippoecm/frontend/plugins/gallery/model/SvgScriptGalleryException.java - api/src/main/java/org/hippoecm/frontend/plugins/jquery/upload/multiple/JQueryFileUploadDialog.properties - + api/src/main/java/org/hippoecm/frontend/plugins/standards/search/GeneralSearchBuilder.java - api/src/main/java/org/hippoecm/frontend/plugins/standards/search/QueryResultModel.java - api/src/main/java/org/hippoecm/frontend/plugins/standards/search/TextSearchBuilder.java - api/src/main/java/org/hippoecm/frontend/plugins/standards/tabs/TabsPlugin.java - api/src/main/styling/styles/_admin-perspective.scss - brokenlinks/repository/pom.xml - brokenlinks/repository/src/test/java/org/onehippo/cms7/brokenlinks/ParseTextsTest.java -
