[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager] Deleted branch feature/cmng-psp1-CHANNELMGR-634
Tobias Jeger deleted branch feature/cmng-psp1-CHANNELMGR-634 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][feature/cmng-psp1-CHANNELMGR-634] CHANNELMGR-634 reword the new channel overview list column
Tobias Jeger pushed to branch feature/cmng-psp1-CHANNELMGR-634 at cms-community / hippo-addon-channel-manager Commits: 4a6539dc by Tobias Jeger at 2016-05-27T13:57:43+02:00 CHANNELMGR-634 reword the new channel overview list column - - - - - 3 changed files: - frontend/src/main/java/org/onehippo/cms7/channelmanager/channels/ChannelGridPanel.java - frontend/src/main/resources/org/onehippo/cms7/channelmanager/channels/ChannelGridPanel.properties - frontend/src/main/resources/org/onehippo/cms7/channelmanager/channels/ChannelStore.properties Changes: = frontend/src/main/java/org/onehippo/cms7/channelmanager/channels/ChannelGridPanel.java = --- a/frontend/src/main/java/org/onehippo/cms7/channelmanager/channels/ChannelGridPanel.java +++ b/frontend/src/main/java/org/onehippo/cms7/channelmanager/channels/ChannelGridPanel.java @@ -202,21 +202,14 @@ public class ChannelGridPanel extends ExtPanel { } private void createHstConfigEditorFieldConfig(final JSONObject fieldConfig) throws JSONException { -final String tooltip = getLocalizer().getString("tooltip.hstconfigeditor", this); final String labelAction = getLocalizer().getString("action.hstconfigeditor", this); -final String labelNotAvailable = getLocalizer().getString("action.hstconfigeditor.notavailable", this); fieldConfig.put("xtype", "templatecolumn"); final StringBuilder templateBuilder = new StringBuilder(); templateBuilder.append(""); -templateBuilder.append("" + labelAction + ""); -templateBuilder.append(""); - -// extjs 3.4 does not support 'else' operator in xtemplate -templateBuilder.append(""); -templateBuilder.append(labelNotAvailable); +templateBuilder.append(""); +templateBuilder.append(labelAction); +templateBuilder.append(""); templateBuilder.append(""); fieldConfig.put("tpl", templateBuilder.toString()); = frontend/src/main/resources/org/onehippo/cms7/channelmanager/channels/ChannelGridPanel.properties = --- a/frontend/src/main/resources/org/onehippo/cms7/channelmanager/channels/ChannelGridPanel.properties +++ b/frontend/src/main/resources/org/onehippo/cms7/channelmanager/channels/ChannelGridPanel.properties @@ -1,6 +1,5 @@ action.add.channel=Add Channel -action.hstconfigeditor=Open -action.hstconfigeditor.notavailable=Not available +action.hstconfigeditor=Edit configuration action.preview=Preview action.grouping=Grouping @@ -16,7 +15,6 @@ menu.sort.descending=Sort Descending title=Channel Manager tooltip.name.prefix=Edit -tooltip.hstconfigeditor=Open URL and Navigation Management tooltip.live=Open live channel tooltip.preview=Preview channel in new window = frontend/src/main/resources/org/onehippo/cms7/channelmanager/channels/ChannelStore.properties = --- a/frontend/src/main/resources/org/onehippo/cms7/channelmanager/channels/ChannelStore.properties +++ b/frontend/src/main/resources/org/onehippo/cms7/channelmanager/channels/ChannelStore.properties @@ -1,7 +1,7 @@ field.composerModeEnabled=Composer Mode Enabled field.contentRoot=Content Root field.hostname=Host Name -field.hstConfigEditor=URL and Navigation Management +field.hstConfigEditor= field.hstConfigPath=Config Path field.hstMountPoint=Mount Point field.contextPath=Context Path View it on GitLab: https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/4a6539dc3e35775d6fa236aa17e238a595cfa940 ___ 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/chinese-translation] CMS-10140 Using CKEditor development version
Oscar Scholten pushed to branch feature/chinese-translation at cms-community / hippo-cms Commits: 2241220a by Oscar Scholten at 2016-05-27T13:56:31+02:00 CMS-10140 Using CKEditor development version - - - - - 1 changed file: - pom.xml Changes: = pom.xml = --- a/pom.xml +++ b/pom.xml @@ -129,7 +129,7 @@ 1.01.12 1.01.04 1.01.05 -4.5.5-h1 + 4.5.5-h2-chinese-translation-SNAPSHOT nl,fr,it,de View it on GitLab: https://code.onehippo.org/cms-community/hippo-cms/commit/2241220ae76e2072fbd120ec7b999f553a85dcc6 ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [onehippo/ckeditor] 87bb9d: CMS-10140 Reshuffling the language files so CKEdit...
Branch: refs/heads/feature/chinese-translation Home: https://github.com/onehippo/ckeditor Commit: 87bb9dac8e419e4bd0a4bfb95f38e7f17206ba1e https://github.com/onehippo/ckeditor/commit/87bb9dac8e419e4bd0a4bfb95f38e7f17206ba1e Author: Oscar ScholtenDate: 2016-05-27 (Fri, 27 May 2016) Changed paths: R lang/zh-cn.js A lang/zh-tw.js M lang/zh.js Log Message: --- CMS-10140 Reshuffling the language files so CKEditor display simplified Chinese when the CMS' locale is set to "zh" Commit: 6603a2d3710fe53a26c5a73e6f24b28ebcbb5408 https://github.com/onehippo/ckeditor/commit/6603a2d3710fe53a26c5a73e6f24b28ebcbb5408 Author: Oscar Scholten Date: 2016-05-27 (Fri, 27 May 2016) Changed paths: M dev/builder/build-config.js Log Message: --- CMS-10140 Adjusting build config to include simplified Chinese Compare: https://github.com/onehippo/ckeditor/compare/1f9ceb4863ca...6603a2d3710f___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][feature/cmng-psp1-CHANNELMGR-605] CHANNELMGR-605 Remove double copyright header
Tobias Jeger pushed to branch feature/cmng-psp1-CHANNELMGR-605 at cms-community / hippo-addon-channel-manager Commits: aad93e24 by Tobias Jeger at 2016-05-27T13:40:32+02:00 CHANNELMGR-605 Remove double copyright header - - - - - 1 changed file: - frontend-ng/src/angularjs/channel/actions/settings/property/helpIcon/helpIcon.html Changes: = frontend-ng/src/angularjs/channel/actions/settings/property/helpIcon/helpIcon.html = --- a/frontend-ng/src/angularjs/channel/actions/settings/property/helpIcon/helpIcon.html +++ b/frontend-ng/src/angularjs/channel/actions/settings/property/helpIcon/helpIcon.html @@ -13,21 +13,6 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - {{ text }} View it on GitLab: https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/aad93e244d88585696e1fd9ccbbba7caec2dec28 ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms-l10n-tooling] Pushed new branch feature/CMS-10069
Ard Schrijvers pushed new branch feature/CMS-10069 at cms-community / hippo-cms-l10n-tooling ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager] Pushed new branch feature/cmng-psp1-CHANNELMGR-337
Mathijs den Burger pushed new branch feature/cmng-psp1-CHANNELMGR-337 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-site-toolkit][bugfix/HSTTWO-3658] HSTTWO-3658 SearchInputParsingUtils should not allow apostrophe ’
Ard Schrijvers pushed to branch bugfix/HSTTWO-3658 at cms-community / hippo-site-toolkit Commits: 4411f8a6 by Ard Schrijvers at 2016-05-27T13:03:16+02:00 HSTTWO-3658 SearchInputParsingUtils should not allow apostrophe ’ Apply fix as suggested by Saimir (great catch!). First foldToASCIIReplacer and then invoke removeInvalidAndEscapeChars, otherwise apostrophe variants are not removed but only ' - - - - - 2 changed files: - content-beans/src/main/java/org/hippoecm/hst/util/SearchInputParsingUtils.java - content-beans/src/test/java/org/hippoecm/hst/util/TestSearchInputParsingUtils.java Changes: = content-beans/src/main/java/org/hippoecm/hst/util/SearchInputParsingUtils.java = --- a/content-beans/src/main/java/org/hippoecm/hst/util/SearchInputParsingUtils.java +++ b/content-beans/src/main/java/org/hippoecm/hst/util/SearchInputParsingUtils.java @@ -1,7 +1,7 @@ package org.hippoecm.hst.util; /** - * 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. @@ -63,12 +63,12 @@ public final class SearchInputParsingUtils { if (input == null) { return null; } -String parsed = compressWhitespace(input); +String parsed = EncodingUtils.foldToASCIIReplacer(input); +parsed = compressWhitespace(parsed); parsed = removeInvalidAndEscapeChars(parsed, allowSingleNonLeadingWildCardPerTerm, ignore); parsed = removeLeadingOrTrailingOrOperator(parsed); parsed = rewriteNotOperatorsToMinus(parsed); parsed = removeLeadingAndTrailingAndReplaceWithSpaceAndOperators(parsed); -parsed = EncodingUtils.foldToASCIIReplacer(parsed); log.debug("Rewrote input '{}' to '{}'", input, parsed); return parsed; } = content-beans/src/test/java/org/hippoecm/hst/util/TestSearchInputParsingUtils.java = --- a/content-beans/src/test/java/org/hippoecm/hst/util/TestSearchInputParsingUtils.java +++ b/content-beans/src/test/java/org/hippoecm/hst/util/TestSearchInputParsingUtils.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. @@ -178,4 +178,11 @@ public class TestSearchInputParsingUtils { assertEquals("No dash",SearchInputParsingUtils.removeInvalidAndEscapeChars("No dash -", false)); assertEquals("No dash",SearchInputParsingUtils.removeInvalidAndEscapeChars("No dash -", true)); } + +@Test +public void testSearchInputParsingUtils_parse_differentApostrophes() throws Exception { +assertEquals("The quick", SearchInputParsingUtils.parse("The quic'k", true)); +assertEquals("The quick", SearchInputParsingUtils.parse("The quic’k", true)); +assertEquals("The quick", SearchInputParsingUtils.parse("The quic‘k", true)); +} } View it on GitLab: https://code.onehippo.org/cms-community/hippo-site-toolkit/commit/4411f8a6b29d056aca8fc1f240aca0205f21310a ___ 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 bugfix/HSTTWO-3658
Ard Schrijvers pushed new branch bugfix/HSTTWO-3658 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-release][release/10.2] REPO-1: Bumping to latest snapshot version
Junaidh Kadhar Sheriff pushed to branch release/10.2 at cms-community / hippo-cms-release Commits: 6e43f144 by Junaidh Kadhar Sheriff at 2016-05-27T12:17:25+02:00 REPO-1: Bumping to latest snapshot version - - - - - 1 changed file: - pom.xml Changes: = pom.xml = --- a/pom.xml +++ b/pom.xml @@ -51,7 +51,7 @@ 2.2.0 3.2.2-SNAPSHOT 3.2.0 -3.2.3 +3.2.4-SNAPSHOT 2.2.0 2.2.0 2.2.0 View it on GitLab: https://code.onehippo.org/cms-community/hippo-cms-release/commit/6e43f144f6e4ae8ed011a6fb4844df75c83246cd ___ 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/7.8] CMS-10130: Minor correction
Junaidh Kadhar Sheriff pushed to branch release/7.8 at cms-community / hippo-cms-release Commits: 6e60503a by Junaidh Kadhar Sheriff at 2016-05-27T12:13:08+02:00 CMS-10130: Minor correction - - - - - 1 changed file: - pom.xml Changes: = pom.xml = --- a/pom.xml +++ b/pom.xml @@ -36,6 +36,7 @@ scm:git:https://code.onehippo.org/cms-community/hippo-cms-release.git scm:git:g...@code.onehippo.org:cms-community/hippo-cms-release.git https://code.onehippo.org/cms-community/hippo-cms-release +HEAD View it on GitLab: https://code.onehippo.org/cms-community/hippo-cms-release/commit/6e60503a641bb70d1f3a2b294f843ee24b069a0b ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager] Pushed new branch feature/cmng-psp1-CHANNELMGR-694
Mark Lenser pushed new branch feature/cmng-psp1-CHANNELMGR-694 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][feature/cmng-psp1-CHANNELMGR-638a] CHANNELMGR-688: Fix local parameters check
Mark Lenser pushed to branch feature/cmng-psp1-CHANNELMGR-638a at cms-community / hippo-addon-channel-manager Commits: 1f559106 by Mark at 2016-05-27T11:32:06+02:00 CHANNELMGR-688: Fix local parameters check - - - - - 2 changed files: - frontend-ng/src/angularjs/channel/menu/editor.controller.js - frontend-ng/src/angularjs/channel/menu/editor.html Changes: = frontend-ng/src/angularjs/channel/menu/editor.controller.js = --- a/frontend-ng/src/angularjs/channel/menu/editor.controller.js +++ b/frontend-ng/src/angularjs/channel/menu/editor.controller.js @@ -149,4 +149,8 @@ export class MenuEditorCtrl { deleteItem(item) { this._confirmDelete(item).then(() => this._doDelete(item)); } + + hasLocalParameters(item) { +return Object.keys(item.localParameters).length !== 0; + } } = 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 @@ -116,7 +116,7 @@ - + {{ 'ADVANCED_SETTINGS' | translate }} View it on GitLab: https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/1f559106a85f3f3909d85e19358cec80c33ba5a1 ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][feature/cmng-psp1-CHANNELMGR-638a] 2 commits: CHANNELMGR-688: Keep subpage scroll
Mark Lenser pushed to branch feature/cmng-psp1-CHANNELMGR-638a at cms-community / hippo-addon-channel-manager Commits: 5c23ca65 by Mark at 2016-05-27T11:14:28+02:00 CHANNELMGR-688: Keep subpage scroll - - - - - 07686ba2 by Mark at 2016-05-27T11:14:39+02:00 CHANNELMGR-688: Adjust the icons - - - - - 2 changed files: - frontend-ng/src/angularjs/channel/menu/editor.html - frontend-ng/src/styles/_subpage.scss 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 @@ -39,8 +39,8 @@ data-nodrag stop-propagation> - add_circle_outline - remove_circle_outline + add + remove {{ item.title }} @@ -51,8 +51,8 @@ aria-label="{{ 'EDIT' | translate }}" ng-click="menuEditor.editItem(item)"> - keyboard_arrow_down - keyboard_arrow_up + expand_more + expand_less = frontend-ng/src/styles/_subpage.scss = --- a/frontend-ng/src/styles/_subpage.scss +++ b/frontend-ng/src/styles/_subpage.scss @@ -12,3 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. +.subpage-feedback-parent > div { + overflow-y: scroll; +} View it on GitLab: https://code.onehippo.org/cms-community/hippo-addon-channel-manager/compare/4b477a74747a370105a06add927a7c6ed4f4d1d3...07686ba2a143b0ad98b116264cd2f8524c943764 ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager] Pushed new branch feature/cmng-psp1-CHANNELMGR-692
Tobias Jeger pushed new branch feature/cmng-psp1-CHANNELMGR-692 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] [onehippo/ckeditor] 1f9ceb: CMS-10139 Setting chinese-translation development ...
Branch: refs/heads/feature/chinese-translation Home: https://github.com/onehippo/ckeditor Commit: 1f9ceb4863ca96c05ebc2c947dedeb4060519bcb https://github.com/onehippo/ckeditor/commit/1f9ceb4863ca96c05ebc2c947dedeb4060519bcb Author: Oscar ScholtenDate: 2016-05-27 (Fri, 27 May 2016) Changed paths: M pom.xml Log Message: --- CMS-10139 Setting chinese-translation development version ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn