[HippoCMS-scm] [Git][cms-community/hippo-site-toolkit] Deleted branch bugfix/HSTTWO-3450
Oscar Scholten deleted branch bugfix/HSTTWO-3450 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][master] 3 commits: CMS-10432 use the formatter with the user's locale
Jeroen Hoffman pushed to branch master at cms-community / hippo-cms
Commits:
286db122 by Bert Leunis at 2016-09-12T16:11:27+02:00
CMS-10432 use the formatter with the user's locale
- - - - -
a55155c9 by Jeroen Hoffman at 2016-10-13T12:29:24+02:00
CMS-10432 Merge master changes into bugfix branch
- - - - -
711a7288 by Jeroen Hoffman at 2016-10-13T12:33:45+02:00
CMS-10432 Reintegrate bugfix branch into master
- - - - -
1 changed file:
-
api/src/main/java/org/hippoecm/frontend/plugins/standards/datetime/ZonedDateLabel.java
Changes:
=
api/src/main/java/org/hippoecm/frontend/plugins/standards/datetime/ZonedDateLabel.java
=
---
a/api/src/main/java/org/hippoecm/frontend/plugins/standards/datetime/ZonedDateLabel.java
+++
b/api/src/main/java/org/hippoecm/frontend/plugins/standards/datetime/ZonedDateLabel.java
@@ -20,7 +20,6 @@ import java.time.ZonedDateTime;
import java.time.format.DateTimeFormatter;
import java.time.format.FormatStyle;
import java.util.Locale;
-import java.util.Optional;
import org.apache.commons.lang.StringUtils;
import org.apache.wicket.Session;
@@ -57,10 +56,10 @@ public class ZonedDateLabel extends Label {
@Override
public String getObject() {
final DateTimeFormatter formatter =
DateTimeFormatter.ofLocalizedDate(dateStyle);
-formatter.withLocale(getLocale());
+final DateTimeFormatter withLocale =
formatter.withLocale(getLocale());
final ZonedDateTime zonedDateTime = model.getObject();
-return zonedDateTime == null ? StringUtils.EMPTY :
zonedDateTime.format(formatter);
+return zonedDateTime == null ? StringUtils.EMPTY :
zonedDateTime.format(withLocale);
}
private static Locale getLocale() {
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-cms/compare/6f9560f4a849c263d741a5f2567b4b765f6f07d5...711a72881dd9d862324b2a408bea041049f1fd2e
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][feature/visual-editing-psp1] CHANNELMGR-863 Add missing license headers
Arthur Bogaart pushed to branch feature/visual-editing-psp1 at cms-community /
hippo-addon-channel-manager
Commits:
84cd9299 by Arthur Bogaart at 2016-10-13T12:58:23+02:00
CHANNELMGR-863 Add missing license headers
- - - - -
3 changed files:
- frontend-ng/gulpfile.js
- frontend-ng/src/index.spec.js
- frontend-ng/src/vendor.scss
Changes:
=
frontend-ng/gulpfile.js
=
--- a/frontend-ng/gulpfile.js
+++ b/frontend-ng/gulpfile.js
@@ -1,3 +1,19 @@
+/*
+ * 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.
+ */
+
const gulp = require('gulp');
const HubRegistry = require('gulp-hub');
const hub = new HubRegistry(['node_modules/frontend-build/gulpfile.js']);
=
frontend-ng/src/index.spec.js
=
--- a/frontend-ng/src/index.spec.js
+++ b/frontend-ng/src/index.spec.js
@@ -1,3 +1,19 @@
+/*
+ * 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.
+ */
+
import 'angular';
import 'angular-mocks';
=
frontend-ng/src/vendor.scss
=
--- a/frontend-ng/src/vendor.scss
+++ b/frontend-ng/src/vendor.scss
@@ -1,3 +1,17 @@
+// 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.
+
// Open Sans font
@import 'styles/variables';
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/84cd92992b4a1153579091a91de4a5d5c9508910
___
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-10433 hide timezone selection always on the console login page
Jeroen Hoffman pushed to branch master at cms-community / hippo-cms
Commits:
26ab86bf by Bert Leunis at 2016-09-13T11:41:24+02:00
CMS-10433 hide timezone selection always on the console login page
- - - - -
2375b84d by Jeroen Hoffman at 2016-10-13T13:33:40+02:00
CMS-10433 Merge master changes into bugfix branch
- - - - -
b45af2da by Jeroen Hoffman at 2016-10-13T13:40:13+02:00
CMS-10433 Reintegrate bugfix branch into master
- - - - -
1 changed file:
-
engine/src/main/java/org/hippoecm/frontend/plugins/login/DefaultLoginPlugin.java
Changes:
=
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
@@ -34,9 +34,11 @@ import
org.apache.wicket.request.resource.JavaScriptResourceReference;
import org.apache.wicket.request.resource.ResourceReference;
import org.apache.wicket.util.template.PackageTextTemplate;
import org.apache.wicket.util.template.TextTemplate;
+import org.hippoecm.frontend.Main;
import org.hippoecm.frontend.plugin.IPluginContext;
import org.hippoecm.frontend.plugin.config.IPluginConfig;
import org.hippoecm.frontend.session.UserSession;
+import org.hippoecm.frontend.util.WebApplicationHelper;
public class DefaultLoginPlugin extends SimpleLoginPlugin {
@@ -80,7 +82,8 @@ public class DefaultLoginPlugin extends SimpleLoginPlugin {
super(id, autoComplete, locales, handler);
final IPluginConfig config = getPluginConfig();
-final boolean isTimeZoneVisible =
config.getBoolean(SHOW_TIMEZONES_CONFIG_PARAM);
+final boolean consoleLogin =
WebApplicationHelper.getApplicationName().equals(Main.PLUGIN_APPLICATION_VALUE_CONSOLE);
+final boolean isTimeZoneVisible = !consoleLogin &&
config.getBoolean(SHOW_TIMEZONES_CONFIG_PARAM);
if (isTimeZoneVisible) {
availableTimeZones =
getSelectableTimezones(config.getStringArray(SELECTABLE_TIMEZONES_CONFIG_PARAM));
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-cms/compare/711a72881dd9d862324b2a408bea041049f1fd2e...b45af2dab439174ea6bf62b8d45bc391098c9ed4
___
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/visual-editing-psp1-CHANNELMGR-930
Mark Lenser pushed new branch feature/visual-editing-psp1-CHANNELMGR-930 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/visual-editing-psp1] CHANNELMGR-939 Improve order of commands in README
Joeri de Gooijer pushed to branch feature/visual-editing-psp1 at cms-community / hippo-addon-channel-manager Commits: 0da4bacf by Joeri de Gooijer at 2016-10-13T14:10:57+02:00 CHANNELMGR-939 Improve order of commands in README - - - - - 1 changed file: - frontend-ng/README.md Changes: = frontend-ng/README.md = --- a/frontend-ng/README.md +++ b/frontend-ng/README.md @@ -8,12 +8,6 @@ globally via `npm install -g gulp-cli` and use the gulp cli directly, initiate gulp tasks via `npm run` or simply stick with the predefined `npm start` and `npm test` described below. -# Installation -### Install project dependencies -Run the commands below in the project root directory. - -$ npm install - # Development of AngularJS code 1. Compile channel manager with JRebel @@ -29,12 +23,14 @@ Run the commands below in the project root directory. $ npm start -# Useful commands -## When starting gulp tasks through npm -List all gulp tasks available +# Installation +### Install project dependencies +Run the commands below in the project root directory. -$ npm run gulp -- --tasks +$ npm install +# Useful commands +## When starting gulp tasks through npm Serve and watch files for development $ npm start @@ -47,6 +43,10 @@ Run unit tests once (Chrome needs to be installed) $ npm test +List all gulp tasks available + +$ npm run gulp -- --tasks + If you do not install the gulp-cli you can still run any gulp task with npm $ npm run gulp [some defined gulp task] View it on GitLab: https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/0da4bacfdca269f472187c9594f2498c9d21ce2f ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-addon-hst-configuration-editor][release/3.0] 2 commits: HSTCONFIGEDIT-203 for new sitemap items set the selected page design to the firs…
Jeroen Hoffman pushed to branch release/3.0 at cms-community /
hippo-addon-hst-configuration-editor
Commits:
f070af49 by Jasper Floor at 2016-10-07T15:35:48+02:00
HSTCONFIGEDIT-203 for new sitemap items set the selected page design to the
first item in the list - forward port of 202
- - - - -
511e78ae by Jeroen Hoffman at 2016-10-13T14:28:52+02:00
HSTCONFIGEDIT-203 Reintegrate branch 'bugfix/HSTCONFIGEDIT-203' into
release/3.0
- - - - -
1 changed file:
-
frontend/src/main/java/org/hippoecm/hst/plugins/frontend/editor/description/DescriptionPicker.java
Changes:
=
frontend/src/main/java/org/hippoecm/hst/plugins/frontend/editor/description/DescriptionPicker.java
=
---
a/frontend/src/main/java/org/hippoecm/hst/plugins/frontend/editor/description/DescriptionPicker.java
+++
b/frontend/src/main/java/org/hippoecm/hst/plugins/frontend/editor/description/DescriptionPicker.java
@@ -272,14 +272,18 @@ public class DescriptionPicker extends Panel {
current = 0;
String selected = getDefaultModelObjectAsString();
if (selected != null) {
-int cnt = 0;
-for (Descriptive descriptive : descriptives) {
-final String name = getName(descriptive);
-if (selected.equals(name)) {
-current = cnt;
-break;
+if (StringUtils.isEmpty(selected)) {
+setDefaultModelObjectByCurrentSelection();
+} else {
+int cnt = 0;
+for (Descriptive descriptive : descriptives) {
+final String name = getName(descriptive);
+if (selected.equals(name)) {
+current = cnt;
+break;
+}
+cnt++;
}
-cnt++;
}
}
}
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-hst-configuration-editor/compare/7fe364060fd25fd68bb96263bad0bd6094b46970...511e78ae8fb7c9c9da32c817e6f074d5585f059e
___
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-16 bump HST configuration editor version to 3.0.2-SNAPSHOT on behalf of HSTCONFIGEDIT-203
Jeroen Hoffman pushed to branch release/11.0 at cms-community / hippo-cms-release Commits: ff9faafe by Jeroen Hoffman at 2016-10-13T14:33:04+02:00 CMS-16 bump HST configuration editor version to 3.0.2-SNAPSHOT on behalf of HSTCONFIGEDIT-203 - - - - - 1 changed file: - pom.xml Changes: = pom.xml = --- a/pom.xml +++ b/pom.xml @@ -41,7 +41,7 @@ 11.0.3-SNAPSHOT - 3.0.1 + 3.0.2-SNAPSHOT 4.0.3-SNAPSHOT 3.0.0 3.0.0 View it on GitLab: https://code.onehippo.org/cms-community/hippo-cms-release/commit/ff9faafe3a9c706b290a701474c7b8d779646898 ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-site-toolkit][master] HSTTWO-3838 check whether the constrain.dateResolution() is not null
Ard Schrijvers pushed to branch master at cms-community / hippo-site-toolkit
Commits:
bb37a897 by Ard Schrijvers at 2016-10-13T14:43:42+02:00
HSTTWO-3838 check whether the constrain.dateResolution() is not null
Note to *not* fallback to defaultResolution because defaultResolution can be
null as well
- - - - -
2 changed files:
-
content-beans/src/main/java/org/hippoecm/hst/content/beans/query/builder/FieldConstraint.java
-
content-beans/src/test/java/org/hippoecm/hst/content/beans/query/builderdiffpackage/TestHstQueryBuilder.java
Changes:
=
content-beans/src/main/java/org/hippoecm/hst/content/beans/query/builder/FieldConstraint.java
=
---
a/content-beans/src/main/java/org/hippoecm/hst/content/beans/query/builder/FieldConstraint.java
+++
b/content-beans/src/main/java/org/hippoecm/hst/content/beans/query/builder/FieldConstraint.java
@@ -64,25 +64,25 @@ public class FieldConstraint extends Constraint {
}
}
} else if (operator == FilterConstraint.Operator.GE) {
-if (value instanceof Calendar) {
+if (value instanceof Calendar && constraint.dateResolution()
!= null) {
filter.addGreaterOrEqualThan(builder.fieldName(),
(Calendar)value, constraint.dateResolution());
} else {
filter.addGreaterOrEqualThan(builder.fieldName(), value);
}
} else if (operator == FilterConstraint.Operator.GT) {
-if (value instanceof Calendar) {
+if (value instanceof Calendar && constraint.dateResolution()
!= null) {
filter.addGreaterThan(builder.fieldName(),
(Calendar)value, constraint.dateResolution());
} else {
filter.addGreaterThan(builder.fieldName(), value);
}
} else if (operator == FilterConstraint.Operator.LE) {
-if (value instanceof Calendar) {
+if (value instanceof Calendar && constraint.dateResolution()
!= null) {
filter.addLessOrEqualThan(builder.fieldName(),
(Calendar)value, constraint.dateResolution());
} else {
filter.addLessOrEqualThan(builder.fieldName(), value);
}
} else if (operator == FilterConstraint.Operator.LT) {
-if (value instanceof Calendar) {
+if (value instanceof Calendar && constraint.dateResolution()
!= null) {
filter.addLessThan(builder.fieldName(), (Calendar)value,
constraint.dateResolution());
} else {
filter.addLessThan(builder.fieldName(), value);
@@ -94,13 +94,13 @@ public class FieldConstraint extends Constraint {
} else if (operator == FilterConstraint.Operator.BETWEEN) {
Object[] values = (Object[])value;
-if (values[0] instanceof Calendar) {
+if (values[0] instanceof Calendar &&
constraint.dateResolution() != null) {
filter.addBetween(builder.fieldName(),
(Calendar)values[0], (Calendar)values[1], constraint.dateResolution());
} else {
filter.addBetween(builder.fieldName(), values[0],
values[1]);
}
} else if (operator == FilterConstraint.Operator.NOT_EQUAL) {
-if (value instanceof Calendar) {
+if (value instanceof Calendar && constraint.dateResolution()
!= null) {
filter.addNotEqualTo(builder.fieldName(), (Calendar)value,
constraint.dateResolution());
} else {
if (value instanceof String &&
!constraint.caseSensitive()) {
=
content-beans/src/test/java/org/hippoecm/hst/content/beans/query/builderdiffpackage/TestHstQueryBuilder.java
=
---
a/content-beans/src/test/java/org/hippoecm/hst/content/beans/query/builderdiffpackage/TestHstQueryBuilder.java
+++
b/content-beans/src/test/java/org/hippoecm/hst/content/beans/query/builderdiffpackage/TestHstQueryBuilder.java
@@ -657,7 +657,8 @@ public class TestHstQueryBuilder extends
AbstractBeanTestCase {
)
)
)
-
.orderByAscending("myhippoproject:title").orderByDescending("myhippoproject:date")
+.orderByAscending("myhippoproject:title")
+.orderByDescending("myhippoproject:date")
.offset(10).limit(5)
.build();
@@ -1381,4 +1382,21 @@ public class TestHstQueryBuilder extends
AbstractBeanTestCase {
assertHstQueriesEquals(hstQuery, fluentQuery);
assertHstQueriesEquals(hstQuery, fluentQuery2);
}
+
+@Test
+public void missing_date_resolution_works_correctly() throws Exception {
[HippoCMS-scm] [Git][cms-community/hippo-site-toolkit][master] HSTTWO-3826 Fix unit test setup : Don't for UTC
Ard Schrijvers pushed to branch master at cms-community / hippo-site-toolkit
Commits:
e921b850 by Ard Schrijvers at 2016-10-13T14:57:47+02:00
HSTTWO-3826 Fix unit test setup : Don't for UTC
- - - - -
1 changed file:
-
content-beans/src/test/java/org/hippoecm/hst/content/beans/query/TestHstFilters.java
Changes:
=
content-beans/src/test/java/org/hippoecm/hst/content/beans/query/TestHstFilters.java
=
---
a/content-beans/src/test/java/org/hippoecm/hst/content/beans/query/TestHstFilters.java
+++
b/content-beans/src/test/java/org/hippoecm/hst/content/beans/query/TestHstFilters.java
@@ -16,6 +16,7 @@
package org.hippoecm.hst.content.beans.query;
+import org.apache.jackrabbit.util.ISO8601;
import org.hippoecm.hst.AbstractBeanTestCase;
import org.hippoecm.hst.content.beans.query.exceptions.FilterException;
import org.hippoecm.hst.content.beans.query.filter.Filter;
@@ -91,11 +92,8 @@ public class TestHstFilters extends AbstractBeanTestCase {
// Calendar/Date
Calendar cal = Calendar.getInstance(Locale.ENGLISH);
cal.setTimeInMillis(147515500L);
-cal.setTimeZone(TimeZone.getTimeZone("UTC"));
-assertEquals("xs:dateTime('2016-09-29T13:16:40.000Z')",
filter.getStringValue(cal));
-
-// this should work but doesn't yet, see HSTTWO-3826
-// assertEquals("xs:dateTime('2016-09-29T13:16:40.000Z')",
filter.getStringValue(cal.getTime()));
+assertEquals("xs:dateTime('"+ISO8601.format(cal)+"')",
filter.getStringValue(cal));
+assertEquals("xs:dateTime('" + ISO8601.format(cal) + "')",
filter.getStringValue(cal.getTime()));
}
@Test(expected = FilterException.class)
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-site-toolkit/commit/e921b85096a43c54e3628a05aa91c269d10ed895
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager] Deleted branch feature/webpack
Joeri de Gooijer deleted branch feature/webpack 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 feature/visual-editing-psp1-CHANNELMGR-863
Joeri de Gooijer deleted branch feature/visual-editing-psp1-CHANNELMGR-863 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-hst-configuration-editor][master] HSTCONFIGEDIT-204 for new sitemap items set the selected page design to the firs…
Jeroen Hoffman pushed to branch master at cms-community /
hippo-addon-hst-configuration-editor
Commits:
992ad2a7 by Jasper Floor at 2016-10-13T15:31:22+02:00
HSTCONFIGEDIT-204 for new sitemap items set the selected page design to the
first item in the list - forward port of 203
(cherry picked from commit f070af49c8fa3c1a2eaa7693603d23d665c56e96)
- - - - -
1 changed file:
-
frontend/src/main/java/org/hippoecm/hst/plugins/frontend/editor/description/DescriptionPicker.java
Changes:
=
frontend/src/main/java/org/hippoecm/hst/plugins/frontend/editor/description/DescriptionPicker.java
=
---
a/frontend/src/main/java/org/hippoecm/hst/plugins/frontend/editor/description/DescriptionPicker.java
+++
b/frontend/src/main/java/org/hippoecm/hst/plugins/frontend/editor/description/DescriptionPicker.java
@@ -272,14 +272,18 @@ public class DescriptionPicker extends Panel {
current = 0;
String selected = getDefaultModelObjectAsString();
if (selected != null) {
-int cnt = 0;
-for (Descriptive descriptive : descriptives) {
-final String name = getName(descriptive);
-if (selected.equals(name)) {
-current = cnt;
-break;
+if (StringUtils.isEmpty(selected)) {
+setDefaultModelObjectByCurrentSelection();
+} else {
+int cnt = 0;
+for (Descriptive descriptive : descriptives) {
+final String name = getName(descriptive);
+if (selected.equals(name)) {
+current = cnt;
+break;
+}
+cnt++;
}
-cnt++;
}
}
}
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-hst-configuration-editor/commit/992ad2a70989cf5c08532fd2c981a60c9b0785cf
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-plugin-taxonomy][bugfix/HIPPLUG-1319] HIPPLUG-1319 in demo's 'doubletaxonomy' namespace, add '"hipposysedit:multiple'…
Jeroen Hoffman pushed to branch bugfix/HIPPLUG-1319 at cms-community / hippo-plugin-taxonomy Commits: 7e406a03 by Jeroen Hoffman at 2016-10-13T16:40:54+02:00 HIPPLUG-1319 in demo's 'doubletaxonomy' namespace, add '"hipposysedit:multiple' for extrataxonomy field and delete polluting second prototype - - - - - 1 changed file: - demo/content/src/main/resources/taxonomy-demo-namespace.xml Changes: = demo/content/src/main/resources/taxonomy-demo-namespace.xml = --- a/demo/content/src/main/resources/taxonomy-demo-namespace.xml +++ b/demo/content/src/main/resources/taxonomy-demo-namespace.xml @@ -732,6 +732,9 @@ hipposysedit:field + +true + taxonomydemo:alternatekeys @@ -785,50 +788,6 @@ document-type-locale - - - nt:unstructured - - - hippostd:relaxed - hippostdpubwf:document - hippotranslation:translated - mix:referenceable - hippostd:publishableSummary - hippotaxonomy:classifiable - - - 3b467921-0690-4834-91aa-f455f1c22355 - - - - holder - - - draft - - - new - - - - - - 2014-06-12T17:19:37.772+02:00 - - - 2014-06-12T17:19:37.772+02:00 - - - - - - document-type-locale-id - - - document-type-locale - - View it on GitLab: https://code.onehippo.org/cms-community/hippo-plugin-taxonomy/commit/7e406a03e6ed4662d5f60aa605cfefec82acc62c ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-plugin-taxonomy][master] 2 commits: HIPPLUG-1319 in demo's 'doubletaxonomy' namespace, add '"hipposysedit:multiple'…
Jeroen Hoffman pushed to branch master at cms-community / hippo-plugin-taxonomy Commits: 7e406a03 by Jeroen Hoffman at 2016-10-13T16:40:54+02:00 HIPPLUG-1319 in demo's 'doubletaxonomy' namespace, add '"hipposysedit:multiple' for extrataxonomy field and delete polluting second prototype - - - - - a3fbe776 by Jeroen Hoffman at 2016-10-13T16:44:44+02:00 HIPPLUG-1319 Reintegrate branch 'bugfix/HIPPLUG-1319' into master - - - - - 1 changed file: - demo/content/src/main/resources/taxonomy-demo-namespace.xml Changes: = demo/content/src/main/resources/taxonomy-demo-namespace.xml = --- a/demo/content/src/main/resources/taxonomy-demo-namespace.xml +++ b/demo/content/src/main/resources/taxonomy-demo-namespace.xml @@ -732,6 +732,9 @@ hipposysedit:field + +true + taxonomydemo:alternatekeys @@ -785,50 +788,6 @@ document-type-locale - - - nt:unstructured - - - hippostd:relaxed - hippostdpubwf:document - hippotranslation:translated - mix:referenceable - hippostd:publishableSummary - hippotaxonomy:classifiable - - - 3b467921-0690-4834-91aa-f455f1c22355 - - - - holder - - - draft - - - new - - - - - - 2014-06-12T17:19:37.772+02:00 - - - 2014-06-12T17:19:37.772+02:00 - - - - - - document-type-locale-id - - - document-type-locale - - View it on GitLab: https://code.onehippo.org/cms-community/hippo-plugin-taxonomy/compare/5465c1c40e4678f057824ef1a5e0b80e8e47bd1c...a3fbe7763ed3d0c82f42d745aa3f0c3633c787e3 ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-plugin-taxonomy] Deleted branch bugfix/HIPPLUG-1319
Jeroen Hoffman deleted branch bugfix/HIPPLUG-1319 at cms-community / hippo-plugin-taxonomy ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
