[HippoCMS-scm] [Git][cms-community/hippo-cms] Deleted branch feature/CMS-9884
Canh Ngo deleted branch feature/CMS-9884 at cms-community / hippo-cms ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-site-toolkit] Pushed new branch feature/delete-channel-HSTTWO-3774
Canh Ngo pushed new branch feature/delete-channel-HSTTWO-3774 at cms-community / hippo-site-toolkit ___ 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][release/11.0] CMS-10381 Bump hippo-cms-l10n-maven-plugin version to latest
Canh Ngo pushed to branch release/11.0 at cms-community / hippo-cms-translations Commits: fe416ab1 by Canh Ngo at 2016-08-23T10:39:47+02:00 CMS-10381 Bump hippo-cms-l10n-maven-plugin version to latest - - - - - 1 changed file: - pom.xml Changes: = pom.xml = --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ 2016 -1.0.1-SNAPSHOT +1.0.2-SNAPSHOT fr,nl,de,zh,es excel View it on GitLab: https://code.onehippo.org/cms-community/hippo-cms-translations/commit/fe416ab1e5d6415f8f6e31fa80c20ff9a01e26f8 ___ 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/3.2] CHANNELMGR-838 Use latest hippo-theme snapshot version
Canh Ngo pushed to branch release/3.2 at cms-community / hippo-addon-channel-manager Commits: 20dac500 by Canh Ngo at 2016-08-23T09:46:46+02:00 CHANNELMGR-838 Use latest hippo-theme snapshot version - - - - - 1 changed file: - pom.xml Changes: = pom.xml = --- a/pom.xml +++ b/pom.xml @@ -41,7 +41,7 @@ 2.2.0 2.2.0 2.2.0 -2.2.1-SNAPSHOT +2.2.2-SNAPSHOT 2.6 20090211 View it on GitLab: https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/20dac50088229ce05887d42c91486ee7d4fa7164 ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms] Pushed new branch feature/CMS-10397
Canh Ngo pushed new branch feature/CMS-10397 at cms-community / hippo-cms ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-site-toolkit] Pushed new branch feature/delete-channel-HSTTWO-3774
Canh Ngo pushed new branch feature/delete-channel-HSTTWO-3774 at cms-community / hippo-site-toolkit ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-essentials] Deleted branch bugfix/ESSENTIALS-1022
Canh Ngo deleted branch bugfix/ESSENTIALS-1022 at cms-community / hippo-essentials ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-essentials][master] 2 commits: ESSENTIALS-1022 Remove redundant template code
Canh Ngo pushed to branch master at cms-community / hippo-essentials Commits: 8c100362 by Tobias Jeger at 2016-08-17T16:08:52+02:00 ESSENTIALS-1022 Remove redundant template code - - - - - b8193f4a by Canh Ngo at 2016-08-19T16:42:51+02:00 ESSENTIALS-1022 Reintegrated bugfix/ESSENTIALS-1022 - - - - - 2 changed files: - plugins/skeleton-package/src/main/resources/instructions/freemarker/base-top-menu.ftl - plugins/skeleton-package/src/main/resources/instructions/jsp/base-top-menu.jsp Changes: = plugins/skeleton-package/src/main/resources/instructions/freemarker/base-top-menu.ftl = --- a/plugins/skeleton-package/src/main/resources/instructions/freemarker/base-top-menu.ftl +++ b/plugins/skeleton-package/src/main/resources/instructions/freemarker/base-top-menu.ftl @@ -30,9 +30,4 @@ <@hst.cmseditmenu menu=menu/> -<#else> - <#if editMode> - [Menu Component] - Click to edit Menu - \ No newline at end of file = plugins/skeleton-package/src/main/resources/instructions/jsp/base-top-menu.jsp = --- a/plugins/skeleton-package/src/main/resources/instructions/jsp/base-top-menu.jsp +++ b/plugins/skeleton-package/src/main/resources/instructions/jsp/base-top-menu.jsp @@ -40,12 +40,4 @@ - - <%--Placeholder reminding us to configure a valid menu in the component parameters--%> - - - [Menu Component] - Click to edit Menu - - View it on GitLab: https://code.onehippo.org/cms-community/hippo-essentials/compare/5e494b92df5e5ea8a53061c8418b9d56c711b39b...b8193f4a4f1d87523490c25814d1906d62ea0ee0 ___ 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] Deleted branch feature/delete-channel-HSTTWO-3759
Canh Ngo deleted branch feature/delete-channel-HSTTWO-3759 at cms-community / hippo-site-toolkit ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms] Pushed new branch feature/CMS-10326
Canh Ngo pushed new branch feature/CMS-10326 at cms-community / hippo-cms ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-site-toolkit][feature/delete-channel] HSTTWO-3733 Remove extended MockSession class due to no usage
Canh Ngo pushed to branch feature/delete-channel at cms-community /
hippo-site-toolkit
Commits:
789b3da4 by Canh Ngo at 2016-08-17T09:08:05+02:00
HSTTWO-3733 Remove extended MockSession class due to no usage
REPO-1551 implemented MockSession#removeItem() so the extended
class is not necessary
- - - - -
3 changed files:
-
client-modules/page-composer/src/test/java/org/hippoecm/hst/pagecomposer/jaxrs/services/ChannelServiceImplTest.java
- −
client-modules/page-composer/src/test/java/org/hippoecm/hst/pagecomposer/jaxrs/services/ExtendedMockSession.java
-
client-modules/page-composer/src/test/java/org/hippoecm/hst/pagecomposer/jaxrs/services/HstConfigurationServiceImplTest.java
Changes:
=
client-modules/page-composer/src/test/java/org/hippoecm/hst/pagecomposer/jaxrs/services/ChannelServiceImplTest.java
=
---
a/client-modules/page-composer/src/test/java/org/hippoecm/hst/pagecomposer/jaxrs/services/ChannelServiceImplTest.java
+++
b/client-modules/page-composer/src/test/java/org/hippoecm/hst/pagecomposer/jaxrs/services/ChannelServiceImplTest.java
@@ -65,7 +65,7 @@ public class ChannelServiceImplTest {
hstConfigurationService =
EasyMock.createMock(HstConfigurationService.class);
rootNode = MockNode.root();
-session = new ExtendedMockSession(rootNode.getSession());
+session = rootNode.getSession();
hstRoot = rootNode.addNode("hst:hst", "hst:hst");
channelsNode = hstRoot.addNode(HstNodeTypes.NODENAME_HST_CHANNELS,
HstNodeTypes.NODETYPE_HST_CHANNELS);
=
client-modules/page-composer/src/test/java/org/hippoecm/hst/pagecomposer/jaxrs/services/ExtendedMockSession.java
deleted
=
---
a/client-modules/page-composer/src/test/java/org/hippoecm/hst/pagecomposer/jaxrs/services/ExtendedMockSession.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright 2016 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.
- */
-
-// TODO should be removed after fixing REPO-1551.
-
-package org.hippoecm.hst.pagecomposer.jaxrs.services;
-
-import javax.jcr.RepositoryException;
-
-import org.onehippo.repository.mock.MockSession;
-
-import static org.junit.Assert.fail;
-
-//TODO Remove this class when REPO-1551 is closed
-public class ExtendedMockSession extends MockSession {
-public ExtendedMockSession(final MockSession session) {
-super(session.getRootNode());
-}
-
-@Override
-public void removeItem(final String absPath) {
-try {
-getItem(absPath).remove();
-} catch (RepositoryException e) {
-fail("Cannot remove '" + absPath + "': " + e.getMessage());
-}
-}
-}
=
client-modules/page-composer/src/test/java/org/hippoecm/hst/pagecomposer/jaxrs/services/HstConfigurationServiceImplTest.java
=
---
a/client-modules/page-composer/src/test/java/org/hippoecm/hst/pagecomposer/jaxrs/services/HstConfigurationServiceImplTest.java
+++
b/client-modules/page-composer/src/test/java/org/hippoecm/hst/pagecomposer/jaxrs/services/HstConfigurationServiceImplTest.java
@@ -39,7 +39,7 @@ public class HstConfigurationServiceImplTest {
@Before
public void setUp() throws RepositoryException {
final MockNode rootNode = MockNode.root();
-session = new ExtendedMockSession(rootNode.getSession());
+session = rootNode.getSession();
final Node hstRoot = rootNode.addNode("hst:hst", "hst:hst");
configurationsNode =
hstRoot.addNode(HstNodeTypes.NODENAME_HST_CONFIGURATIONS,
HstNodeTypes.NODETYPE_HST_CONFIGURATIONS);
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-site-toolkit/commit/789b3da404309d5ac6143233bdad11c479691bda
___
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/delete-channel] HSTTWO-3733 Simplify code to check if a node has children
Canh Ngo pushed to branch feature/delete-channel at cms-community /
hippo-site-toolkit
Commits:
9a282943 by Canh Ngo at 2016-08-17T09:01:41+02:00
HSTTWO-3733 Simplify code to check if a node has children
REPO-1549 fixed the bug in MockNode#hasNodes, so the code can be
simplified
- - - - -
1 changed file:
-
client-modules/page-composer/src/main/java/org/hippoecm/hst/pagecomposer/jaxrs/services/ChannelServiceImpl.java
Changes:
=
client-modules/page-composer/src/main/java/org/hippoecm/hst/pagecomposer/jaxrs/services/ChannelServiceImpl.java
=
---
a/client-modules/page-composer/src/main/java/org/hippoecm/hst/pagecomposer/jaxrs/services/ChannelServiceImpl.java
+++
b/client-modules/page-composer/src/main/java/org/hippoecm/hst/pagecomposer/jaxrs/services/ChannelServiceImpl.java
@@ -307,8 +307,7 @@ public class ChannelServiceImpl implements ChannelService {
}
// Remove ancestor nodes of type 'hst:virtualhost' if they become leaf
nodes
-// TODO Simplify the code to parentNode.hasNodes() when REPO-1549 is
fixed
-while(!parentNode.getNodes().hasNext() &&
parentNode.isNodeType(HstNodeTypes.NODETYPE_HST_VIRTUALHOST)) {
+while(!parentNode.hasNodes() &&
parentNode.isNodeType(HstNodeTypes.NODETYPE_HST_VIRTUALHOST)) {
removeNode = parentNode;
parentNode = parentNode.getParent();
removeNode.remove();
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-site-toolkit/commit/9a28294370d74f28af6b7d963006250f4fcd161e
___
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] Pushed new branch feature/delete-channel-HSTTWO-3732
Canh Ngo pushed new branch feature/delete-channel-HSTTWO-3732 at cms-community / hippo-site-toolkit ___ 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-1551
Canh Ngo pushed new branch feature/REPO-1551 at cms-community / hippo-repository ___ 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/delete-channel-HSTTWO-3733] HSTTWO-3733 Add TODO comment to ExtendedMockSession
Canh Ngo pushed to branch feature/delete-channel-HSTTWO-3733 at cms-community /
hippo-site-toolkit
Commits:
2f3da5b6 by Canh Ngo at 2016-08-15T15:19:56+02:00
HSTTWO-3733 Add TODO comment to ExtendedMockSession
This class can be removed when the MockSession#removeItem is
implemented in REPO-1551
- - - - -
1 changed file:
-
client-modules/page-composer/src/test/java/org/hippoecm/hst/pagecomposer/jaxrs/services/ExtendedMockSession.java
Changes:
=
client-modules/page-composer/src/test/java/org/hippoecm/hst/pagecomposer/jaxrs/services/ExtendedMockSession.java
=
---
a/client-modules/page-composer/src/test/java/org/hippoecm/hst/pagecomposer/jaxrs/services/ExtendedMockSession.java
+++
b/client-modules/page-composer/src/test/java/org/hippoecm/hst/pagecomposer/jaxrs/services/ExtendedMockSession.java
@@ -24,6 +24,7 @@ import org.onehippo.repository.mock.MockSession;
import static org.junit.Assert.fail;
+//TODO Remove this class when REPO-1551 is closed
public class ExtendedMockSession extends MockSession {
public ExtendedMockSession(final MockSession session) {
super(session.getRootNode());
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-site-toolkit/commit/2f3da5b6255ae220604d8164b8f95a6ee500ecc5
___
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] Pushed new branch feature/HSTTWO-3733
Canh Ngo pushed new branch feature/HSTTWO-3733 at cms-community / hippo-site-toolkit ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms] Pushed new branch bugfix/CMS-10354
Canh Ngo pushed new branch bugfix/CMS-10354 at cms-community / hippo-cms ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms-translations] Deleted branch bugfix/CMS-10335
Canh Ngo deleted branch bugfix/CMS-10335 at cms-community / hippo-cms-translations ___ 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][release/11.0] 3 commits: CMS-10335 Remove deprecated gallery upload translations
Canh Ngo pushed to branch release/11.0 at cms-community / hippo-cms-translations Commits: fe5263f1 by Mathijs den Burger at 2016-08-09T13:45:38+02:00 CMS-10335 Remove deprecated gallery upload translations Those classes have been deprecated in version 10, and are now removed in version 11. (cherry picked from commit 6e73613f5592a35488d1e1d24a205d4d74b5c2a4) - - - - - 5ada8a23 by Canh Ngo at 2016-08-09T13:46:20+02:00 CMS-10335 Remove deprecated flash-based upload translation (cherry picked from commit 7b74c103c159ad474740d351a41a7ec01618a07e) - - - - - cd150290 by Canh Ngo at 2016-08-09T15:26:35+02:00 CMS-10335 Reintegrate bugfix/CMS-10335 - - - - - 30 changed files: - − hippo-cms/resources/org/hippoecm/frontend/plugins/gallery/GalleryShortcutPlugin.properties - − hippo-cms/resources/org/hippoecm/frontend/plugins/gallery/GalleryShortcutPlugin.registry.json - − hippo-cms/resources/org/hippoecm/frontend/plugins/gallery/GalleryShortcutPlugin_de.properties - − hippo-cms/resources/org/hippoecm/frontend/plugins/gallery/GalleryShortcutPlugin_es.properties - − hippo-cms/resources/org/hippoecm/frontend/plugins/gallery/GalleryShortcutPlugin_fr.properties - − hippo-cms/resources/org/hippoecm/frontend/plugins/gallery/GalleryShortcutPlugin_nl.properties - − hippo-cms/resources/org/hippoecm/frontend/plugins/gallery/GalleryShortcutPlugin_zh.properties - − hippo-cms/resources/org/hippoecm/frontend/plugins/gallery/upload/ButtonBar.properties - − hippo-cms/resources/org/hippoecm/frontend/plugins/gallery/upload/ButtonBar.registry.json - − hippo-cms/resources/org/hippoecm/frontend/plugins/gallery/upload/ButtonBar_de.properties - − hippo-cms/resources/org/hippoecm/frontend/plugins/gallery/upload/ButtonBar_es.properties - − hippo-cms/resources/org/hippoecm/frontend/plugins/gallery/upload/ButtonBar_fr.properties - − hippo-cms/resources/org/hippoecm/frontend/plugins/gallery/upload/ButtonBar_nl.properties - − hippo-cms/resources/org/hippoecm/frontend/plugins/gallery/upload/ButtonBar_zh.properties - − hippo-cms/resources/org/hippoecm/frontend/plugins/gallery/upload/UploadDialog.properties - − hippo-cms/resources/org/hippoecm/frontend/plugins/gallery/upload/UploadDialog.registry.json - − hippo-cms/resources/org/hippoecm/frontend/plugins/gallery/upload/UploadDialog_de.properties - − hippo-cms/resources/org/hippoecm/frontend/plugins/gallery/upload/UploadDialog_es.properties - − hippo-cms/resources/org/hippoecm/frontend/plugins/gallery/upload/UploadDialog_fr.properties - − hippo-cms/resources/org/hippoecm/frontend/plugins/gallery/upload/UploadDialog_nl.properties - − hippo-cms/resources/org/hippoecm/frontend/plugins/gallery/upload/UploadDialog_zh.properties - − hippo-cms/resources/org/hippoecm/frontend/plugins/gallery/upload/UploadForm.properties - − hippo-cms/resources/org/hippoecm/frontend/plugins/gallery/upload/UploadForm.registry.json - − hippo-cms/resources/org/hippoecm/frontend/plugins/gallery/upload/UploadForm_de.properties - − hippo-cms/resources/org/hippoecm/frontend/plugins/gallery/upload/UploadForm_es.properties - − hippo-cms/resources/org/hippoecm/frontend/plugins/gallery/upload/UploadForm_fr.properties - − hippo-cms/resources/org/hippoecm/frontend/plugins/gallery/upload/UploadForm_nl.properties - − hippo-cms/resources/org/hippoecm/frontend/plugins/gallery/upload/UploadForm_zh.properties - − hippo-cms/resources/org/hippoecm/frontend/plugins/gallery/upload/UploadWizard.properties - − hippo-cms/resources/org/hippoecm/frontend/plugins/gallery/upload/UploadWizard.registry.json The diff was not included because it is too large. View it on GitLab: https://code.onehippo.org/cms-community/hippo-cms-translations/compare/fb514fb2dc634adb040f1c614a41a46ea0504faa...cd15029024b5adffbb0bc97bc96ae1371919eb94 ___ 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-10335
Canh Ngo deleted branch bugfix/CMS-10335 at cms-community / hippo-cms ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms] Pushed new branch bugfix/CMS-10327
Canh Ngo pushed new branch bugfix/CMS-10327 at cms-community / hippo-cms ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms][master] CMS-9408 Remove deprecated APIs since version 2.28.00
Canh Ngo pushed to branch master at cms-community / hippo-cms
Commits:
7fab2ebf by Canh Ngo at 2016-08-09T11:19:58+02:00
CMS-9408 Remove deprecated APIs since version 2.28.00
Because DefaultGalleryProcessor#validateResource() has been
removed, so the override method in NullGalleryProcessor should be
removed too
- - - - -
1 changed file:
-
api/src/main/java/org/hippoecm/frontend/plugins/gallery/model/NullGalleryProcessor.java
Changes:
=
api/src/main/java/org/hippoecm/frontend/plugins/gallery/model/NullGalleryProcessor.java
=
---
a/api/src/main/java/org/hippoecm/frontend/plugins/gallery/model/NullGalleryProcessor.java
+++
b/api/src/main/java/org/hippoecm/frontend/plugins/gallery/model/NullGalleryProcessor.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2011-2015 Hippo B.V. (http://www.onehippo.com)
+ * Copyright 2011-2016 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.
@@ -37,10 +37,4 @@ public class NullGalleryProcessor extends
DefaultGalleryProcessor {
protected void makeRegularImage(final Node node, final String name, final
InputStream istream, final String mimeType, final Calendar lastModified) throws
RepositoryException {
// do nothing
}
-
-@Deprecated
-@Override
-public void validateResource(final Node node, final String fileName)
throws GalleryException, RepositoryException {
-// skip validation, means any type of file can be uploaded
-}
}
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-cms/commit/7fab2ebf2f82e245a4a6220210547708df75aa00
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms][feature/CMS-9408] 2 commits: CMS-9408 Remove deprecated flash-based file upload classes
Canh Ngo pushed to branch feature/CMS-9408 at cms-community / hippo-cms Commits: 6bd4914b by Canh Ngo at 2016-08-08T16:07:37+02:00 CMS-9408 Remove deprecated flash-based file upload classes - - - - - 349d435c by Canh Ngo at 2016-08-08T16:26:18+02:00 CMS-9408 Remove deprecated APIs since version 2.28.00 - - - - - 30 changed files: - api/src/main/java/org/hippoecm/frontend/editor/plugins/resource/ResourceHelper.java - api/src/main/java/org/hippoecm/frontend/plugins/gallery/model/DefaultGalleryProcessor.java - api/src/main/java/org/hippoecm/frontend/plugins/gallery/model/GalleryProcessor.java - − api/src/main/java/org/hippoecm/frontend/plugins/standards/upload/UploadPlugin.html - − api/src/main/java/org/hippoecm/frontend/plugins/standards/upload/UploadPlugin.java - − api/src/main/java/org/hippoecm/frontend/plugins/yui/upload/FileUploadException.java - − api/src/main/java/org/hippoecm/frontend/plugins/yui/upload/FileUploadWidget.css - − api/src/main/java/org/hippoecm/frontend/plugins/yui/upload/FileUploadWidget.html - − api/src/main/java/org/hippoecm/frontend/plugins/yui/upload/FileUploadWidget.java - − api/src/main/java/org/hippoecm/frontend/plugins/yui/upload/FileUploadWidgetSettings.java - − api/src/main/java/org/hippoecm/frontend/plugins/yui/upload/MultiFileUploadDialog.html - − api/src/main/java/org/hippoecm/frontend/plugins/yui/upload/MultiFileUploadDialog.java - − api/src/main/java/org/hippoecm/frontend/plugins/yui/upload/MultiFileUploadDialog.properties - − api/src/main/java/org/hippoecm/frontend/plugins/yui/upload/ajax/AjaxMultiFileUploadBehavior.java - − api/src/main/java/org/hippoecm/frontend/plugins/yui/upload/ajax/AjaxMultiFileUploadComponent.html - − api/src/main/java/org/hippoecm/frontend/plugins/yui/upload/ajax/AjaxMultiFileUploadComponent.java - − api/src/main/java/org/hippoecm/frontend/plugins/yui/upload/ajax/AjaxMultiFileUploadComponent.properties - − api/src/main/java/org/hippoecm/frontend/plugins/yui/upload/ajax/AjaxMultiFileUploadSettings.java - − api/src/main/java/org/hippoecm/frontend/plugins/yui/upload/ajax/add_upload.tpl - − api/src/main/java/org/hippoecm/frontend/plugins/yui/upload/ajax/res/back-h.png - − api/src/main/java/org/hippoecm/frontend/plugins/yui/upload/ajax/res/back-v.png - − api/src/main/java/org/hippoecm/frontend/plugins/yui/upload/ajax/res/bar-h.png - − api/src/main/java/org/hippoecm/frontend/plugins/yui/upload/ajax/res/bar-v.png - − api/src/main/java/org/hippoecm/frontend/plugins/yui/upload/ajax/res/delete-small-16.png - − api/src/main/java/org/hippoecm/frontend/plugins/yui/upload/ajax/res/dt-arrow-dn.png - − api/src/main/java/org/hippoecm/frontend/plugins/yui/upload/ajax/res/dt-arrow-up.png - − api/src/main/java/org/hippoecm/frontend/plugins/yui/upload/ajax/res/select_upload_icononly.png - − api/src/main/java/org/hippoecm/frontend/plugins/yui/upload/ajax/res/select_upload_icononly_hover.png - − api/src/main/java/org/hippoecm/frontend/plugins/yui/upload/ajax/res/skin.css - − api/src/main/java/org/hippoecm/frontend/plugins/yui/upload/ajax/res/sprite.png The diff was not included because it is too large. View it on GitLab: https://code.onehippo.org/cms-community/hippo-cms/compare/ebdb46b875fbb053ceb574a31a335e8261b5846b...349d435c1885f1a90ee1680e9fbb36754f4a67c0 ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms] Pushed new branch feature/CMS-10343
Canh Ngo pushed new branch feature/CMS-10343 at cms-community / hippo-cms ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms] Deleted branch bugfix/CMS-10333
Canh Ngo deleted branch bugfix/CMS-10333 at cms-community / hippo-cms ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms][release/3.2] 4 commits: CMS-10333 Can't save document with only Youtube video in required rich text field
Canh Ngo pushed to branch release/3.2 at cms-community / hippo-cms
Commits:
b52e9548 by Marijan Milicevic at 2016-08-05T14:29:56+02:00
CMS-10333 Cant save document with only Youtube video in required rich text
field
- add iframe as valid element
(cherry picked from commit f5ba5322de83327a2c475571be1d5cb35ee9f424)
(cherry picked from commit 23c94277ad227e6f404815c8f1c24874d89ab01f)
- - - - -
61ccbf97 by Mathijs den Burger at 2016-08-05T14:30:17+02:00
CMS-10333 Bump copyright year, format code
(cherry picked from commit a81e489d25c357d2df6e6a70f579f5bded2f5bbb)
- - - - -
3887d5f3 by Canh Ngo at 2016-08-08T15:17:32+02:00
CMS-10333 Add test-case to verify that iframe element is valid
(cherry picked from commit 83a93a992fb9f3354ac72591e5b0850827ecbd7b)
(cherry picked from commit c617f306396f28b13554c0e8c2c0bf32f181f536)
- - - - -
bfc7e942 by Canh Ngo at 2016-08-08T15:19:22+02:00
CMS-10333 Reintegrate bugfix/CMS-10333
- - - - -
2 changed files:
-
editor/frontend/src/main/java/org/hippoecm/frontend/editor/validator/HtmlValidator.java
-
editor/test/src/test/java/org/hippoecm/frontend/editor/validator/HtmlValidatorTest.java
Changes:
=
editor/frontend/src/main/java/org/hippoecm/frontend/editor/validator/HtmlValidator.java
=
---
a/editor/frontend/src/main/java/org/hippoecm/frontend/editor/validator/HtmlValidator.java
+++
b/editor/frontend/src/main/java/org/hippoecm/frontend/editor/validator/HtmlValidator.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2009-2013 Hippo B.V. (http://www.onehippo.com)
+ * Copyright 2009-2016 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.
@@ -35,7 +35,7 @@ public class HtmlValidator implements IClusterable {
private static final long serialVersionUID = 1L;
-public static final String[] VALID_ELEMENTS = new String[] {"img",
"object", "embed", "form", "applet"};
+public static final String[] VALID_ELEMENTS = new String[]{"img",
"object", "embed", "form", "applet", "iframe"};
static class Handler extends DefaultHandler {
boolean valid = false;
@@ -43,7 +43,7 @@ public class HtmlValidator implements IClusterable {
@Override
public void characters(char[] chars, int start, int length) throws
SAXException {
String value = new String(chars, start, length).intern();
-if(CharMatcher.INVISIBLE.negate().matchesAnyOf(value)) {
+if (CharMatcher.INVISIBLE.negate().matchesAnyOf(value)) {
valid = true;
}
}
@@ -51,8 +51,8 @@ public class HtmlValidator implements IClusterable {
@Override
public void startElement(String namespaceURI, String localName, String
qName, Attributes atts)
throws SAXException {
-for(String element : VALID_ELEMENTS) {
-if(element.equalsIgnoreCase(localName)) {
+for (String element : VALID_ELEMENTS) {
+if (element.equalsIgnoreCase(localName)) {
valid = true;
break;
}
@@ -65,7 +65,7 @@ public class HtmlValidator implements IClusterable {
}
public Set validateNonEmpty(String html) throws
ValidationException {
-Set result = new HashSet();
+Set result = new HashSet<>();
Handler handler = new Handler();
try {
InputSource is = new InputSource();
=
editor/test/src/test/java/org/hippoecm/frontend/editor/validator/HtmlValidatorTest.java
=
---
a/editor/test/src/test/java/org/hippoecm/frontend/editor/validator/HtmlValidatorTest.java
+++
b/editor/test/src/test/java/org/hippoecm/frontend/editor/validator/HtmlValidatorTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2009-2013 Hippo B.V. (http://www.onehippo.com)
+ * Copyright 2009-2016 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.
@@ -111,6 +111,13 @@ public class HtmlValidatorTest {
assertEquals(0, violations.size());
}
+@Test
+public void testIframeHtml() throws Exception {
+String text = "http://example.com\;>";
+Set violations = validate(text);
+assertEquals(0, violations.size());
+}
+
private Set validate(final String text) throws ValidationException
{
String html = "" + text + "";
return new HtmlValidator().validateNonEmpty(html);
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-cms/compare/1ee7f6170f65697ec838ad232f
[HippoCMS-scm] [Git][cms-community/hippo-cms][bugfix/CMS-10333] CMS-10333 Add test-case to verify that iframe element is valid
Canh Ngo pushed to branch bugfix/CMS-10333 at cms-community / hippo-cms
Commits:
3887d5f3 by Canh Ngo at 2016-08-08T15:17:32+02:00
CMS-10333 Add test-case to verify that iframe element is valid
(cherry picked from commit 83a93a992fb9f3354ac72591e5b0850827ecbd7b)
(cherry picked from commit c617f306396f28b13554c0e8c2c0bf32f181f536)
- - - - -
1 changed file:
-
editor/test/src/test/java/org/hippoecm/frontend/editor/validator/HtmlValidatorTest.java
Changes:
=
editor/test/src/test/java/org/hippoecm/frontend/editor/validator/HtmlValidatorTest.java
=
---
a/editor/test/src/test/java/org/hippoecm/frontend/editor/validator/HtmlValidatorTest.java
+++
b/editor/test/src/test/java/org/hippoecm/frontend/editor/validator/HtmlValidatorTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2009-2013 Hippo B.V. (http://www.onehippo.com)
+ * Copyright 2009-2016 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.
@@ -111,6 +111,13 @@ public class HtmlValidatorTest {
assertEquals(0, violations.size());
}
+@Test
+public void testIframeHtml() throws Exception {
+String text = "http://example.com\;>";
+Set violations = validate(text);
+assertEquals(0, violations.size());
+}
+
private Set validate(final String text) throws ValidationException
{
String html = "" + text + "";
return new HtmlValidator().validateNonEmpty(html);
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-cms/commit/3887d5f3207a282cbfe36ff9508843b27b4fe9ea
___
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/4.0] CMS-10332 Add test-case to verify that iframe element is valid
Canh Ngo pushed to branch release/4.0 at cms-community / hippo-cms
Commits:
749d893e by Canh Ngo at 2016-08-08T15:15:17+02:00
CMS-10332 Add test-case to verify that iframe element is valid
(cherry picked from commit 83a93a992fb9f3354ac72591e5b0850827ecbd7b)
(cherry picked from commit c617f306396f28b13554c0e8c2c0bf32f181f536)
- - - - -
1 changed file:
-
editor/test/src/test/java/org/hippoecm/frontend/editor/validator/HtmlValidatorTest.java
Changes:
=
editor/test/src/test/java/org/hippoecm/frontend/editor/validator/HtmlValidatorTest.java
=
---
a/editor/test/src/test/java/org/hippoecm/frontend/editor/validator/HtmlValidatorTest.java
+++
b/editor/test/src/test/java/org/hippoecm/frontend/editor/validator/HtmlValidatorTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2009-2013 Hippo B.V. (http://www.onehippo.com)
+ * Copyright 2009-2016 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.
@@ -111,6 +111,13 @@ public class HtmlValidatorTest {
assertEquals(0, violations.size());
}
+@Test
+public void testIframeHtml() throws Exception {
+String text = "http://example.com\;>";
+Set violations = validate(text);
+assertEquals(0, violations.size());
+}
+
private Set validate(final String text) throws ValidationException
{
String html = "" + text + "";
return new HtmlValidator().validateNonEmpty(html);
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-cms/commit/749d893ecb572e3b41901382b66bec85161cd25b
___
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-10158 Add test-case to verify that iframe element is valid
Canh Ngo pushed to branch master at cms-community / hippo-cms Commits: c617f306 by Canh Ngo at 2016-08-08T15:12:06+02:00 CMS-10158 Add test-case to verify that iframe element is valid Bump copyright year - - - - - 1 changed file: - editor/test/src/test/java/org/hippoecm/frontend/editor/validator/HtmlValidatorTest.java Changes: = editor/test/src/test/java/org/hippoecm/frontend/editor/validator/HtmlValidatorTest.java = --- a/editor/test/src/test/java/org/hippoecm/frontend/editor/validator/HtmlValidatorTest.java +++ b/editor/test/src/test/java/org/hippoecm/frontend/editor/validator/HtmlValidatorTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2009-2013 Hippo B.V. (http://www.onehippo.com) + * Copyright 2009-2016 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. View it on GitLab: https://code.onehippo.org/cms-community/hippo-cms/commit/c617f306396f28b13554c0e8c2c0bf32f181f536 ___ 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-10158 Add test-case to verify that iframe element is valid
Canh Ngo pushed to branch master at cms-community / hippo-cms
Commits:
83a93a99 by Canh Ngo at 2016-08-08T15:09:04+02:00
CMS-10158 Add test-case to verify that iframe element is valid
- - - - -
1 changed file:
-
editor/test/src/test/java/org/hippoecm/frontend/editor/validator/HtmlValidatorTest.java
Changes:
=
editor/test/src/test/java/org/hippoecm/frontend/editor/validator/HtmlValidatorTest.java
=
---
a/editor/test/src/test/java/org/hippoecm/frontend/editor/validator/HtmlValidatorTest.java
+++
b/editor/test/src/test/java/org/hippoecm/frontend/editor/validator/HtmlValidatorTest.java
@@ -111,6 +111,13 @@ public class HtmlValidatorTest {
assertEquals(0, violations.size());
}
+@Test
+public void testIframeHtml() throws Exception {
+String text = "http://example.com\;>";
+Set violations = validate(text);
+assertEquals(0, violations.size());
+}
+
private Set validate(final String text) throws ValidationException
{
String html = "" + text + "";
return new HtmlValidator().validateNonEmpty(html);
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-cms/commit/83a93a992fb9f3354ac72591e5b0850827ecbd7b
___
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-10332
Canh Ngo deleted branch bugfix/CMS-10332 at cms-community / hippo-cms ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms][release/4.0] 3 commits: CMS-10332 Can't save document with only Youtube video in required rich text field
Canh Ngo pushed to branch release/4.0 at cms-community / hippo-cms
Commits:
4027c8c3 by Marijan Milicevic at 2016-08-05T14:21:58+02:00
CMS-10332 Cant save document with only Youtube video in required rich text
field
- add iframe as valid element
(cherry picked from commit f5ba5322de83327a2c475571be1d5cb35ee9f424)
(cherry picked from commit 23c94277ad227e6f404815c8f1c24874d89ab01f)
- - - - -
95b8bc52 by Mathijs den Burger at 2016-08-05T14:23:23+02:00
CMS-10332 Bump copyright year, format code
(cherry picked from commit a81e489d25c357d2df6e6a70f579f5bded2f5bbb)
- - - - -
25f07dff by Canh Ngo at 2016-08-08T14:39:32+02:00
CMS-10332 Reintegrate bugfix/CMS-10332
- - - - -
1 changed file:
-
editor/frontend/src/main/java/org/hippoecm/frontend/editor/validator/HtmlValidator.java
Changes:
=
editor/frontend/src/main/java/org/hippoecm/frontend/editor/validator/HtmlValidator.java
=
---
a/editor/frontend/src/main/java/org/hippoecm/frontend/editor/validator/HtmlValidator.java
+++
b/editor/frontend/src/main/java/org/hippoecm/frontend/editor/validator/HtmlValidator.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2009-2013 Hippo B.V. (http://www.onehippo.com)
+ * Copyright 2009-2016 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.
@@ -35,7 +35,7 @@ public class HtmlValidator implements IClusterable {
private static final long serialVersionUID = 1L;
-public static final String[] VALID_ELEMENTS = new String[] {"img",
"object", "embed", "form", "applet"};
+public static final String[] VALID_ELEMENTS = new String[]{"img",
"object", "embed", "form", "applet", "iframe"};
static class Handler extends DefaultHandler {
boolean valid = false;
@@ -43,7 +43,7 @@ public class HtmlValidator implements IClusterable {
@Override
public void characters(char[] chars, int start, int length) throws
SAXException {
String value = new String(chars, start, length).intern();
-if(CharMatcher.INVISIBLE.negate().matchesAnyOf(value)) {
+if (CharMatcher.INVISIBLE.negate().matchesAnyOf(value)) {
valid = true;
}
}
@@ -51,8 +51,8 @@ public class HtmlValidator implements IClusterable {
@Override
public void startElement(String namespaceURI, String localName, String
qName, Attributes atts)
throws SAXException {
-for(String element : VALID_ELEMENTS) {
-if(element.equalsIgnoreCase(localName)) {
+for (String element : VALID_ELEMENTS) {
+if (element.equalsIgnoreCase(localName)) {
valid = true;
break;
}
@@ -65,7 +65,7 @@ public class HtmlValidator implements IClusterable {
}
public Set validateNonEmpty(String html) throws
ValidationException {
-Set result = new HashSet();
+Set result = new HashSet<>();
Handler handler = new Handler();
try {
InputSource is = new InputSource();
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-cms/compare/848aef5b148ff6ee6536dc4352fe97599435195c...25f07dffd03633300f7272bf538668034e7852be
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms] Pushed new branch feature/CMS-10306
Canh Ngo pushed new branch feature/CMS-10306 at cms-community / hippo-cms ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms] Deleted branch bugfix/CMS-10303
Canh Ngo deleted branch bugfix/CMS-10303 at cms-community / hippo-cms ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms-translations] Pushed new branch bugfix/CMS-10321
Canh Ngo pushed new branch bugfix/CMS-10321 at cms-community / hippo-cms-translations ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms] Pushed new branch bugfix/CMS-10324
Canh Ngo pushed new branch bugfix/CMS-10324 at cms-community / hippo-cms ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms] Pushed new branch bugfix/CMS-10321
Canh Ngo pushed new branch bugfix/CMS-10321 at cms-community / hippo-cms ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms][master] 3 commits: CMS-10323 Update 'time zone' label when another language is selected
Canh Ngo pushed to branch master at cms-community / hippo-cms
Commits:
e6780ce2 by Mathijs den Burger at 2016-08-03T15:41:37+02:00
CMS-10323 Update time zone label when another language is selected
- - - - -
56a55574 by Canh Ngo at 2016-08-03T16:59:05+02:00
CMS-10323 Use wicket:enclosure to hide time zone components
- - - - -
634ad14f by Canh Ngo at 2016-08-03T17:00:21+02:00
CMS-10323 Reintegrate bugfix/CMS-10323
- - - - -
2 changed files:
-
engine/src/main/java/org/hippoecm/frontend/plugins/login/DefaultLoginPlugin$LoginForm.html
-
engine/src/main/java/org/hippoecm/frontend/plugins/login/DefaultLoginPlugin.java
Changes:
=
engine/src/main/java/org/hippoecm/frontend/plugins/login/DefaultLoginPlugin$LoginForm.html
=
---
a/engine/src/main/java/org/hippoecm/frontend/plugins/login/DefaultLoginPlugin$LoginForm.html
+++
b/engine/src/main/java/org/hippoecm/frontend/plugins/login/DefaultLoginPlugin$LoginForm.html
@@ -17,12 +17,14 @@
-
- [Timezone:]
-
-
-
-
+
+
+[Timezone:]
+
+
+
+
+
=
engine/src/main/java/org/hippoecm/frontend/plugins/login/DefaultLoginPlugin.java
=
---
a/engine/src/main/java/org/hippoecm/frontend/plugins/login/DefaultLoginPlugin.java
+++
b/engine/src/main/java/org/hippoecm/frontend/plugins/login/DefaultLoginPlugin.java
@@ -17,6 +17,7 @@ package org.hippoecm.frontend.plugins.login;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Collections;
import java.util.List;
import java.util.TimeZone;
import java.util.stream.Collectors;
@@ -62,14 +63,16 @@ public class DefaultLoginPlugin extends SimpleLoginPlugin {
private static final int TIMEZONE_COOKIE_MAX_AGE = 365 * 24 * 3600; //
expire one year from now
private String selectedTimeZone;
-private List availableTimeZones;
+private List availableTimeZones = Collections.emptyList();
private boolean useBrowserTimeZoneIfAvailable;
public LoginForm(final String id, final boolean autoComplete, final
List locales, final LoginHandler handler) {
super(id, autoComplete, locales, handler);
final IPluginConfig config = getPluginConfig();
-if (config.getBoolean(SHOW_TIMEZONES_CONFIG_PARAM)) {
+final boolean isTimeZoneVisible =
config.getBoolean(SHOW_TIMEZONES_CONFIG_PARAM);
+
+if (isTimeZoneVisible) {
availableTimeZones =
getSelectableTimezones(config.getStringArray(SELECTABLE_TIMEZONES_CONFIG_PARAM));
// Check if user has previously selected a timezone
@@ -80,19 +83,17 @@ public class DefaultLoginPlugin extends SimpleLoginPlugin {
selectedTimeZone = availableTimeZones.get(0);
useBrowserTimeZoneIfAvailable = true;
}
+}
-// Add the timezone dropdown
-final PropertyModel selected = PropertyModel.of(this,
"selectedTimeZone");
-final DropDownChoice timeZone = new
DropDownChoice<>("timezone", selected, availableTimeZones);
-timeZone.setNullValid(false);
-
-form.add(new Label("timezone-label", new
ResourceModel("timezone-label", "Time zone:")));
-form.add(timeZone);
+// Add the time zone dropdown
+final PropertyModel selected = PropertyModel.of(this,
"selectedTimeZone");
+final DropDownChoice timeZone = new
DropDownChoice<>("timezone", selected, availableTimeZones);
+timeZone.setNullValid(false);
-} else {
-form.add(new Label("timezone-label").setVisible(false));
-form.add(new Label("timezone").setVisible(false));
-}
+final Label timeZoneLabel = new Label("timezone-label", new
ResourceModel("timezone-label", "Time zone:"));
+timeZoneLabel.setVisible(isTimeZoneVisible);
+form.addLabelledComponent(timeZoneLabel);
+form.add(timeZone);
}
@Override
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-cms/compare/1d9e0aa68243139d823b375d347f401df2e03444...634ad14f710a7d76fde1b9b2a8d7212257dd5b84
___
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-10323
Canh Ngo deleted branch bugfix/CMS-10323 at cms-community / hippo-cms ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms][bugfix/CMS-10323] CMS-10323 Use wicket:enclosure to hide time zone components
Canh Ngo pushed to branch bugfix/CMS-10323 at cms-community / hippo-cms
Commits:
56a55574 by Canh Ngo at 2016-08-03T16:59:05+02:00
CMS-10323 Use wicket:enclosure to hide time zone components
- - - - -
2 changed files:
-
engine/src/main/java/org/hippoecm/frontend/plugins/login/DefaultLoginPlugin$LoginForm.html
-
engine/src/main/java/org/hippoecm/frontend/plugins/login/DefaultLoginPlugin.java
Changes:
=
engine/src/main/java/org/hippoecm/frontend/plugins/login/DefaultLoginPlugin$LoginForm.html
=
---
a/engine/src/main/java/org/hippoecm/frontend/plugins/login/DefaultLoginPlugin$LoginForm.html
+++
b/engine/src/main/java/org/hippoecm/frontend/plugins/login/DefaultLoginPlugin$LoginForm.html
@@ -17,12 +17,14 @@
-
- [Timezone:]
-
-
-
-
+
+
+[Timezone:]
+
+
+
+
+
=
engine/src/main/java/org/hippoecm/frontend/plugins/login/DefaultLoginPlugin.java
=
---
a/engine/src/main/java/org/hippoecm/frontend/plugins/login/DefaultLoginPlugin.java
+++
b/engine/src/main/java/org/hippoecm/frontend/plugins/login/DefaultLoginPlugin.java
@@ -17,6 +17,7 @@ package org.hippoecm.frontend.plugins.login;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Collections;
import java.util.List;
import java.util.TimeZone;
import java.util.stream.Collectors;
@@ -62,14 +63,16 @@ public class DefaultLoginPlugin extends SimpleLoginPlugin {
private static final int TIMEZONE_COOKIE_MAX_AGE = 365 * 24 * 3600; //
expire one year from now
private String selectedTimeZone;
-private List availableTimeZones;
+private List availableTimeZones = Collections.emptyList();
private boolean useBrowserTimeZoneIfAvailable;
public LoginForm(final String id, final boolean autoComplete, final
List locales, final LoginHandler handler) {
super(id, autoComplete, locales, handler);
final IPluginConfig config = getPluginConfig();
-if (config.getBoolean(SHOW_TIMEZONES_CONFIG_PARAM)) {
+final boolean isTimeZoneVisible =
config.getBoolean(SHOW_TIMEZONES_CONFIG_PARAM);
+
+if (isTimeZoneVisible) {
availableTimeZones =
getSelectableTimezones(config.getStringArray(SELECTABLE_TIMEZONES_CONFIG_PARAM));
// Check if user has previously selected a timezone
@@ -80,19 +83,17 @@ public class DefaultLoginPlugin extends SimpleLoginPlugin {
selectedTimeZone = availableTimeZones.get(0);
useBrowserTimeZoneIfAvailable = true;
}
+}
-// Add the timezone dropdown
-final PropertyModel selected = PropertyModel.of(this,
"selectedTimeZone");
-final DropDownChoice timeZone = new
DropDownChoice<>("timezone", selected, availableTimeZones);
-timeZone.setNullValid(false);
-
-form.addLabelledComponent(new Label("timezone-label", new
ResourceModel("timezone-label", "Time zone:")));
-form.add(timeZone);
+// Add the time zone dropdown
+final PropertyModel selected = PropertyModel.of(this,
"selectedTimeZone");
+final DropDownChoice timeZone = new
DropDownChoice<>("timezone", selected, availableTimeZones);
+timeZone.setNullValid(false);
-} else {
-form.addLabelledComponent(new
Label("timezone-label").setVisible(false));
-form.add(new Label("timezone").setVisible(false));
-}
+final Label timeZoneLabel = new Label("timezone-label", new
ResourceModel("timezone-label", "Time zone:"));
+timeZoneLabel.setVisible(isTimeZoneVisible);
+form.addLabelledComponent(timeZoneLabel);
+form.add(timeZone);
}
@Override
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-cms/commit/56a555748651c293e2c730cb596e1bbc57e70d7f
___
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-10320 Translate wizard buttons
Canh Ngo pushed to branch master at cms-community / hippo-cms
Commits:
1d9e0aa6 by Mathijs den Burger at 2016-08-03T14:52:36+02:00
CMS-10320 Translate wizard buttons
The setLabel call in AjaxWizardButton did not do anything (that
label is only used in validator messages). Instead the label model
is now given to the constructor. The wizard labels were also not
translated anywhere, so added a .properties file for them. Finally,
the hardcoded value in the input elements overrode the
translation in the model, so removed those. Also changed the input
elements to type button since we are submitted via Ajax anyway.
- - - - -
3 changed files:
-
api/src/main/java/org/hippoecm/frontend/plugins/standards/wizard/AjaxWizardButton.java
-
api/src/main/java/org/hippoecm/frontend/plugins/standards/wizard/AjaxWizardButtonBar.html
- +
api/src/main/resources/org/hippoecm/frontend/plugins/standards/wizard/AjaxWizardButton.properties
Changes:
=
api/src/main/java/org/hippoecm/frontend/plugins/standards/wizard/AjaxWizardButton.java
=
---
a/api/src/main/java/org/hippoecm/frontend/plugins/standards/wizard/AjaxWizardButton.java
+++
b/api/src/main/java/org/hippoecm/frontend/plugins/standards/wizard/AjaxWizardButton.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2008-2013 Hippo B.V. (http://www.onehippo.com)
+ * Copyright 2008-2016 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,7 @@ import org.apache.wicket.ajax.markup.html.form.AjaxButton;
import org.apache.wicket.extensions.wizard.IWizard;
import org.apache.wicket.extensions.wizard.IWizardModel;
import org.apache.wicket.markup.html.form.Form;
-import org.apache.wicket.model.ResourceModel;
+import org.hippoecm.frontend.plugins.standards.ClassResourceModel;
public abstract class AjaxWizardButton extends AjaxButton {
private static final long serialVersionUID = 1L;
@@ -30,8 +30,7 @@ public abstract class AjaxWizardButton extends AjaxButton {
private final IWizard wizard;
public AjaxWizardButton(String id, IWizard wizard, final Form form, String
labelResourceKey) {
-super(id, form);
-this.setLabel(new ResourceModel(labelResourceKey));
+super(id, new ClassResourceModel(labelResourceKey,
AjaxWizardButton.class), form);
this.wizard = wizard;
}
=
api/src/main/java/org/hippoecm/frontend/plugins/standards/wizard/AjaxWizardButtonBar.html
=
---
a/api/src/main/java/org/hippoecm/frontend/plugins/standards/wizard/AjaxWizardButtonBar.html
+++
b/api/src/main/java/org/hippoecm/frontend/plugins/standards/wizard/AjaxWizardButtonBar.html
@@ -1,5 +1,5 @@
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][release/4.0] CHANNELMGR-828 Translate 'OK' in alert and 'Select' in menu editor
Canh Ngo pushed to branch release/4.0 at cms-community /
hippo-addon-channel-manager
Commits:
34fe51d6 by Mathijs den Burger at 2016-08-03T14:43:22+02:00
CHANNELMGR-828 Translate OK in alert and Select in menu
editor
Moved the ALERT_OK to OK so we can reuse the OK translation in
multiple locations. The Select seems pretty specific for this
sub-page (e.g. we also have another more specific Select link type
label with the key PICKER_SELECT), so changed the untranslated
label SELECT to SUBPAGE_MENU_EDITOR_SELECT_INTERNAL_LINK.
(cherry picked from commit 3309ced01f189a4706fe125e4c3d61e4a17beeac)
- - - - -
3 changed files:
- frontend-ng/src/angularjs/channel/menu/editor.html
- frontend-ng/src/angularjs/channel/page/actions/edit/edit.controller.js
- frontend-ng/src/i18n/en.json
Changes:
=
frontend-ng/src/angularjs/channel/menu/editor.html
=
--- a/frontend-ng/src/angularjs/channel/menu/editor.html
+++ b/frontend-ng/src/angularjs/channel/menu/editor.html
@@ -106,7 +106,7 @@
- {{ 'SELECT' | translate }}
+ {{ 'SUBPAGE_MENU_EDITOR_SELECT_INTERNAL_LINK' | translate }}
=
frontend-ng/src/angularjs/channel/page/actions/edit/edit.controller.js
=
--- a/frontend-ng/src/angularjs/channel/page/actions/edit/edit.controller.js
+++ b/frontend-ng/src/angularjs/channel/page/actions/edit/edit.controller.js
@@ -96,7 +96,7 @@ export class PageEditCtrl {
this.$mdDialog.alert()
.clickOutsideToClose(true)
.textContent(textContent)
- .ok(this.$translate.instant('ALERT_OK'))
+ .ok(this.$translate.instant('OK'))
);
}
}
=
frontend-ng/src/i18n/en.json
=
--- a/frontend-ng/src/i18n/en.json
+++ b/frontend-ng/src/i18n/en.json
@@ -1,6 +1,5 @@
{
"ADVANCED_SETTINGS": "Advanced settings",
- "ALERT_OK": "OK",
"CANCEL": "Cancel",
"CHANNEL_PROPERTIES_SAVE_SUCCESS": "Channel settings saved successfully",
"COLLAPSE": "Collapse",
@@ -69,6 +68,7 @@
"LINK_REQUIRED": "Link is required",
"MOVE": "Move",
"NEW_MENU_ITEM_TITLE": "Untitled",
+ "OK": "OK",
"PICKER_EMPTY_TREE": "No documents are available",
"PICKER_LISTING_NAME": "Name",
"PICKER_SELECT": "Select link type",
@@ -91,6 +91,7 @@
"SUBPAGE_MENU_EDITOR_EXTERNAL_LINK": "External link",
"SUBPAGE_MENU_EDITOR_INTERNAL_LINK": "Internal link",
"SUBPAGE_MENU_EDITOR_NO_LINK": "No link",
+ "SUBPAGE_MENU_EDITOR_SELECT_INTERNAL_LINK": "Select",
"SUBPAGE_PAGE_COPY_LABEL_CHANNEL": "Destination channel",
"SUBPAGE_PAGE_COPY_LABEL_URL_STEM": "Destination URL",
"SUBPAGE_PAGE_COPY_TITLE": "Copy page '{{pageName}}'",
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/34fe51d6cb68309217bf477f17a32279b6680427
___
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-828
Canh Ngo deleted branch bugfix/CHANNELMGR-828 at cms-community / hippo-addon-channel-manager ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms-translations] Deleted branch bugfix/CHANNELMGR-828
Canh Ngo deleted branch bugfix/CHANNELMGR-828 at cms-community / hippo-cms-translations ___ 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-828
Canh Ngo pushed new branch bugfix/CHANNELMGR-828 at cms-community / hippo-cms-translations ___ 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-828
Canh Ngo pushed new branch bugfix/CHANNELMGR-828 at cms-community / hippo-addon-channel-manager ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms-translations] Deleted branch bugfix/CHANNELMGR-758
Canh Ngo deleted branch bugfix/CHANNELMGR-758 at cms-community / hippo-cms-translations ___ 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-758
Canh Ngo deleted branch bugfix/CHANNELMGR-758 at cms-community / hippo-addon-channel-manager ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][master] CHANNELMGR-758 Translate 'OK' in alert and 'Select' in menu editor
Canh Ngo pushed to branch master at cms-community / hippo-addon-channel-manager
Commits:
3309ced0 by Mathijs den Burger at 2016-08-03T11:57:47+02:00
CHANNELMGR-758 Translate OK in alert and Select in menu
editor
Moved the ALERT_OK to OK so we can reuse the OK translation in
multiple locations. The Select seems pretty specific for this
sub-page (e.g. we also have another more specific Select link type
label with the key PICKER_SELECT), so changed the untranslated
label SELECT to SUBPAGE_MENU_EDITOR_SELECT_INTERNAL_LINK.
- - - - -
3 changed files:
- frontend-ng/src/angularjs/channel/menu/editor.html
- frontend-ng/src/angularjs/channel/page/actions/edit/edit.controller.js
- frontend-ng/src/i18n/en.json
Changes:
=
frontend-ng/src/angularjs/channel/menu/editor.html
=
--- a/frontend-ng/src/angularjs/channel/menu/editor.html
+++ b/frontend-ng/src/angularjs/channel/menu/editor.html
@@ -106,7 +106,7 @@
- {{ 'SELECT' | translate }}
+ {{ 'SUBPAGE_MENU_EDITOR_SELECT_INTERNAL_LINK' | translate }}
=
frontend-ng/src/angularjs/channel/page/actions/edit/edit.controller.js
=
--- a/frontend-ng/src/angularjs/channel/page/actions/edit/edit.controller.js
+++ b/frontend-ng/src/angularjs/channel/page/actions/edit/edit.controller.js
@@ -96,7 +96,7 @@ export class PageEditCtrl {
this.$mdDialog.alert()
.clickOutsideToClose(true)
.textContent(textContent)
- .ok(this.$translate.instant('ALERT_OK'))
+ .ok(this.$translate.instant('OK'))
);
}
}
=
frontend-ng/src/i18n/en.json
=
--- a/frontend-ng/src/i18n/en.json
+++ b/frontend-ng/src/i18n/en.json
@@ -1,6 +1,5 @@
{
"ADVANCED_SETTINGS": "Advanced settings",
- "ALERT_OK": "OK",
"CANCEL": "Cancel",
"CHANNEL_PROPERTIES_SAVE_SUCCESS": "Channel settings saved successfully",
"COLLAPSE": "Collapse",
@@ -69,6 +68,7 @@
"LINK_REQUIRED": "Link is required",
"MOVE": "Move",
"NEW_MENU_ITEM_TITLE": "Untitled",
+ "OK": "OK",
"PICKER_EMPTY_TREE": "No documents are available",
"PICKER_LISTING_NAME": "Name",
"PICKER_SELECT": "Select link type",
@@ -91,6 +91,7 @@
"SUBPAGE_MENU_EDITOR_EXTERNAL_LINK": "External link",
"SUBPAGE_MENU_EDITOR_INTERNAL_LINK": "Internal link",
"SUBPAGE_MENU_EDITOR_NO_LINK": "No link",
+ "SUBPAGE_MENU_EDITOR_SELECT_INTERNAL_LINK": "Select",
"SUBPAGE_PAGE_COPY_LABEL_CHANNEL": "Destination channel",
"SUBPAGE_PAGE_COPY_LABEL_URL_STEM": "Destination URL",
"SUBPAGE_PAGE_COPY_TITLE": "Copy page '{{pageName}}'",
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/3309ced01f189a4706fe125e4c3d61e4a17beeac
___
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] Pushed new branch feature/delete-channel-HSTTWO-3731
Canh Ngo pushed new branch feature/delete-channel-HSTTWO-3731 at cms-community / hippo-site-toolkit ___ 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] CHANNELMGR-811 Allow to run all tests
Canh Ngo pushed to branch master at cms-community / hippo-addon-channel-manager
Commits:
84c1482a by Canh Ngo at 2016-07-29T14:09:11+02:00
CHANNELMGR-811 Allow to run all tests
- - - - -
1 changed file:
- frontend-ng/src/angularjs/channel/menu/selectAllOnFocus.directive.spec.js
Changes:
=
frontend-ng/src/angularjs/channel/menu/selectAllOnFocus.directive.spec.js
=
--- a/frontend-ng/src/angularjs/channel/menu/selectAllOnFocus.directive.spec.js
+++ b/frontend-ng/src/angularjs/channel/menu/selectAllOnFocus.directive.spec.js
@@ -35,7 +35,7 @@ describe('selectAllOnFocusDirective', () => {
jasmine.clock().uninstall();
});
- fit('selects all content on focus', () => {
+ it('selects all content on focus', () => {
const $scope = $rootScope.$new();
const $element = angular.element('');
const valueLength = $element.val().length;
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/84c1482a93ff7f2a8ff57ac3f2f5152eec9e1dff
___
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-811
Canh Ngo pushed new branch bugfix/CHANNELMGR-811 at cms-community / hippo-addon-channel-manager ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms] Pushed new branch feature/CMS-10305
Canh Ngo pushed new branch feature/CMS-10305 at cms-community / hippo-cms ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms] Deleted branch feature/CMS-10255
Canh Ngo deleted branch feature/CMS-10255 at cms-community / hippo-cms ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager] Pushed new branch bugfix/CHANNELMGR-820
Canh Ngo pushed new branch bugfix/CHANNELMGR-820 at cms-community / hippo-addon-channel-manager ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms] Pushed new branch feature/CMS-10281
Canh Ngo pushed new branch feature/CMS-10281 at cms-community / hippo-cms ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms] Deleted branch feature/CMS-10281
Canh Ngo deleted branch feature/CMS-10281 at cms-community / hippo-cms ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][master] CHANNELMGR-811 Fixed select-all-on-focus to work with Safari
Canh Ngo pushed to branch master at cms-community / hippo-addon-channel-manager
Commits:
fdc480d0 by Canh Ngo at 2016-07-26T15:27:43+02:00
CHANNELMGR-811 Fixed select-all-on-focus to work with Safari
Only prevent mouseup event one time, otherwise a mouse click
cannot deselect text content
- - - - -
1 changed file:
- frontend-ng/src/angularjs/channel/menu/selectAllOnFocus.directive.js
Changes:
=
frontend-ng/src/angularjs/channel/menu/selectAllOnFocus.directive.js
=
--- a/frontend-ng/src/angularjs/channel/menu/selectAllOnFocus.directive.js
+++ b/frontend-ng/src/angularjs/channel/menu/selectAllOnFocus.directive.js
@@ -26,8 +26,8 @@ export function selectAllOnFocusDirective() {
domElement.select();
}
});
- element.mouseup((event) => {
-// Safari immediately deselects all when the mouseup event happens, so
prevent that
+ element.one('mouseup', (event) => {
+// Safari immediately deselects all when the mouseup event happens, so
only prevent that for one time
event.preventDefault();
});
},
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/fdc480d00f6768202a896eefd03561ab0ec3a695
___
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-823
Canh Ngo pushed new branch bugfix/CHANNELMGR-823 at cms-community / hippo-addon-channel-manager ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-essentials][bugfix/ESSENTIALS-1009] ESSENTIALS-1009 Back port
Canh Ngo pushed to branch bugfix/ESSENTIALS-1009 at cms-community / hippo-essentials Commits: 93e21918 by Canh Ngo at 2016-07-22T14:07:50+02:00 ESSENTIALS-1009 Back port Fixed menu templates to position edit button correctly - - - - - 2 changed files: - plugins/skeleton-package/src/main/resources/instructions/freemarker/base-top-menu.ftl - plugins/skeleton-package/src/main/resources/instructions/jsp/base-top-menu.jsp Changes: = plugins/skeleton-package/src/main/resources/instructions/freemarker/base-top-menu.ftl = --- a/plugins/skeleton-package/src/main/resources/instructions/freemarker/base-top-menu.ftl +++ b/plugins/skeleton-package/src/main/resources/instructions/freemarker/base-top-menu.ftl @@ -3,6 +3,7 @@ <#-- @ftlvariable name="menu" type="org.hippoecm.hst.core.sitemenu.HstSiteMenu" --> <#-- @ftlvariable name="editMode" type="java.lang.Boolean"--> <#if menu??> + <#if menu.siteMenuItems??> <#list menu.siteMenuItems as item> @@ -15,6 +16,7 @@ <@hst.cmseditmenu menu=menu/> + <#else> <#if editMode> [Menu Component] = plugins/skeleton-package/src/main/resources/instructions/jsp/base-top-menu.jsp = --- a/plugins/skeleton-package/src/main/resources/instructions/jsp/base-top-menu.jsp +++ b/plugins/skeleton-package/src/main/resources/instructions/jsp/base-top-menu.jsp @@ -4,21 +4,23 @@ <%--@elvariable id="editMode" type="java.lang.Boolean"--%> - - - - - - "> - - - "> - - - - - - + + + + + + +"> + + +"> + + + + + + + <%--Placeholder reminding us to configure a valid menu in the component parameters--%> View it on GitLab: https://code.onehippo.org/cms-community/hippo-essentials/commit/93e21918cfdf4aad3f8b80c0fc9dad7e2e6cc73a ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-essentials] Pushed new branch bugfix/ESSENTIALS-1009
Canh Ngo pushed new branch bugfix/ESSENTIALS-1009 at cms-community / hippo-essentials ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-essentials] Pushed new branch bugfix/ESSENTIALS-1003
Canh Ngo pushed new branch bugfix/ESSENTIALS-1003 at cms-community / hippo-essentials ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager] Pushed new branch bugfix/CHANNELMGR-816
Canh Ngo pushed new branch bugfix/CHANNELMGR-816 at cms-community / hippo-addon-channel-manager ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms-utilities] Pushed new branch bugfix/CMS-10284
Canh Ngo pushed new branch bugfix/CMS-10284 at cms-community / hippo-cms-utilities ___ 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-817
Canh Ngo deleted branch bugfix/CHANNELMGR-817 at cms-community / hippo-addon-channel-manager ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][master] 2 commits: CHANNELMGR-817 Ensure paths always start with a slash
Canh Ngo pushed to branch master at cms-community / hippo-addon-channel-manager
Commits:
a06c1d8c by Mathijs den Burger at 2016-07-20T12:02:41+02:00
CHANNELMGR-817 Ensure paths always start with a slash
Usually the context path starts with a slash (e.g. '/site'), but
it can be empty when a channel's webapp is deployed as ROOT.war.
In that case the generated paths should still start with a slash,
otherwise the browser will resolve them relative to the Angular
app path instead of to the URL's hostname.
Since PathService.concatPaths already ignores the concatenation of
double slashes (e.g. '/' + '/site' = '/site') and it also ignores
falsy path elements (e.g. '/site' + undefined = '/site'), the
_makeContextPrefix logic could be simplified to a oneliner.
- - - - -
c88dc4be by Canh Ngo at 2016-07-20T17:00:47+02:00
CHANNELMGR-817 Reintegrated bugfix/CHANNELMGR-817
- - - - -
3 changed files:
- frontend-ng/src/angularjs/channel/channel.service.js
- frontend-ng/src/angularjs/channel/channel.service.spec.js
- frontend-ng/src/angularjs/utils/path.service.spec.js
Changes:
=
frontend-ng/src/angularjs/channel/channel.service.js
=
--- a/frontend-ng/src/angularjs/channel/channel.service.js
+++ b/frontend-ng/src/angularjs/channel/channel.service.js
@@ -127,11 +127,7 @@ export class ChannelService {
}
_makeContextPrefix(contextPath) {
-let path = contextPath;
-if (this.channel.cmsPreviewPrefix) {
- path = this.PathService.concatPaths(path, this.channel.cmsPreviewPrefix);
-}
-return path;
+return this.PathService.concatPaths('/', contextPath,
this.channel.cmsPreviewPrefix);
}
getPreviewPaths() {
=
frontend-ng/src/angularjs/channel/channel.service.spec.js
=
--- a/frontend-ng/src/angularjs/channel/channel.service.spec.js
+++ b/frontend-ng/src/angularjs/channel/channel.service.spec.js
@@ -194,6 +194,18 @@ describe('ChannelService', () => {
expect(ChannelService.makePath()).toEqual('/cmsPreviewPrefix');
});
+ it('should create paths that start with a slash if the channel\'s webapp
runs as ROOT.war and hence the contextPath is an empty string', () => {
+const contextPath = '';
+ChannelService._load({ contextPath });
+$rootScope.$digest();
+expect(ChannelService.makePath()).toEqual('/');
+
+const cmsPreviewPrefix = 'cmsPreviewPrefix';
+ChannelService._load({ contextPath, cmsPreviewPrefix });
+$rootScope.$digest();
+expect(ChannelService.makePath()).toEqual('/cmsPreviewPrefix');
+ });
+
it('should return a preview path that starts with the contextPath', () => {
const contextPath = '/contextPath';
const mountPath = '/';
=
frontend-ng/src/angularjs/utils/path.service.spec.js
=
--- a/frontend-ng/src/angularjs/utils/path.service.spec.js
+++ b/frontend-ng/src/angularjs/utils/path.service.spec.js
@@ -48,6 +48,8 @@ describe('PathService', () => {
expect(PathService.concatPaths('one')).toEqual('one');
expect(PathService.concatPaths('', 'two ')).toEqual('two');
expect(PathService.concatPaths('one', '')).toEqual('one');
+expect(PathService.concatPaths('one', undefined)).toEqual('one');
+expect(PathService.concatPaths('one', null)).toEqual('one');
expect(PathService.concatPaths(undefined, 'two')).toEqual('two');
expect(PathService.concatPaths('one', '')).toEqual('one');
expect(PathService.concatPaths('', 'two')).toEqual('two');
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/compare/580e205205bfa4a7e08d0a6e96f4ca5130e84528...c88dc4bed5d3707cbed43de5573da187bcf262e4
___
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-811
Canh Ngo pushed new branch bugfix/CHANNELMGR-811 at cms-community / hippo-addon-channel-manager ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][bugfix/CHANNELMGR-804] CHANNELMGR-804 Improved the fix with 'null' response argument
Canh Ngo pushed to branch bugfix/CHANNELMGR-804 at cms-community /
hippo-addon-channel-manager
Commits:
23f541ae by Canh Ngo at 2016-07-20T12:00:05+02:00
CHANNELMGR-804 Improved the fix with 'null' response argument
With this fix, the comment to disable eslint exception
'no-param-reassign' is not necessary.
Added a test-case of FeedbackService#showErrorResponseOnSubpage()
with 'null' response argument.
- - - - -
2 changed files:
- frontend-ng/src/angularjs/utils/feedback.service.js
- frontend-ng/src/angularjs/utils/feedback.service.spec.js
Changes:
=
frontend-ng/src/angularjs/utils/feedback.service.js
=
--- a/frontend-ng/src/angularjs/utils/feedback.service.js
+++ b/frontend-ng/src/angularjs/utils/feedback.service.js
@@ -35,9 +35,12 @@ export class FeedbackService {
this._showOnSubpage(this.$translate.instant(key, params));
}
- /* eslint-disable no-param-reassign */
showErrorResponseOnSubpage(response, defaultKey, errorMap = {}) {
-response = response || {};
+if (!response) {
+ this.showErrorOnSubpage(defaultKey);
+ return;
+}
+
if (response.message) {
this.$log.info(response.message);
}
=
frontend-ng/src/angularjs/utils/feedback.service.spec.js
=
--- a/frontend-ng/src/angularjs/utils/feedback.service.spec.js
+++ b/frontend-ng/src/angularjs/utils/feedback.service.spec.js
@@ -83,6 +83,14 @@ describe('FeedbackService', () => {
expect(toast.parent.calls.mostRecent().args[0]).toBeDefined();
});
+ it('handles null error responses', () => {
+FeedbackService.showErrorResponseOnSubpage(null, 'defaultKey');
+
+expect($log.info).not.toHaveBeenCalled();
+expect($translate.instant).toHaveBeenCalledWith('defaultKey', undefined);
+expect(toast.parent.calls.mostRecent().args[0]).toBeDefined();
+ });
+
it('logs messages at info level', () => {
const response = { message: 'test log message' };
FeedbackService.showErrorResponseOnSubpage(response, 'defaultKey');
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/23f541aeb80f495691b2f3c5a1d7ce2c238fd1f6
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms-release][release/11.0] CMS-10186 bumped cms-utilities version
Canh Ngo pushed to branch release/11.0 at cms-community / hippo-cms-release Commits: d37ac128 by Canh Ngo at 2016-07-20T11:07:56+02:00 CMS-10186 bumped cms-utilities version - - - - - 1 changed file: - pom.xml Changes: = pom.xml = --- a/pom.xml +++ b/pom.xml @@ -56,7 +56,7 @@ 3.0.0 3.0.0 3.0.0 -3.0.0 +3.0.1-SNAPSHOT 3.0.0 View it on GitLab: https://code.onehippo.org/cms-community/hippo-cms-release/commit/d37ac12849da300dabc567ec835800631ca5bbfe ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms-utilities] Pushed new branch bugfix/CMS-10186
Canh Ngo pushed new branch bugfix/CMS-10186 at cms-community / hippo-cms-utilities ___ 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][bugfix/CHANNELMGR-789] CHANNELMGR-789 reworked after review
Canh Ngo pushed to branch bugfix/CHANNELMGR-789 at cms-community /
hippo-addon-channel-manager
Commits:
a5188443 by Canh Ngo at 2016-07-13T12:47:28+02:00
CHANNELMGR-789 reworked after review
fixed the default 'response' value argument
- - - - -
1 changed file:
- frontend-ng/src/angularjs/utils/feedback.service.js
Changes:
=
frontend-ng/src/angularjs/utils/feedback.service.js
=
--- a/frontend-ng/src/angularjs/utils/feedback.service.js
+++ b/frontend-ng/src/angularjs/utils/feedback.service.js
@@ -35,7 +35,9 @@ export class FeedbackService {
this._showOnSubpage(this.$translate.instant(key, params));
}
- showErrorResponseOnSubpage(response = {}, defaultKey, errorMap = {}) {
+ /* eslint-disable no-param-reassign */
+ showErrorResponseOnSubpage(response, defaultKey, errorMap = {}) {
+response = response || {};
if (response.message) {
this.$log.info(response.message);
}
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/a5188443a9b679144044a32028ac47628461a5c0
___
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][bugfix/CHANNELMGR-804] CHANNELMGR-804 fixed the default 'response' value argument
Canh Ngo pushed to branch bugfix/CHANNELMGR-804 at cms-community /
hippo-addon-channel-manager
Commits:
1d2aba00 by Canh Ngo at 2016-07-19T17:02:41+02:00
CHANNELMGR-804 fixed the default 'response' value argument
(cherry picked from commit a5188443a9b679144044a32028ac47628461a5c0)
- - - - -
1 changed file:
- frontend-ng/src/angularjs/utils/feedback.service.js
Changes:
=
frontend-ng/src/angularjs/utils/feedback.service.js
=
--- a/frontend-ng/src/angularjs/utils/feedback.service.js
+++ b/frontend-ng/src/angularjs/utils/feedback.service.js
@@ -35,7 +35,9 @@ export class FeedbackService {
this._showOnSubpage(this.$translate.instant(key, params));
}
- showErrorResponseOnSubpage(response = {}, defaultKey, errorMap = {}) {
+ /* eslint-disable no-param-reassign */
+ showErrorResponseOnSubpage(response, defaultKey, errorMap = {}) {
+response = response || {};
if (response.message) {
this.$log.info(response.message);
}
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/1d2aba0060bf130f49287437e892586c018924f0
___
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-804
Canh Ngo pushed new branch bugfix/CHANNELMGR-804 at cms-community / hippo-addon-channel-manager ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager] Deleted branch bugfix/CHANNELMGR-789
Canh Ngo deleted branch bugfix/CHANNELMGR-789 at cms-community / hippo-addon-channel-manager ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager] Deleted branch bugfix/CHANNELMGR-807
Canh Ngo deleted branch bugfix/CHANNELMGR-807 at cms-community / hippo-addon-channel-manager ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager] Deleted branch bugfix/CHANNELMGR-806
Canh Ngo deleted branch bugfix/CHANNELMGR-806 at cms-community / hippo-addon-channel-manager ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-plugin-selections] Pushed new branch bugfix/HIPPLUG-1338
Canh Ngo pushed new branch bugfix/HIPPLUG-1338 at cms-community / hippo-plugin-selections ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-plugin-selections][bugfix/HIPPLUG-1337] HIPPLUG-1337 added TODO for next major release
Canh Ngo pushed to branch bugfix/HIPPLUG-1337 at cms-community /
hippo-plugin-selections
Commits:
2856f144 by Canh Ngo at 2016-07-15T11:41:02+02:00
HIPPLUG-1337 added TODO for next major release
- - - - -
1 changed file:
-
addon-cms/src/main/java/org/onehippo/forge/selection/frontend/plugin/DynamicMultiSelectPlugin.java
Changes:
=
addon-cms/src/main/java/org/onehippo/forge/selection/frontend/plugin/DynamicMultiSelectPlugin.java
=
---
a/addon-cms/src/main/java/org/onehippo/forge/selection/frontend/plugin/DynamicMultiSelectPlugin.java
+++
b/addon-cms/src/main/java/org/onehippo/forge/selection/frontend/plugin/DynamicMultiSelectPlugin.java
@@ -555,6 +555,11 @@ public class DynamicMultiSelectPlugin extends RenderPlugin
{
}
/**
+ * TODO: UnselectLink and SelectLink should be combined and declared as
static private classes.
+ * It should be done in the next major release, i.e., 5.x.
+ */
+
+/**
* Link unselect all values from a select list.
*/
protected class UnselectLink extends AjaxLink {
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-plugin-selections/commit/2856f14471f6647fa82fb12e559c6fd05710b35b
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms] Pushed new branch bugfix/CMS-10271
Canh Ngo pushed new branch bugfix/CMS-10271 at cms-community / hippo-cms ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms] Deleted branch bugfix/CMS-10232
Canh Ngo deleted branch bugfix/CMS-10232 at cms-community / hippo-cms ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms][bugfix/CMS-10232] CMS-10232 Improved the KeyMapModel
Canh Ngo pushed to branch bugfix/CMS-10232 at cms-community / hippo-cms
Commits:
0a850ade by Canh Ngo at 2016-07-15T11:21:33+02:00
CMS-10232 Improved the KeyMapModel
- - - - -
2 changed files:
- api/src/main/java/org/hippoecm/frontend/model/KeyMapModel.java
-
editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/field/FieldPluginEditor.java
Changes:
=
api/src/main/java/org/hippoecm/frontend/model/KeyMapModel.java
=
--- a/api/src/main/java/org/hippoecm/frontend/model/KeyMapModel.java
+++ b/api/src/main/java/org/hippoecm/frontend/model/KeyMapModel.java
@@ -17,6 +17,7 @@
package org.hippoecm.frontend.model;
+import java.io.Serializable;
import java.util.Map;
import org.apache.wicket.model.IModel;
@@ -27,27 +28,28 @@ import org.apache.wicket.model.IModel;
* @param type of the key in the map
* @param type of the value object in the map
*/
-public class KeyMapModel<K, V> implements IModel {
+public class KeyMapModel implements IModel {
private final K key;
-private final Map<K, V> map;
+private final IModel> mapModel;
-public KeyMapModel(final Map map, final K key) {
-this.map = map;
+public KeyMapModel(final IModel> mapModel, final K
key) {
+this.mapModel = mapModel;
this.key = key;
}
@Override
public V getObject() {
-return map.get(key);
+return mapModel.getObject().get(key);
}
@Override
public void setObject(final V object) {
-map.put(key, object);
+mapModel.getObject().put(key, object);
}
@Override
public void detach() {
+mapModel.detach();
}
}
\ No newline at end of file
=
editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/field/FieldPluginEditor.java
=
---
a/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/field/FieldPluginEditor.java
+++
b/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/field/FieldPluginEditor.java
@@ -46,10 +46,8 @@ public class FieldPluginEditor extends Panel {
cssProvider = new CssProvider();
-final IPluginConfig pluginConfig = model.getObject();
-
-final IModel captionModel = new KeyMapModel<>(pluginConfig,
"caption");
-final IModel hintModel = new KeyMapModel<>(pluginConfig,
"hint");
+final IModel captionModel = new KeyMapModel(model, "caption");
+final IModel hintModel = new KeyMapModel(model, "hint");
if (editable) {
add(new TextFieldWidget("caption-editor", captionModel));
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-cms/commit/0a850adecb64fc17735032fb10665cea734706d1
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-plugin-selections] Pushed new branch bugfix/HIPPLUG-1337
Canh Ngo pushed new branch bugfix/HIPPLUG-1337 at cms-community / hippo-plugin-selections ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms] Pushed new branch bugfix/CMS-10232
Canh Ngo pushed new branch bugfix/CMS-10232 at cms-community / hippo-cms ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-plugin-poll] Deleted branch bugfix/HIPPLUG-1324
Canh Ngo deleted branch bugfix/HIPPLUG-1324 at cms-community / hippo-plugin-poll ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-essentials][bugfix/ESSENTIALS-997] ESSENTIALS-997 rework after review
Canh Ngo pushed to branch bugfix/ESSENTIALS-997 at cms-community / hippo-essentials Commits: a5b69541 by Canh Ngo at 2016-07-01T14:44:27+02:00 ESSENTIALS-997 rework after review - Removed bower configuration related - Updated license header date - Updated README: required NodeJS from be 5.x.x - - - - - 7 changed files: - .gitattributes - README.md - dashboard/Gruntfile.js - dashboard/build.config.js - dashboard/pom.xml - dashboard/src/main/webapp/WEB-INF/jsp/index.jsp - pom.xml Changes: = .gitattributes = --- a/.gitattributes +++ b/.gitattributes @@ -88,10 +88,7 @@ components/hst/src/test/java/org/onehippo/cms7/essentials/components/rest/JaxbCo components/hst/src/test/resources/log4j.xml -text components/pom.xml -text dashboard-dependencies/pom.xml -text -dashboard/.bowerrc -text dashboard/.npmrc -text -dashboard/bower.json -text -dashboard/declutter.config.json -text dashboard/npm-shrinkwrap.json -text dashboard/package.json -text dashboard/pom.xml -text = README.md = --- a/README.md +++ b/README.md @@ -13,21 +13,16 @@ suggestions for improvements. * Java 8 * Maven 3.x * Git (http://git-scm.com) -* NodeJS (http://nodejs.org/) 0.10+ +* NodeJS (http://nodejs.org/) 5.x.x * Node Package Manager (http://npmjs.org) * Grunt (http://gruntjs.org) -* Bower (http://bower.io) -Grunt and Bower can be installed with Node Package Manager: +Grunt can be installed with Node Package Manager: ```shell -sudo npm install -g grunt-cli bower +sudo npm install -g grunt-cli ``` -If Bower fails to download zipped dependencies, make sure it uses decompress-zip >= 0.0.4. -(e.g. check the file /usr/lib/node_modules/bower/node_modules/decompress-zip/package.json, -and reinstall Bower if decompress-zip is too old). - ## Windows specific preparation instructions You can automate the installation of NodeJS and NPM using [Chocolatey package manager] @@ -38,12 +33,11 @@ The package for Node.js can be installed using (this will also install NPM): C:\> choco install nodejs.install __Note:__ Due to a [bug] (http://jira.codehaus.org/browse/MEXEC-137) in the exec-maven-plugin the Maven build of the -API module will fail as the exec-maven-plugin is unable to find the __grunt__ and __bower__ commands. To fix this, do +API module will fail as the exec-maven-plugin is unable to find the __grunt__ command. To fix this, do the following: * open folder `C:\Users\USER\AppData\Roaming\npm` * copy __grunt.cmd__ to __grunt.bat__ -* copy __bower.cmd__ to __bower.bat__ More information can be found [here] (http://stackoverflow.com/questions/22393785/exec-maven-plugin-says-cannot-run-specified-program-even-though-it-is-on-the-pa/22395703#22395703). = dashboard/Gruntfile.js = --- a/dashboard/Gruntfile.js +++ b/dashboard/Gruntfile.js @@ -1,5 +1,5 @@ /* - * Copyright 2015 Hippo B.V. (http://www.onehippo.com) + * Copyright 2015-2016 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. = dashboard/build.config.js = --- a/dashboard/build.config.js +++ b/dashboard/build.config.js @@ -1,5 +1,5 @@ /* - * Copyright 2015 Hippo B.V. (http://www.onehippo.com) + * Copyright 2015-2016 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. = dashboard/pom.xml = --- a/dashboard/pom.xml +++ b/dashboard/pom.xml @@ -1,6 +1,6 @@
[HippoCMS-scm] [Git][cms-community/hippo-frontend-theme] Deleted branch bugfix/test
Canh Ngo deleted branch bugfix/test at cms-community / hippo-frontend-theme ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-frontend-theme] Pushed new branch bugfix/test
Canh Ngo pushed new branch bugfix/test at cms-community / hippo-frontend-theme ___ 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][bugfix/CHANNELMGR-787] CHANNELMGR-787 Used "non"-minified js libraries in karma test
Canh Ngo pushed to branch bugfix/CHANNELMGR-787 at cms-community /
hippo-addon-channel-manager
Commits:
f4bd9c6f by Canh Ngo at 2016-06-30T16:07:25+02:00
CHANNELMGR-787 Used non-minified js libraries in karma test
- - - - -
1 changed file:
- frontend/karma.config.js
Changes:
=
frontend/karma.config.js
=
--- a/frontend/karma.config.js
+++ b/frontend/karma.config.js
@@ -27,17 +27,17 @@ module.exports = function karmaConfig(config) {
files: [
// dependencies
- build.npmDir + '/jquery/dist/jquery.min.js',
- build.npmDir + '/angular/angular.min.js',
- build.npmDir + '/angular-ui-bootstrap/ui-bootstrap.min.js',
+ build.npmDir + '/jquery/dist/jquery.js',
+ build.npmDir + '/angular/angular.js',
+ build.npmDir + '/angular-ui-bootstrap/ui-bootstrap.js',
build.npmDir + '/hippo-theme/dist/js/main.js',
- build.npmDir + '/angular-translate/dist/angular-translate.min.js',
- build.npmDir +
'/angular-translate-loader-static-files/angular-translate-loader-static-files.min.js',
- build.npmDir + '/angular-ui-router/release/angular-ui-router.min.js',
- build.npmDir + '/angular-ui-tree/dist/angular-ui-tree.min.js',
- build.npmDir + '/angular-chosen-localytics/dist/angular-chosen.min.js',
- build.npmDir + '/angular-aria/angular-aria.min.js',
- build.npmDir +
'/hippo-addon-channel-manager-angularjs-api/dist/js/main.min.js',
+ build.npmDir + '/angular-translate/dist/angular-translate.js',
+ build.npmDir +
'/angular-translate-loader-static-files/angular-translate-loader-static-files.js',
+ build.npmDir + '/angular-ui-router/release/angular-ui-router.js',
+ build.npmDir + '/angular-ui-tree/dist/angular-ui-tree.js',
+ build.npmDir + '/angular-chosen-localytics/dist/angular-chosen.js',
+ build.npmDir + '/angular-aria/angular-aria.js',
+ build.npmDir +
'/hippo-addon-channel-manager-angularjs-api/dist/js/main.js',
// testing dependencies
build.npmDir + '/jasmine-jquery/lib/jasmine-jquery.js',
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/f4bd9c6f65aa7b68e8d69ac9de2c69de7887fd16
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms] Pushed new branch bugfix/CMS-10245
Canh Ngo pushed new branch bugfix/CMS-10245 at cms-community / hippo-cms ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms] Pushed new branch bugfix/CMS-10247
Canh Ngo pushed new branch bugfix/CMS-10247 at cms-community / hippo-cms ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager] Pushed new branch bugfix/CHANNELMGR-787
Canh Ngo pushed new branch bugfix/CHANNELMGR-787 at cms-community / hippo-addon-channel-manager ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms] Deleted branch bugfix/CMS-10242
Canh Ngo deleted branch bugfix/CMS-10242 at cms-community / hippo-cms ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms] Deleted branch bugfix/CMS-10237
Canh Ngo deleted branch bugfix/CMS-10237 at cms-community / hippo-cms ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms][bugfix/CMS-10237] CMS-10237 rework after review
Canh Ngo pushed to branch bugfix/CMS-10237 at cms-community / hippo-cms
Commits:
2778d564 by Canh Ngo at 2016-06-29T16:04:55+02:00
CMS-10237 rework after review
- Updated date in license headers
- Renamed grunt tasks from 'bower' to 'npm'
- - - - -
8 changed files:
- api/Gruntfile.js
- api/build.config.js
- api/pom.xml
-
api/src/main/java/org/hippoecm/frontend/plugins/jquery/upload/multiple/GalleryFileUploadBehavior.java
-
api/src/main/resources/org/hippoecm/frontend/extjs/hippotheme/ExtHippoTheme.scss
- api/src/main/styling/styles/_ajax_loader.scss
- api/src/main/styling/styles/_hippo_logo.scss
- api/src/main/styling/styles/main.scss
Changes:
=
api/Gruntfile.js
=
--- a/api/Gruntfile.js
+++ b/api/Gruntfile.js
@@ -234,8 +234,8 @@ module.exports = function (grunt) {
src: '<%= build.tmp %>'
},
- // clean bower components
- bower: {
+ // clean npm components
+ npm: {
src: '<%= build.npmDir %>'
},
=
api/build.config.js
=
--- a/api/build.config.js
+++ b/api/build.config.js
@@ -1,5 +1,5 @@
/*
- * Copyright 2015 Hippo B.V. (http://www.onehippo.com)
+ * Copyright 2015-2016 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.
=
api/pom.xml
=
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -1,6 +1,6 @@
[HippoCMS-scm] [Git][cms-community/hippo-frontend-theme] Pushed new branch bugfix/HIPPOTHEME-132
Canh Ngo pushed new branch bugfix/HIPPOTHEME-132 at cms-community / hippo-frontend-theme ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-frontend-theme] Pushed new branch bugfix/HIPPOTHEME-133
Canh Ngo pushed new branch bugfix/HIPPOTHEME-133 at cms-community / hippo-frontend-theme ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-frontend-theme][bugfix/HIPPOTHEME-131] HIPPOTHEME-131 rework after review
Canh Ngo pushed to branch bugfix/HIPPOTHEME-131 at cms-community / hippo-frontend-theme Commits: 95f533d6 by Canh Ngo at 2016-06-29T12:07:03+02:00 HIPPOTHEME-131 rework after review - Updated date in license header - Removed bower_components in .gitignore - - - - - 6 changed files: - .gitignore - Gruntfile.js - build.config.js - maven-distribution.xml - src/styles/main.scss - src/styles/vendor.scss Changes: = .gitignore = --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,5 @@ /*.iml /.idea -/bower_components demo/*.iml demo/.idea demo/.tmp = Gruntfile.js = --- a/Gruntfile.js +++ b/Gruntfile.js @@ -1,5 +1,5 @@ /* - * Copyright 2015 Hippo B.V. (http://www.onehippo.com) + * Copyright 2015-2016 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. = build.config.js = --- a/build.config.js +++ b/build.config.js @@ -1,5 +1,5 @@ /* - * Copyright 2015 Hippo B.V. (http://www.onehippo.com) + * Copyright 2015-2016 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. = maven-distribution.xml = --- a/maven-distribution.xml +++ b/maven-distribution.xml @@ -1,6 +1,6 @@
[HippoCMS-scm] [Git][cms-community/hippo-frontend-theme] Deleted branch bugfix/HIPPOTHEME-131
Canh Ngo deleted branch bugfix/HIPPOTHEME-131 at cms-community / hippo-frontend-theme ___ 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][bugfix/CHANNELMGR-786] CHANNELMGR-786 remove bower-specific exception from license check exclusions
Canh Ngo pushed to branch bugfix/CHANNELMGR-786 at cms-community / hippo-addon-channel-manager Commits: f861b9ce by Tobias Jeger at 2016-06-29T09:17:56+02:00 CHANNELMGR-786 remove bower-specific exception from license check exclusions (cherry picked from commit 80daad4600caccea06220243574b25980e23a718) - - - - - 1 changed file: - pom.xml Changes: = pom.xml = --- a/pom.xml +++ b/pom.xml @@ -200,8 +200,9 @@ frontend-ng/.* frontend-ng/*.md -frontend-ng/node_modules/**/* -frontend-ng/bower_components/**/* + + +**/node_modules/**/* frontend-ng/coverage/**/* View it on GitLab: https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/f861b9ce75c23d112a653ad1d594e5a18269b1a0 ___ 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-786
Canh Ngo pushed new branch bugfix/CHANNELMGR-786 at cms-community / hippo-addon-channel-manager ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
