[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][feature/angularjs-downgrade] 2 commits: CHANNELMGR-1635 Fix lint errors
Arthur Bogaart pushed to branch feature/angularjs-downgrade at cms-community /
hippo-addon-channel-manager
Commits:
1b3e6138 by Arthur Bogaart at 2018-01-10T00:41:42+01:00
CHANNELMGR-1635 Fix lint errors
- - - - -
e0f3811e by Arthur Bogaart at 2018-01-10T00:42:08+01:00
CHANNELMGR-1635 Fix showError arguments
- - - - -
4 changed files:
-
frontend-ng/src/app/channel/sidePanels/rightSidePanel/create-content/create-content.mocks.spec.ts
-
frontend-ng/src/app/channel/sidePanels/rightSidePanel/create-content/nameUrlFields/nameUrlFields.controller.spec.js
-
frontend-ng/src/app/channel/sidePanels/rightSidePanel/create-content/step-2/step-2.component.spec.ts
-
frontend-ng/src/app/channel/sidePanels/rightSidePanel/create-content/step1/step1.controller.js
Changes:
=
frontend-ng/src/app/channel/sidePanels/rightSidePanel/create-content/create-content.mocks.spec.ts
=
---
a/frontend-ng/src/app/channel/sidePanels/rightSidePanel/create-content/create-content.mocks.spec.ts
+++
b/frontend-ng/src/app/channel/sidePanels/rightSidePanel/create-content/create-content.mocks.spec.ts
@@ -75,16 +75,6 @@ export class ContentServiceMock {
}
}
-export class DialogServiceMock {
- confirm(): any {
-return new ConfirmDialogMock();
- }
-
- show(dialog: object): Promise {
-return Promise.resolve();
- }
-}
-
export class ConfirmDialogMock {
title() {
return this;
@@ -103,22 +93,32 @@ export class ConfirmDialogMock {
}
}
-export class FieldServiceMock {
- setDocumentId(id: string): void {}
-}
+export class DialogServiceMock {
+ confirm(): any {
+return new ConfirmDialogMock();
+ }
-export class MdDialogMock {
- open() {
-return new MdDialogRefMock();
+ show(dialog: object): Promise {
+return Promise.resolve();
}
}
+export class FieldServiceMock {
+ setDocumentId(id: string): void {}
+}
+
export class MdDialogRefMock {
afterClosed () {
return Observable.of({ name: 'docName', url: 'doc-url' });
}
}
+export class MdDialogMock {
+ open() {
+return new MdDialogRefMock();
+ }
+}
+
export class ChannelServiceMock {
getChannel() {
return {
=
frontend-ng/src/app/channel/sidePanels/rightSidePanel/create-content/nameUrlFields/nameUrlFields.controller.spec.js
=
---
a/frontend-ng/src/app/channel/sidePanels/rightSidePanel/create-content/nameUrlFields/nameUrlFields.controller.spec.js
+++
b/frontend-ng/src/app/channel/sidePanels/rightSidePanel/create-content/nameUrlFields/nameUrlFields.controller.spec.js
@@ -20,11 +20,9 @@ describe('NameUrlFields', () => {
let $componentController;
let $q;
let $rootScope;
- let $timeout;
let CreateContentService;
let component;
- let scope;
let element;
const spies = {};
@@ -35,11 +33,10 @@ describe('NameUrlFields', () => {
$componentController = _$componentController_;
$q = _$q_;
$rootScope = _$rootScope_;
- $timeout = _$timeout_;
CreateContentService = _CreateContentService_;
});
-scope = $rootScope.$new();
+$rootScope.$new();
// element = angular.element('');
element = angular.element('');
component = $componentController('nameUrlFields', {
@@ -58,7 +55,7 @@ describe('NameUrlFields', () => {
component.nameField = '';
});
- function setNameInputValue (value) {
+ function setNameInputValue(value) {
component.nameInputField.val(value);
component.nameField = value;
component.nameInputField.trigger('keyup');
@@ -85,7 +82,7 @@ describe('NameUrlFields', () => {
currentValue: component.locale,
previousValue: 'en',
isFirstChange: () => false,
-}
+},
};
component.$onChanges(changes);
expect(component.setDocumentUrlByName).toHaveBeenCalled();
=
frontend-ng/src/app/channel/sidePanels/rightSidePanel/create-content/step-2/step-2.component.spec.ts
=
---
a/frontend-ng/src/app/channel/sidePanels/rightSidePanel/create-content/step-2/step-2.component.spec.ts
+++
b/frontend-ng/src/app/channel/sidePanels/rightSidePanel/create-content/step-2/step-2.component.spec.ts
@@ -275,7 +275,7 @@ describe('Create content step 2 component', () => {
expect(deleteDraftSpy).toHaveBeenCalledWith(testDocument.id);
expect(feedbackService.showError).toHaveBeenCalledWith('ERROR_TEST', {});
-}))
+}));
});
describe('saveDocument', () => {
=
frontend-ng/src/app/channel/sidePanels/rightSidePanel/create-content/step1/step1.controller.js
=
---
a/frontend-ng/src/app/channel/sidePanels/rightSidePanel/create-content/step1/step1.controller.js
+++
b/frontend-ng/src/app/channel/sidePanels/rightSidePanel/create-content/step1/step1.controller.js
@@ -111,7 +111,9
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][feature/CC-CHANNELMGR-1634] CHANNELMGR-1634 Generic error handler and license header
Arthur Bogaart pushed to branch feature/CC-CHANNELMGR-1634 at cms-community /
hippo-addon-channel-manager
Commits:
0ff9178b by Arthur Bogaart at 2018-01-09T22:16:31+01:00
CHANNELMGR-1634 Generic error handler and license header
- - - - -
2 changed files:
-
frontend-ng/src/app/channel/sidePanels/rightSidePanel/create-content/step1/step1.component.js
-
frontend-ng/src/app/channel/sidePanels/rightSidePanel/create-content/step1/step1.controller.js
Changes:
=
frontend-ng/src/app/channel/sidePanels/rightSidePanel/create-content/step1/step1.component.js
=
---
a/frontend-ng/src/app/channel/sidePanels/rightSidePanel/create-content/step1/step1.component.js
+++
b/frontend-ng/src/app/channel/sidePanels/rightSidePanel/create-content/step1/step1.component.js
@@ -1,5 +1,5 @@
/*
- * Copyright 2016 Hippo B.V. (http://www.onehippo.com)
+ * Copyright 2017-2018 Hippo B.V. (http://www.onehippo.com)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
=
frontend-ng/src/app/channel/sidePanels/rightSidePanel/create-content/step1/step1.controller.js
=
---
a/frontend-ng/src/app/channel/sidePanels/rightSidePanel/create-content/step1/step1.controller.js
+++
b/frontend-ng/src/app/channel/sidePanels/rightSidePanel/create-content/step1/step1.controller.js
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-2017 Hippo B.V. (http://www.onehippo.com)
+ * Copyright 2017-2018 Hippo B.V. (http://www.onehippo.com)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -55,7 +55,7 @@ class RightSidePanelCtrl {
this.CreateContentService.getTemplateQuery(this.options.templateQuery)
.then(templateQuery =>
this._onLoadDocumentTypes(templateQuery.documentTypes))
- .catch(error => this._onErrorLoadingTemplateQuery(error));
+ .catch(error => this._onError(error, 'Unknown error loading template
query'));
}
submit() {
@@ -84,7 +84,7 @@ class RightSidePanelCtrl {
locale: this.locale,
},
}))
- .catch(error => this._onErrorCreatingDraft(error));
+ .catch(error => this._onError(error, 'Unknown error creating new draft
document'));
}
setWidthState(state) {
@@ -108,21 +108,12 @@ class RightSidePanelCtrl {
}
}
- _onErrorLoadingTemplateQuery(error) {
+ _onError(error, genericMessage) {
if (error.data && error.data.reason) {
const errorKey = this.$translate.instant(`ERROR_${error.data.reason}`);
this.FeedbackService.showError(errorKey, error.data.params);
} else {
- this.$log.error('Unknown error loading template query', error);
-}
- }
-
- _onErrorCreatingDraft(error) {
-if (error.data && error.data.reason) {
- const errorKey = this.$translate.instant(`ERROR_${error.data.reason}`);
- this.FeedbackService.showError(errorKey);
-} else {
- this.$log.error('Unknown error creating new draft document', error);
+ this.$log.error(genericMessage, error);
}
}
}
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/0ff9178b6ad2f1b7804c926f4fde7c79e19f6d94
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/0ff9178b6ad2f1b7804c926f4fde7c79e19f6d94
You're receiving this email because of your account on code.onehippo.org.
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-jackrabbit][trunk] JCR-4215: Use Tika version 1.17
GitLab Mirror pushed to branch trunk at cms-community / hippo-jackrabbit
Commits:
36d7bafa by Julian Reschke at 2018-01-09T15:53:29+00:00
JCR-4215: Use Tika version 1.17
git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/trunk@1820675
13f79535-47bb-0310-9956-ffa450edef68
- - - - -
2 changed files:
- jackrabbit-parent/pom.xml
- jackrabbit-webapp/pom.xml
Changes:
=
jackrabbit-parent/pom.xml
=
--- a/jackrabbit-parent/pom.xml
+++ b/jackrabbit-parent/pom.xml
@@ -48,7 +48,7 @@
-XX:+IgnoreUnrecognizedVMOptions
--add-modules=java.xml.bind
${test.opts.modules} ${test.opts.coverage} ${test.opts.memory}
-enableassertions
8.2.0.v20160908
-1.16
+1.17
${project.build.sourceEncoding}
=
jackrabbit-webapp/pom.xml
=
--- a/jackrabbit-webapp/pom.xml
+++ b/jackrabbit-webapp/pom.xml
@@ -145,6 +145,24 @@
${slf4j.version}
test
+
+ org.slf4j
+ jul-to-slf4j
+ ${slf4j.version}
+ test
+
+
+ org.apache.james
+ apache-mime4j
+ 0.6
+ test
+
+
+ org.apache.httpcomponents
+ httpcore
+ 4.4.8
+ test
+
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-jackrabbit/commit/36d7bafa64bff24696792c79aba83927a4a3f0dc
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-jackrabbit/commit/36d7bafa64bff24696792c79aba83927a4a3f0dc
You're receiving this email because of your account on code.onehippo.org.
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-essentials][feature/CC-ESSENTIALS-1108] ESSENTIALS-1108 News manage content tag should not create content
Michael Metternich pushed to branch feature/CC-ESSENTIALS-1108 at cms-community
/ hippo-essentials
Commits:
9585e352 by Michael Metternich at 2018-01-09T16:02:25+01:00
ESSENTIALS-1108 News manage content tag should not create content
- - - - -
1 changed file:
- plugins/news/src/main/resources/freemarker/newslist-main-newslist-variant.ftl
Changes:
=
plugins/news/src/main/resources/freemarker/newslist-main-newslist-variant.ftl
=
---
a/plugins/news/src/main/resources/freemarker/newslist-main-newslist-variant.ftl
+++
b/plugins/news/src/main/resources/freemarker/newslist-main-newslist-variant.ftl
@@ -26,7 +26,7 @@
-<@hst.manageContent document=item rootPath="news"
defaultPath="${year}/${month}"/>
+<@hst.manageContent document=item/>
${item.introduction?html}
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-essentials/commit/9585e35239288952b4a37600cfe4651d4d1730e8
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-essentials/commit/9585e35239288952b4a37600cfe4651d4d1730e8
You're receiving this email because of your account on code.onehippo.org.
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager] Pushed new branch bugfix/CHANNELMGR-1523
Bert Leunis pushed new branch bugfix/CHANNELMGR-1523 at cms-community / hippo-addon-channel-manager --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-addon-channel-manager/tree/bugfix/CHANNELMGR-1523 You're receiving this email because of your account on code.onehippo.org. ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-jackrabbit][trunk] 4 commits: Debug Log
GitLab Mirror pushed to branch trunk at cms-community / hippo-jackrabbit
Commits:
194c7838 by Claus Köll at 2018-01-09T12:43:50+00:00
Debug Log
git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/trunk@1820653
13f79535-47bb-0310-9956-ffa450edef68
- - - - -
bd2d06ef by Claus Köll at 2018-01-09T12:44:24+00:00
Debug Log
git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/trunk@1820654
13f79535-47bb-0310-9956-ffa450edef68
- - - - -
63137d1f by Claus Köll at 2018-01-09T12:46:48+00:00
Debug Log
git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/trunk@1820656
13f79535-47bb-0310-9956-ffa450edef68
- - - - -
407bd5c7 by Claus Köll at 2018-01-09T12:47:47+00:00
Debug Log on LinkageError
git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/trunk@1820657
13f79535-47bb-0310-9956-ffa450edef68
- - - - -
4 changed files:
-
jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/AbstractJournal.java
-
jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/DatabaseJournal.java
-
jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/LazyTextExtractorField.java
-
jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/SortedLuceneQueryHits.java
Changes:
=
jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/AbstractJournal.java
=
---
a/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/AbstractJournal.java
+++
b/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/AbstractJournal.java
@@ -240,6 +240,7 @@ public abstract class AbstractJournal implements Journal {
* @throws JournalException if an error occurs
*/
protected void doSync(long startRevision) throws JournalException {
+ log.debug("Synchronize contents from journal. StartRevision: " +
startRevision);
RecordIterator iterator = getRecords(startRevision);
long stopRevision = Long.MIN_VALUE;
@@ -289,6 +290,7 @@ public abstract class AbstractJournal implements Journal {
* @throws JournalException if an error occurs
*/
public void lockAndSync() throws JournalException {
+ log.debug("Lock the journal revision and synchronize to the latest
change.");
if (internalVersionManager != null) {
VersioningLock.ReadLock lock =
internalVersionManager.acquireReadLock();
@@ -314,6 +316,7 @@ public abstract class AbstractJournal implements Journal {
try {
// lock
+ log.debug("internalLockAndSync.doLock()");
doLock();
try {
// and sync
@@ -321,6 +324,7 @@ public abstract class AbstractJournal implements Journal {
succeeded = true;
} finally {
if (!succeeded) {
+ log.debug("internalLockAndSync.doUnlock(false)");
doUnlock(false);
}
}
@@ -338,7 +342,9 @@ public abstract class AbstractJournal implements Journal {
* successful
*/
public void unlock(boolean successful) {
+ log.debug("Unlock the journal revision. Successful: " + successful);
try {
+ log.debug("unlock.doUnlock("+successful+")");
doUnlock(successful);
} finally {
//Should not happen that a RuntimeException will be thrown in
subCode, but it's safer
=
jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/DatabaseJournal.java
=
---
a/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/DatabaseJournal.java
+++
b/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/DatabaseJournal.java
@@ -495,6 +495,7 @@ public class DatabaseJournal extends AbstractJournal
implements DatabaseAware {
} finally {
DbUtility.close(rs);
if (!succeeded) {
+ log.debug("doLock.doUnlock(false)");
doUnlock(false);
}
}
@@ -516,7 +517,7 @@ public class DatabaseJournal extends AbstractJournal
implements DatabaseAware {
private void endBatch(boolean successful) {
if (--lockLevel == 0) {
try {
-conHelper.endBatch(successful);;
+conHelper.endBatch(successful);
} catch (SQLException e) {
log.error("failed to end batch", e);
}
=
jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/LazyTextExtractorField.java
=
---
a/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/LazyTextExtractorField.java
+++
b/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/LazyTextExtractorField.java
@@ -187,6 +187,14 @@ public class LazyTextExtractorField extends
[HippoCMS-scm] [Git][cms-community/hippo-services-api][feature/projectdocs] 9 commits: CMS-10897 Fix javadoc and use AlreadyLockedException
Arent-Jan Banck pushed to branch feature/projectdocs at cms-community /
hippo-services-api
Commits:
66288f41 by Ard Schrijvers at 2017-11-30T14:27:23+01:00
CMS-10897 Fix javadoc and use AlreadyLockedException
- - - - -
5c36543e by Ard Schrijvers at 2017-11-30T14:32:04+01:00
CMS-10897 use ignore since recognized by idea
- - - - -
b0f283d5 by Ard Schrijvers at 2017-11-30T14:38:09+01:00
CMS-10897 improve java doc
- - - - -
de90f059 by Ard Schrijvers at 2017-11-30T14:41:42+01:00
CMS-10897 improve java doc
- - - - -
22295209 by Ard Schrijvers at 2017-12-02T21:06:09+01:00
CMS-11012 Document that a LockResource is thread-safe
- - - - -
e71a0940 by Ard Schrijvers at 2018-01-03T15:30:07+01:00
CMS-11030 Improve LockManager javadoc how to work with JCR
- - - - -
e692b7cd by Ard Schrijvers at 2018-01-04T13:40:14+01:00
CMS-11030 further improve javadoc
- - - - -
641621a4 by Ate Douma at 2018-01-04T13:51:31+01:00
CMS-11030 fix javadoc typos
- - - - -
2bed9bf4 by Arent-Jan Banck at 2018-01-09T13:41:01+01:00
CMS-10930 Merge master changes in feature/projectdocs
- - - - -
3 changed files:
- src/main/java/org/onehippo/cms7/services/lock/LockManager.java
- src/main/java/org/onehippo/cms7/services/lock/LockManagerUtils.java
- src/main/java/org/onehippo/cms7/services/lock/LockResource.java
Changes:
=
src/main/java/org/onehippo/cms7/services/lock/LockManager.java
=
--- a/src/main/java/org/onehippo/cms7/services/lock/LockManager.java
+++ b/src/main/java/org/onehippo/cms7/services/lock/LockManager.java
@@ -39,12 +39,13 @@ import org.onehippo.cms7.services.SingletonService;
*
*
* public void run() {
- *boolean locked = false;
- *try {
- * try (LockResource lock = lockManager.lock(key)){
+ *try (LockResource ignore = lockManager.lock(key)){
+ * // session.refresh(true|false) if JCR nodes are involved
* // Do work
+ *} catch (AlreadyLockedException e) {
+ * log.info("'{}' is already locked", key, e);
*} catch (LockException e) {
- * log.info("Failed to obtain lock, most likely obtained by
other cluster node already", e);
+ * log.error("Exception while trying to obtain lock, e);
*}
* }
*
@@ -57,10 +58,13 @@ import org.onehippo.cms7.services.SingletonService;
*try {
* lockManager.lock(key);
* locked = true;
+ * // session.refresh(true|false) if JCR nodes are involved
* // Do work
+ *} catch (AlreadyLockedException e) {
+ * log.info("'{}' is already locked", key, e);
*} catch (LockException e) {
- * log.info("Failed to obtain lock, most likely obtained by
other cluster node already", e);
- *} finally {
+ * log.error("Exception while trying to obtain lock, e);
+ *}finally {
* if (locked) {
* lockManager.unlock(key);
* }
@@ -70,12 +74,28 @@ import org.onehippo.cms7.services.SingletonService;
*
*
*
- * Note that when a {@code key} is already locked, the invocation of
{@link #lock(String) #lock(key)} directly results
- * in an {@link AlreadyLockedException} : This is thus
different than
- * {@link java.util.concurrent.locks.ReentrantLock} behavior. If you need
similar behavior to {@link ReentrantLock#lock()}
- * but then cluster wide, you can use {@link
LockManagerUtils#waitForLock(LockManager, String, long)}
- * and if you need the cluster wide equivalent of {@link
java.util.concurrent.locks.ReentrantLock#tryLock(long, TimeUnit)}
- * you can use {@link LockManagerUtils#waitForLock(LockManager, String,
long, long)}.
+ * Note that when {@code key} is already locked by another {@link Thread}
or other cluster node,
+ * the invocation of {@link #lock(String) #lock(key)} directly results in
an {@link AlreadyLockedException} :
+ * This is thus different than {@link
ReentrantLock#lock()} behavior (which blocks until the lock is acquired).
+ * If you need similar behavior to {@link ReentrantLock#lock()} but then
cluster wide, you can use
+ * {@link LockManagerUtils#waitForLock(LockManager, String, long)} and if
you need the cluster wide equivalent
+ * of {@link java.util.concurrent.locks.ReentrantLock#tryLock(long,
TimeUnit)} you can use
+ * {@link LockManagerUtils#waitForLock(LockManager, String, long, long)}.
+ *
+ *
+ * Usage in combination with JCR:
+ *
+ * When you use this {@link LockManager} to obtain a cluster wide lock
after which the code is doing JCR node manipulation,
+ * eg updating the last modification
[HippoCMS-scm] [Git][cms-community/hippo-cms][feature/CMS-10015] 7 commits: CMS-10937 Update parent project to version 29.3
Jeroen Hoffman pushed to branch feature/CMS-10015 at cms-community / hippo-cms Commits: 0a0a44f0 by Arent-Jan Banck at 2017-11-27T13:54:14+01:00 CMS-10937 Update parent project to version 29.3 - - - - - 8b9f6dd7 by Peter Centgraf at 2017-11-27T16:38:37+01:00 CMS-10813 Show category and origin in Console according to HCM - - - - - 1b4555f1 by Peter Centgraf at 2017-11-27T16:38:49+01:00 CMS-10997 apply icons and styling in console for /hcm:hcm, /jcr:system, /hippo:log, and /hippo:reports - - - - - 1ef87646 by Ard Schrijvers at 2017-11-27T23:10:22+01:00 CMS-10953 Revert CMS-10953 Initialize context payload in constructor This reverts commit 44bd816d5bfc8ac8d143722879405933ade8156a. - - - - - 97fa2831 by Ard Schrijvers at 2017-11-27T23:10:55+01:00 CMS-10910 Revert CMS-10910 Implement CmsSessionContext attribute management methods This reverts commit 90fb6de879cf0329ac6ee736b9d2cf7c27ee27a9. - - - - - 585d25ec by Arent-Jan Banck at 2017-11-28T14:46:07+01:00 CMS-11000 Bump versions to prepare 12.2 development iteration - - - - - 30c9e942 by Jeroen Hoffman at 2018-01-09T13:37:27+01:00 CMS-10015 Merge branch master into feature/CMS-10015 - - - - - 30 changed files: - api/pom.xml - automatic-export/frontend/pom.xml - automatic-export/pom.xml - automatic-export/repository/pom.xml - brokenlinks/common/pom.xml - brokenlinks/frontend/pom.xml - brokenlinks/pom.xml - brokenlinks/repository/pom.xml - brokenlinks/test/pom.xml - builtin/pom.xml - config/pom.xml - console/frontend/pom.xml - + console/frontend/src/main/java/org/hippoecm/frontend/plugins/console/behavior/OriginTitleBehavior.java - console/frontend/src/main/java/org/hippoecm/frontend/plugins/console/editor/EditorPlugin.html - console/frontend/src/main/java/org/hippoecm/frontend/plugins/console/editor/NodeEditor.java - console/frontend/src/main/java/org/hippoecm/frontend/plugins/console/editor/PropertiesEditor.java - console/frontend/src/main/java/org/hippoecm/frontend/plugins/console/icons/FontAwesomeIcon.java - console/frontend/src/main/java/org/hippoecm/frontend/plugins/console/icons/JcrNodeIcon.java - console/frontend/src/main/resources/org/hippoecm/frontend/plugins/console/console.css - console/frontend/src/test/java/org/hippoecm/frontend/plugins/console/browser/JcrNodeIconTest.java - console/pom.xml - console/repository/pom.xml - dependencies/pom.xml - editor/common/pom.xml - editor/frontend/pom.xml - editor/pom.xml - editor/repository/pom.xml - editor/test/pom.xml - engine/pom.xml - engine/src/main/java/org/onehippo/cms7/services/cmscontext/CmsContextServiceImpl.java The diff was not included because it is too large. View it on GitLab: https://code.onehippo.org/cms-community/hippo-cms/compare/494da7f57d01e7f2c2ff38e798e18568221aa26b...30c9e942d1d6dcf7530d101f31fac8cf1c2f3adc --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-cms/compare/494da7f57d01e7f2c2ff38e798e18568221aa26b...30c9e942d1d6dcf7530d101f31fac8cf1c2f3adc You're receiving this email because of your account on code.onehippo.org. ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms][feature/projectdocs] 25 commits: CMS-11019 Remove println statement and remove xerces from the performance test
Arent-Jan Banck pushed to branch feature/projectdocs at cms-community / hippo-cms Commits: f85c6dab by Arent-Jan Banck at 2017-12-07T23:29:09+01:00 CMS-11019 Remove println statement and remove xerces from the performance test - - - - - 22da7e3b by Arent-Jan Banck at 2017-12-07T23:34:15+01:00 CMS-11019 Remove testPerformance. It was never executed as the html was invalid and the dom parser throws an exception that is silently swallowed, test still passed successful. Even when fixed its not testing anything relevent, only that Dom parsing is slower than directly using a string. - - - - - 9e3db9cb by Bert Leunis at 2017-12-12T13:47:24+01:00 CMS-10864 restyling of search field in users panel - - - - - 99fc343b by Bert Leunis at 2017-12-12T16:09:28+01:00 CMS-10864 toggle icon and search term - - - - - eb207493 by Bert Leunis at 2017-12-14T10:56:22+01:00 CMS-10864 make SubmittingTextField accessible for other plugins - - - - - d29d14bc by Bert Leunis at 2017-12-14T10:56:59+01:00 CMS-10864 search can be done by enter or spy glass - - - - - cd6c5243 by Bert Leunis at 2017-12-14T13:10:32+01:00 CMS-10864 new SearchTermPanel, used in ListGroupsPanel - - - - - 17d9560a by Bert Leunis at 2017-12-14T13:50:53+01:00 CMS-10864 use search term panel in user list and set members panels - - - - - c0d60d53 by Bert Leunis at 2017-12-14T14:21:47+01:00 CMS-10864 remove spacing between table rows in set group members panel - - - - - 62cc9014 by Bert Leunis at 2017-12-14T14:26:19+01:00 CMS-10864 remove obsolete properties - - - - - 573bf679 by Bert Leunis at 2017-12-14T14:50:33+01:00 CMS-10864 improve generics - - - - - efb97fc0 by Bert Leunis at 2017-12-14T16:55:32+01:00 CMS-10862 results for user or group name case insensitive - - - - - bffdd96a by Bert Leunis at 2017-12-15T10:07:59+01:00 CMS-10864 clear search term when moving up in the bread crumb path - - - - - 39154935 by Bert Leunis at 2017-12-15T14:54:52+01:00 CMS-10864 improve userlist sorting - - - - - 3acd248d by Bert Leunis at 2017-12-15T15:05:47+01:00 CMS-10864 improve group list sorting - - - - - f62598dc by Bert Leunis at 2017-12-15T15:29:26+01:00 CMS-10864 revert improve group list sorting This reverts commit 3acd248dbe93c9919956b7c74934fce283540599. - - - - - 43deeab2 by Bert Leunis at 2017-12-15T15:31:36+01:00 CMS-10864 revert improve userlist sorting This reverts commit 39154935f323c2b5491cc8740b460e7573c60aed. - - - - - 0872cc50 by Bert Leunis at 2017-12-15T15:40:34+01:00 CMS-10862 improve sorting of user and group list - - - - - 5a6d3890 by Bert Leunis at 2017-12-18T14:14:00+01:00 CMS-10864 use css variable name. use ReadOnlyModel. - - - - - 54a06f1e by Bert Leunis at 2017-12-18T14:17:32+01:00 CMS-10864 Reintegrate feature/CMS-10864 - - - - - 6b2776ad by Bert Leunis at 2017-12-18T15:42:49+01:00 CMS-10862 Merge master changes in feature/CMS-10862 - - - - - efaf23ee by Bert Leunis at 2017-12-22T13:31:51+01:00 CMS-10862 use search builder for content also for users and groups - - - - - 4e227d43 by Bert Leunis at 2017-12-22T16:39:49+01:00 CMS-10862 small improvements after review. move unit tests to correct classes. - - - - - f57b181e by Bert Leunis at 2017-12-22T16:43:18+01:00 CMS-10862 Reintegrate feature/CMS-10862 - - - - - c6031191 by Arent-Jan Banck at 2018-01-09T13:33:59+01:00 CMS-10930 Merge master changes in feature/projectdocs - - - - - 27 changed files: - + api/src/main/java/org/hippoecm/frontend/plugins/standards/search/GeneralSearchBuilder.java - api/src/main/java/org/hippoecm/frontend/plugins/standards/search/QueryResultModel.java - api/src/main/java/org/hippoecm/frontend/plugins/standards/search/TextSearchBuilder.java - api/src/main/styling/styles/_admin-perspective.scss - brokenlinks/repository/pom.xml - brokenlinks/repository/src/test/java/org/onehippo/cms7/brokenlinks/ParseTextsTest.java - perspectives/src/main/java/org/hippoecm/frontend/plugins/cms/admin/SearchableDataProvider.java - + perspectives/src/main/java/org/hippoecm/frontend/plugins/cms/admin/comparators/PropertyComparator.java - perspectives/src/main/java/org/hippoecm/frontend/plugins/cms/admin/groups/GroupDataProvider.java - perspectives/src/main/java/org/hippoecm/frontend/plugins/cms/admin/groups/ListGroupsPanel.html - perspectives/src/main/java/org/hippoecm/frontend/plugins/cms/admin/groups/ListGroupsPanel.java - perspectives/src/main/java/org/hippoecm/frontend/plugins/cms/admin/groups/SetMembersPanel.html - perspectives/src/main/java/org/hippoecm/frontend/plugins/cms/admin/groups/SetMembersPanel.java - + perspectives/src/main/java/org/hippoecm/frontend/plugins/cms/admin/search/AdminTextSearchBuilder.java - perspectives/src/main/java/org/hippoecm/frontend/plugins/cms/admin/users/ListUsersPanel.html - perspectives/src/main/java/org/hippoecm/frontend/plugins/cms/admin/users/ListUsersPanel.java - perspectives/src/main/java/org/hippoecm/frontend/plugins/cms/admin/users/SystemUserDataProvider.java -
[HippoCMS-scm] [Git][cms-community/hippo-jackrabbit][trunk] 2 commits: Debug Log
GitLab Mirror pushed to branch trunk at cms-community / hippo-jackrabbit Commits: 0b91314f by Claus Köll at 2018-01-09T12:12:00+00:00 Debug Log git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/trunk@1820647 13f79535-47bb-0310-9956-ffa450edef68 - - - - - 56b161f9 by Claus Köll at 2018-01-09T12:12:44+00:00 Debug Log git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/trunk@1820649 13f79535-47bb-0310-9956-ffa450edef68 - - - - - 2 changed files: - jackrabbit-data/src/main/java/org/apache/jackrabbit/core/data/db/DbDataStore.java - jackrabbit-data/src/main/java/org/apache/jackrabbit/core/util/db/ConnectionHelper.java Changes: = jackrabbit-data/src/main/java/org/apache/jackrabbit/core/data/db/DbDataStore.java = --- a/jackrabbit-data/src/main/java/org/apache/jackrabbit/core/data/db/DbDataStore.java +++ b/jackrabbit-data/src/main/java/org/apache/jackrabbit/core/data/db/DbDataStore.java @@ -510,6 +510,7 @@ public class DbDataStore extends AbstractDataStore updateLastModifiedDate(key, 0); } // DELETE FROM DATASTORE WHERE LAST_MODIFIEDhttps://code.onehippo.org/cms-community/hippo-jackrabbit/compare/9a51355ea57dca39afd6b891d93aa4dc500fd47c...56b161f9b14fde06e4fb6055d64681f20baff586 --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-jackrabbit/compare/9a51355ea57dca39afd6b891d93aa4dc500fd47c...56b161f9b14fde06e4fb6055d64681f20baff586 You're receiving this email because of your account on code.onehippo.org. ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][feature/CHANNELMGR-1660] CHANNELMGR-1660 Use uiOnExit to confirm leaving the content editor
Mathijs den Burger pushed to branch feature/CHANNELMGR-1660 at cms-community /
hippo-addon-channel-manager
Commits:
08f748e9 by Mathijs den Burger at 2018-01-09T12:52:49+01:00
CHANNELMGR-1660 Use uiOnExit to confirm leaving the content editor
- - - - -
1 changed file:
-
frontend-ng/src/app/channel/sidePanels/rightSidePanel/contentEditor/contentEditor.controller.js
Changes:
=
frontend-ng/src/app/channel/sidePanels/rightSidePanel/contentEditor/contentEditor.controller.js
=
---
a/frontend-ng/src/app/channel/sidePanels/rightSidePanel/contentEditor/contentEditor.controller.js
+++
b/frontend-ng/src/app/channel/sidePanels/rightSidePanel/contentEditor/contentEditor.controller.js
@@ -15,20 +15,18 @@
*/
class ContentEditorCtrl {
- constructor($mdDialog, $transitions, $uiRouterGlobals) {
+ constructor($mdDialog, $uiRouterGlobals) {
'ngInject';
this.$mdDialog = $mdDialog;
-this.$transitions = $transitions;
this.$uiRouterGlobals = $uiRouterGlobals;
}
$onInit() {
this.documentId = this.$uiRouterGlobals.params.documentId;
-this.deregisterOnExit = this.$transitions.onExit({ from: '**.edit-content'
}, () => this.confirmExit());
}
- confirmExit() {
+ uiCanExit() {
const confirmationDialog = this.$mdDialog.confirm()
.title(`Leave ${this.documentId} ?`)
.textContent('Really?')
@@ -36,10 +34,6 @@ class ContentEditorCtrl {
.cancel('No');
return this.$mdDialog.show(confirmationDialog);
}
-
- $onDestroy() {
-this.deregisterOnExit();
- }
}
export default ContentEditorCtrl;
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/08f748e9c96df4cc1a61c4e87376e3f829ecac98
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/08f748e9c96df4cc1a61c4e87376e3f829ecac98
You're receiving this email because of your account on code.onehippo.org.
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][feature/projectdocs] 13 commits: CHANNELMGR-1537 log tracking message. add option to provide message parameters.
Arent-Jan Banck pushed to branch feature/projectdocs at cms-community / hippo-addon-channel-manager Commits: 0936d68c by Bert Leunis at 2017-12-08T16:09:26+01:00 CHANNELMGR-1537 log tracking message. add option to provide message parameters. - - - - - d0999c78 by Bert Leunis at 2017-12-11T11:57:53+01:00 CHANNELMGR-1537 populate docType with unsupported field types - - - - - b277dd23 by Bert Leunis at 2017-12-11T16:13:25+01:00 CHANNELMGR-1537 sort types alphabetically. only report known hippo types by name. - - - - - 005b4c70 by Bert Leunis at 2017-12-12T09:21:44+01:00 CHANNELMGR-1537 update unit tests for new methods - - - - - d53ffc80 by Bert Leunis at 2017-12-12T12:21:50+01:00 CHANNELMGR-1537 added unit tests - - - - - 7e819ed4 by Michael Metternich at 2017-12-14T13:28:56+01:00 CHANNELMGR-1537 Minor code improvements - - - - - 9ee6f902 by Michael Metternich at 2017-12-14T13:29:52+01:00 CHANNELMGR-1537 Reintegrate feature/CHANNELMGR-1537 - - - - - 100ffa81 by Mathijs den Burger at 2018-01-02T16:56:10+01:00 CHANNELMGR-1585 Report all HTTP requests in Angular as user activity The Channel Manager used to report only calls to the HST as user activity. Calls to the CMS (i.e. to the content service) were not reported as user activity. - - - - - 6c316fd9 by Mathijs den Burger at 2018-01-04T11:25:01+01:00 CHANNELMGR-1585 Report page loads as user activity Otherwise active logout will kick out users that are just browsing pages in the Channel Manager (e.g. to preview content). - - - - - 9203e896 by Mathijs den Burger at 2018-01-04T11:25:23+01:00 CHANNELMGR-1585 Reintegrate bugfix/CHANNELMGR-1585 - - - - - 9dfe19e1 by Mathijs den Burger at 2018-01-05T12:35:07+01:00 CHANNELMGR-1660 Remove all usage of Angular 4 and Material 2 Back to AngularJs only. For now. - - - - - 9e569b3f by Mathijs den Burger at 2018-01-09T12:01:38+01:00 CHANNELMGR-1670 Reintegrate feature/CHANNELMGR-1660-angularjs The first part of the POC in CHANNELMGR-1660 was to revert back to AngularJs. Only these changes are reintegrated. - - - - - c6d72135 by Arent-Jan Banck at 2018-01-09T12:46:18+01:00 CHANNELMGR-1528 Merge master into feature/projectdocs - - - - - 30 changed files: - content-service/src/main/java/org/onehippo/cms/channelmanager/content/documenttype/DocumentTypesServiceImpl.java - content-service/src/main/java/org/onehippo/cms/channelmanager/content/documenttype/field/FieldTypeUtils.java - content-service/src/main/java/org/onehippo/cms/channelmanager/content/documenttype/model/DocumentType.java - content-service/src/test/java/org/onehippo/cms/channelmanager/content/documenttype/DocumentTypesServiceImplTest.java - content-service/src/test/java/org/onehippo/cms/channelmanager/content/documenttype/field/FieldTypeUtilsTest.java - frontend-ng/npm-shrinkwrap.json - frontend-ng/package.json - − frontend-ng/src/app/app.module.ts - frontend-ng/src/app/channel/actions/channelActions.ng1.module.js → frontend-ng/src/app/channel/actions/actions.js - frontend-ng/src/app/channel/channel.ng1.module.js → frontend-ng/src/app/channel/channel.js - frontend-ng/src/app/channel/hippoIframe/hippoIframe.ng1.module.js → frontend-ng/src/app/channel/hippoIframe/hippoIframe.js - frontend-ng/src/app/channel/hippoIframe/hippoIframe.service.js - frontend-ng/src/app/channel/hippoIframe/hippoIframe.service.spec.js - frontend-ng/src/app/channel/mask/mask.ng1.module.js → frontend-ng/src/app/channel/mask/mask.module.js - frontend-ng/src/app/channel/menu/menu.ng1.module.js → frontend-ng/src/app/channel/menu/menu.js - frontend-ng/src/app/channel/page/actions/pageActions.ng1.module.js → frontend-ng/src/app/channel/page/actions/actions.js - frontend-ng/src/app/channel/page/page.ng1.module.js → frontend-ng/src/app/channel/page/page.js - frontend-ng/src/app/channel/projectToggle/projectToggle.ng1.module.js → frontend-ng/src/app/channel/projectToggle/projectToggle.module.js - frontend-ng/src/app/channel/relevance/relevance.ng1.module.js → frontend-ng/src/app/channel/relevance/relevance.js - frontend-ng/src/app/channel/sidePanels/leftSidePanel/componentCatalog/componentCatalog.ng1.module.js → frontend-ng/src/app/channel/sidePanels/leftSidePanel/componentCatalog/componentCatalog.module.js - frontend-ng/src/app/channel/sidePanels/leftSidePanel/leftSidePanel.ng1.module.js → frontend-ng/src/app/channel/sidePanels/leftSidePanel/leftSidePanel.module.js - frontend-ng/src/app/channel/sidePanels/rightSidePanel/fields/ckeditor/ckeditor.ng1.module.js → frontend-ng/src/app/channel/sidePanels/rightSidePanel/fields/ckeditor/ckeditor.module.js - frontend-ng/src/app/channel/sidePanels/rightSidePanel/fields/ckeditor/sharedspace-toolbar/sharedspace-toolbar.ng1.module.js → frontend-ng/src/app/channel/sidePanels/rightSidePanel/fields/ckeditor/sharedspace-toolbar/sharedspace-toolbar.module.js - frontend-ng/src/app/channel/sidePanels/rightSidePanel/fields/field.service.spec.js -
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager] Pushed new branch feature/CHANNELMGR-1660-subpages
Mathijs den Burger pushed new branch feature/CHANNELMGR-1660-subpages at cms-community / hippo-addon-channel-manager --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-addon-channel-manager/tree/feature/CHANNELMGR-1660-subpages You're receiving this email because of your account on code.onehippo.org. ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-plugin-robotstxt] Deleted branch bugfix/HIPPLUG-1488
Jeroen Hoffman deleted branch bugfix/HIPPLUG-1488 at cms-community / hippo-plugin-robotstxt --- You're receiving this email because of your account on code.onehippo.org. ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][master] 2 commits: CHANNELMGR-1660 Remove all usage of Angular 4 and Material 2
Mathijs den Burger pushed to branch master at cms-community / hippo-addon-channel-manager Commits: 9dfe19e1 by Mathijs den Burger at 2018-01-05T12:35:07+01:00 CHANNELMGR-1660 Remove all usage of Angular 4 and Material 2 Back to AngularJs only. For now. - - - - - 9e569b3f by Mathijs den Burger at 2018-01-09T12:01:38+01:00 CHANNELMGR-1670 Reintegrate feature/CHANNELMGR-1660-angularjs The first part of the POC in CHANNELMGR-1660 was to revert back to AngularJs. Only these changes are reintegrated. - - - - - 30 changed files: - frontend-ng/npm-shrinkwrap.json - frontend-ng/package.json - − frontend-ng/src/app/app.module.ts - frontend-ng/src/app/channel/actions/channelActions.ng1.module.js → frontend-ng/src/app/channel/actions/actions.js - frontend-ng/src/app/channel/channel.ng1.module.js → frontend-ng/src/app/channel/channel.js - frontend-ng/src/app/channel/hippoIframe/hippoIframe.ng1.module.js → frontend-ng/src/app/channel/hippoIframe/hippoIframe.js - frontend-ng/src/app/channel/mask/mask.ng1.module.js → frontend-ng/src/app/channel/mask/mask.module.js - frontend-ng/src/app/channel/menu/menu.ng1.module.js → frontend-ng/src/app/channel/menu/menu.js - frontend-ng/src/app/channel/page/actions/pageActions.ng1.module.js → frontend-ng/src/app/channel/page/actions/actions.js - frontend-ng/src/app/channel/page/page.ng1.module.js → frontend-ng/src/app/channel/page/page.js - frontend-ng/src/app/channel/projectToggle/projectToggle.ng1.module.js → frontend-ng/src/app/channel/projectToggle/projectToggle.module.js - frontend-ng/src/app/channel/relevance/relevance.ng1.module.js → frontend-ng/src/app/channel/relevance/relevance.js - frontend-ng/src/app/channel/sidePanels/leftSidePanel/componentCatalog/componentCatalog.ng1.module.js → frontend-ng/src/app/channel/sidePanels/leftSidePanel/componentCatalog/componentCatalog.module.js - frontend-ng/src/app/channel/sidePanels/leftSidePanel/leftSidePanel.ng1.module.js → frontend-ng/src/app/channel/sidePanels/leftSidePanel/leftSidePanel.module.js - frontend-ng/src/app/channel/sidePanels/rightSidePanel/fields/ckeditor/ckeditor.ng1.module.js → frontend-ng/src/app/channel/sidePanels/rightSidePanel/fields/ckeditor/ckeditor.module.js - frontend-ng/src/app/channel/sidePanels/rightSidePanel/fields/ckeditor/sharedspace-toolbar/sharedspace-toolbar.ng1.module.js → frontend-ng/src/app/channel/sidePanels/rightSidePanel/fields/ckeditor/sharedspace-toolbar/sharedspace-toolbar.module.js - frontend-ng/src/app/channel/sidePanels/rightSidePanel/fields/field.service.spec.js - frontend-ng/src/app/channel/sidePanels/rightSidePanel/fields/fields.ng1.module.js → frontend-ng/src/app/channel/sidePanels/rightSidePanel/fields/fields.module.js - frontend-ng/src/app/channel/sidePanels/rightSidePanel/resizeHandle/resizeHandle.ng1.module.js → frontend-ng/src/app/channel/sidePanels/rightSidePanel/resizeHandle/resizeHandle.module.js - − frontend-ng/src/app/channel/sidePanels/rightSidePanel/right-side-panel.module.ts - frontend-ng/src/app/channel/sidePanels/rightSidePanel/rightSidePanel.ng1.module.js → frontend-ng/src/app/channel/sidePanels/rightSidePanel/rightSidePanel.module.js - frontend-ng/src/app/channel/sidePanels/sidePanel.ng1.module.js → frontend-ng/src/app/channel/sidePanels/sidePanel.js - frontend-ng/src/app/channel/sitemenu/editor.ng1.module.js → frontend-ng/src/app/channel/sitemenu/editor.js - frontend-ng/src/app/channel/sitemenu/picker/picker.ng1.module.js → frontend-ng/src/app/channel/sitemenu/picker/picker.js - frontend-ng/src/app/channel/sitemenu/selectAllOnFocus.directive.spec.js - frontend-ng/src/app/channel/sitemenu/tree/tree.ng1.module.js → frontend-ng/src/app/channel/sitemenu/tree/tree.js - frontend-ng/src/app/channel/subpage/subpage.ng1.module.js → frontend-ng/src/app/channel/subpage/subpage.js - frontend-ng/src/app/channel/viewportToggle/viewportToggle.ng1.module.js → frontend-ng/src/app/channel/viewportToggle/viewportToggle.module.js - frontend-ng/src/app/hippo-cm.ng1.module.js → frontend-ng/src/app/hippo-cm.js - − frontend-ng/src/app/shared/material/material.module.ts The diff was not included because it is too large. View it on GitLab: https://code.onehippo.org/cms-community/hippo-addon-channel-manager/compare/9203e8965f8e936131fbc5a59d4572a0a2287639...9e569b3f383b1cf2013184d4236628e2cea0b240 --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-addon-channel-manager/compare/9203e8965f8e936131fbc5a59d4572a0a2287639...9e569b3f383b1cf2013184d4236628e2cea0b240 You're receiving this email because of your account on code.onehippo.org. ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-plugin-robotstxt] Deleted branch bugfix/HIPPLUG-1488-2
Marijan Milicevic deleted branch bugfix/HIPPLUG-1488-2 at cms-community / hippo-plugin-robotstxt --- You're receiving this email because of your account on code.onehippo.org. ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-plugin-robotstxt][bugfix/HIPPLUG-1488-2] HIPPLUG-1488 robots txt does not work when site have sub mounts
Marijan Milicevic pushed to branch bugfix/HIPPLUG-1488-2 at cms-community /
hippo-plugin-robotstxt
Commits:
dc59fbda by Marijan Milicevic at 2018-01-09T11:35:57+01:00
HIPPLUG-1488 robots txt does not work when site have sub mounts
- check for empty strings too and dont use bean casting
- - - - -
1 changed file:
-
hst/src/main/java/org/onehippo/forge/robotstxt/components/RobotstxtComponent.java
Changes:
=
hst/src/main/java/org/onehippo/forge/robotstxt/components/RobotstxtComponent.java
=
---
a/hst/src/main/java/org/onehippo/forge/robotstxt/components/RobotstxtComponent.java
+++
b/hst/src/main/java/org/onehippo/forge/robotstxt/components/RobotstxtComponent.java
@@ -15,30 +15,27 @@
*/
package org.onehippo.forge.robotstxt.components;
-import java.util.List;
-import java.util.ArrayList;
-import javax.jcr.Node;
-import javax.jcr.NodeIterator;
-import javax.jcr.RepositoryException;
-import javax.jcr.query.Query;
-import javax.jcr.query.QueryManager;
-
+import com.google.common.base.Strings;
import org.hippoecm.hst.component.support.bean.BaseHstComponent;
-import org.hippoecm.hst.content.beans.standard.HippoBean;
+import org.hippoecm.hst.configuration.hosting.Mount;
import org.hippoecm.hst.core.component.HstComponentException;
import org.hippoecm.hst.core.component.HstRequest;
import org.hippoecm.hst.core.component.HstResponse;
import org.hippoecm.hst.core.linking.HstLink;
import org.hippoecm.hst.core.linking.HstLinkCreator;
-import org.hippoecm.hst.configuration.hosting.Mount;
-
import org.hippoecm.repository.jackrabbit.facetnavigation.FacNavNodeType;
-
import org.onehippo.forge.robotstxt.annotated.Robotstxt;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import javax.jcr.Node;
+import javax.jcr.NodeIterator;
+import javax.jcr.RepositoryException;
+import javax.jcr.query.Query;
+import javax.jcr.query.QueryManager;
+import java.util.ArrayList;
+import java.util.List;
+
public class RobotstxtComponent extends BaseHstComponent {
private static final Logger log =
LoggerFactory.getLogger(RobotstxtComponent.class);
@@ -55,11 +52,9 @@ public class RobotstxtComponent extends BaseHstComponent {
}
// Process the CMS-based robots.txt configuration
-HippoBean bean = request.getRequestContext().getContentBean();
+final Robotstxt bean =
request.getRequestContext().getContentBean(Robotstxt.class);
if (bean == null) {
throw new HstComponentException("No bean found, check the HST
configuration for the RobotstxtComponent");
-} else if (!(bean instanceof Robotstxt)) {
-throw new HstComponentException("Expected HippoBean of type
Robotstxt but got " + bean.getClass().getName());
}
request.setAttribute("document", bean);
@@ -72,6 +67,7 @@ public class RobotstxtComponent extends BaseHstComponent {
/**
* Handle faceted navigation URLs. Typically, they should be disallowed,
but a flag on the
* robots.txt document can override this behavior and allow faceted
navigation URLs.
+ *
* @param request Handle for current request
* @param beanThe robots.txt document (CMS content)
*/
@@ -81,9 +77,10 @@ public class RobotstxtComponent extends BaseHstComponent {
/**
* Disallow faceted navigation URLs.
- * @param request Handle for current request
- * @param currentMount Mount point of current site
- * @returnList of HstLinks, representing Facet Navigation URLs.
+ *
+ * @param request Handle for current request
+ * @param currentMount Mount point of current site
+ * @return List of HstLinks, representing Facet Navigation URLs.
*/
protected List getDisallowedFacetNavigationLinks(final HstRequest
request, final Mount currentMount) {
@@ -97,8 +94,7 @@ public class RobotstxtComponent extends BaseHstComponent {
// The query gets all facetnavigation content nodes and matches
later to be under the current mount's
// content path (or under any submount paths)
final QueryManager queryManager =
request.getRequestContext().getSession().getWorkspace().getQueryManager();
-@SuppressWarnings("deprecation")
-final Query query =
queryManager.createQuery(getFacNavQueryXPath(), Query.XPATH);
+@SuppressWarnings("deprecation") final Query query =
queryManager.createQuery(getFacNavQueryXPath(), Query.XPATH);
query.setLimit(getFacNavQueryLimit());
final NodeIterator nodeIterator = query.execute().getNodes();
@@ -116,17 +112,17 @@ public class RobotstxtComponent extends BaseHstComponent {
if (allMounts.stream().noneMatch(mount ->
mount.equals(facNavLinkMount))) {
log.debug("Not disallowing links for facet navigation node
{} because its link mount {} is not part " +
-
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][feature/CC-CHANNELMGR-1666] CHANNELMGR-1666 Update package-lock for frontend-build 7.0.1
Arthur Bogaart pushed to branch feature/CC-CHANNELMGR-1666 at cms-community /
hippo-addon-channel-manager
Commits:
f37fb54d by Arthur Bogaart at 2018-01-09T11:29:35+01:00
CHANNELMGR-1666 Update package-lock for frontend-build 7.0.1
- - - - -
1 changed file:
- frontend-ng/package-lock.json
Changes:
=
frontend-ng/package-lock.json
=
--- a/frontend-ng/package-lock.json
+++ b/frontend-ng/package-lock.json
@@ -117,9 +117,9 @@
}
},
"@bloomreach/frontend-build": {
- "version": "7.0.0",
- "resolved":
"https://registry.npmjs.org/@bloomreach/frontend-build/-/frontend-build-7.0.0.tgz;,
- "integrity":
"sha512-x00nMczj33T/J51VTYIboVwFkyR7VsgEUrOVEzU4yjCuN1sHa2/iiWVvhr+LAkzcR9sn3CIFhN2vpufeHU2R3A==",
+ "version": "7.0.1",
+ "resolved":
"https://registry.npmjs.org/@bloomreach/frontend-build/-/frontend-build-7.0.1.tgz;,
+ "integrity":
"sha512-2zouwX7vyhBL+odfjqfORUVY6nKinX2Q3IfzSd8pxfN1qn4lAOVbylW/XB7xws0VQiXJ6R8E+NQHpqQDA0yt6Q==",
"dev": true,
"requires": {
"angular2-template-loader": "0.6.2",
@@ -17762,7 +17762,7 @@
"strip-ansi": "4.0.0",
"supports-color": "5.1.0",
"webpack-dev-middleware": "1.12.2",
-"yargs": "10.0.3"
+"yargs": "10.1.1"
},
"dependencies": {
"ansi-regex": {
@@ -17806,6 +17806,17 @@
"readdirp": "2.1.0"
}
},
+"cliui": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/cliui/-/cliui-4.0.0.tgz;,
+ "integrity":
"sha512-nY3W5Gu2racvdDk//ELReY+dHjb9PlIcVDFXP72nVIhq2Gy3LuVXYwJoPVudwQnv1shtohpgkdCKT2YaKY0CKw==",
+ "dev": true,
+ "requires": {
+"string-width": "2.1.1",
+"strip-ansi": "4.0.0",
+"wrap-ansi": "2.1.0"
+ }
+},
"debug": {
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz;,
@@ -17884,12 +17895,12 @@
"dev": true
},
"yargs": {
- "version": "10.0.3",
- "resolved": "https://registry.npmjs.org/yargs/-/yargs-10.0.3.tgz;,
- "integrity":
"sha512-DqBpQ8NAUX4GyPP/ijDGHsJya4tYqLQrjPr95HNsr1YwL3+daCfvBwg7+gIC6IdJhR2kATh3hb61vjzMWEtjdw==",
+ "version": "10.1.1",
+ "resolved": "https://registry.npmjs.org/yargs/-/yargs-10.1.1.tgz;,
+ "integrity":
"sha512-7uRL1HZdCbc1QTP+X8mehOPuCYKC/XTaqAPj7gABLfTt6pgLyVRn3QVte4qhtilZouWCvqd1kipgMKl5tKsFiw==",
"dev": true,
"requires": {
-"cliui": "3.2.0",
+"cliui": "4.0.0",
"decamelize": "1.2.0",
"find-up": "2.1.0",
"get-caller-file": "1.0.2",
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/f37fb54daae47ff9ad0b648cff8353eaa7fbc0ac
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/f37fb54daae47ff9ad0b648cff8353eaa7fbc0ac
You're receiving this email because of your account on code.onehippo.org.
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager] Pushed new branch feature/CC-CHANNELMGR-1666
Arthur Bogaart pushed new branch feature/CC-CHANNELMGR-1666 at cms-community / hippo-addon-channel-manager --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-addon-channel-manager/tree/feature/CC-CHANNELMGR-1666 You're receiving this email because of your account on code.onehippo.org. ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-essentials][feature/CC-ESSENTIALS-1108] ESSENTIALS-1108 Change manage content tag for content plugin
Michael Metternich pushed to branch feature/CC-ESSENTIALS-1108 at cms-community
/ hippo-essentials
Commits:
f7bb51e1 by Michael Metternich at 2018-01-09T10:37:37+01:00
ESSENTIALS-1108 Change manage content tag for content plugin
- - - - -
4 changed files:
-
plugins/simple-content/src/main/resources/freemarker/contentlist-main-contentlist-variant.ftl
-
plugins/simple-content/src/main/resources/freemarker/contentlist-main-contentlist.ftl
-
plugins/simple-content/src/main/resources/freemarker/contentpage-main-variant.ftl
- plugins/simple-content/src/main/resources/freemarker/contentpage-main.ftl
Changes:
=
plugins/simple-content/src/main/resources/freemarker/contentlist-main-contentlist-variant.ftl
=
---
a/plugins/simple-content/src/main/resources/freemarker/contentlist-main-contentlist-variant.ftl
+++
b/plugins/simple-content/src/main/resources/freemarker/contentlist-main-contentlist-variant.ftl
@@ -6,7 +6,7 @@
<#list pageable.items as item>
- <@hst.manageContent templateQuery="new-content-document" document=item
defaultPath="content"/>
+ <@hst.manageContent document=item/>
<@hst.link var="link" hippobean=item/>
@@ -23,6 +23,9 @@
+
+<@hst.manageContent templateQuery="new-content-document"
rootPath="content"/>
+
<#if cparam.showPagination>
<#include "../../include/pagination.ftl">
@@ -31,6 +34,8 @@
<#elseif editMode>
Click to
edit Content list
- <@hst.manageContent templateQuery="new-content-document"
defaultPath="content"/>
+
+<@hst.manageContent templateQuery="new-content-document"
rootPath="content"/>
+
=
plugins/simple-content/src/main/resources/freemarker/contentlist-main-contentlist.ftl
=
---
a/plugins/simple-content/src/main/resources/freemarker/contentlist-main-contentlist.ftl
+++
b/plugins/simple-content/src/main/resources/freemarker/contentlist-main-contentlist.ftl
@@ -6,7 +6,7 @@
<#list pageable.items as item>
- <@hst.manageContent templateQuery="new-content-document" document=item
defaultPath="content"/>
+ <@hst.manageContent document=item/>
<@hst.link var="link" hippobean=item/>
${item.title?html}
<#if item.publicationDate??>
@@ -19,6 +19,9 @@
+
+<@hst.manageContent templateQuery="new-content-document"
rootPath="content"/>
+
<#if cparam.showPagination>
<#include "../include/pagination.ftl">
@@ -27,6 +30,8 @@
<#elseif editMode>
Click to
edit Content list
- <@hst.manageContent templateQuery="new-content-document"
defaultPath="content"/>
+
+<@hst.manageContent templateQuery="new-content-document"
rootPath="content"/>
+
=
plugins/simple-content/src/main/resources/freemarker/contentpage-main-variant.ftl
=
---
a/plugins/simple-content/src/main/resources/freemarker/contentpage-main-variant.ftl
+++
b/plugins/simple-content/src/main/resources/freemarker/contentpage-main-variant.ftl
@@ -3,7 +3,7 @@
<#-- @ftlvariable name="document" type="{{beansPackage}}.ContentDocument" -->
<#if document??>
- <@hst.manageContent templateQuery="new-content-document" document=document
defaultPath="content"/>
+ <@hst.manageContent document=document/>
${document.title?html}
<#if document.publicationDate??>
<@fmt.formatDate value=document.publicationDate.time type="date"
dateStyle="medium"/>
@@ -14,10 +14,4 @@
<@hst.html hippohtml=document.content/>
-<#-- @ftlvariable name="editMode" type="java.lang.Boolean"-->
-<#elseif editMode>
-
- "> Click
to edit Simple Content
- <@hst.manageContent templateQuery="new-content-document"
defaultPath="content"/>
-
\ No newline at end of file
=
plugins/simple-content/src/main/resources/freemarker/contentpage-main.ftl
=
--- a/plugins/simple-content/src/main/resources/freemarker/contentpage-main.ftl
+++ b/plugins/simple-content/src/main/resources/freemarker/contentpage-main.ftl
@@ -3,7 +3,7 @@
<#-- @ftlvariable name="document" type="{{beansPackage}}.ContentDocument" -->
<#if document??>
- <@hst.manageContent templateQuery="new-content-document" document=document
defaultPath="content"/>
+ <@hst.manageContent document=document />
${document.title?html}
<#if document.publicationDate??>
@@ -17,10 +17,4 @@
<@hst.html hippohtml=document.content/>
-<#-- @ftlvariable name="editMode" type="java.lang.Boolean"-->
-<#elseif editMode>
-
- "> Click
to edit Simple Content
- <@hst.manageContent templateQuery="new-content-document"
defaultPath="content"/>
-
\ No newline at end of file
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-essentials/commit/f7bb51e1c1cf69b0da95325fc6a1ec1db218a336
---
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager] Deleted branch bugfix/CHANNELMGR-1658
Bert Leunis deleted branch bugfix/CHANNELMGR-1658 at cms-community / hippo-addon-channel-manager --- You're receiving this email because of your account on code.onehippo.org. ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][release/5.0] 2 commits: CHANNELMGR-1658 Backport: Report page loads as user activity
Bert Leunis pushed to branch release/5.0 at cms-community /
hippo-addon-channel-manager
Commits:
36d17f85 by Mathijs den Burger at 2018-01-08T16:32:26+01:00
CHANNELMGR-1658 Backport: Report page loads as user activity
Otherwise active logout will kick out users that are just browsing pages
in the Channel Manager (e.g. to preview content).
(cherry picked from commit 6c316fd9502e75a61bc34afc585882d99af4887d)
- - - - -
d5a8241f by Bert Leunis at 2018-01-09T09:23:35+01:00
CHANNELMGR-1658 Reintegrate bugfix/CHANNELMGR-1658
- - - - -
2 changed files:
- frontend-ng/src/angularjs/channel/hippoIframe/hippoIframe.service.js
- frontend-ng/src/angularjs/channel/hippoIframe/hippoIframe.service.spec.js
Changes:
=
frontend-ng/src/angularjs/channel/hippoIframe/hippoIframe.service.js
=
--- a/frontend-ng/src/angularjs/channel/hippoIframe/hippoIframe.service.js
+++ b/frontend-ng/src/angularjs/channel/hippoIframe/hippoIframe.service.js
@@ -1,5 +1,5 @@
/*
- * Copyright 2016 Hippo B.V. (http://www.onehippo.com)
+ * Copyright 2016-2018 Hippo B.V. (http://www.onehippo.com)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -15,7 +15,6 @@
*/
class HippoIframeService {
-
constructor(
$log,
$q,
@@ -109,6 +108,8 @@ class HippoIframeService {
delete this.deferredReload;
deferred.resolve();
}
+
+this.CmsService.publish('user-activity');
}
_determineRenderPathInfo() {
=
frontend-ng/src/angularjs/channel/hippoIframe/hippoIframe.service.spec.js
=
--- a/frontend-ng/src/angularjs/channel/hippoIframe/hippoIframe.service.spec.js
+++ b/frontend-ng/src/angularjs/channel/hippoIframe/hippoIframe.service.spec.js
@@ -1,5 +1,5 @@
/*
- * Copyright 2016 Hippo B.V. (http://www.onehippo.com)
+ * Copyright 2016-2018 Hippo B.V. (http://www.onehippo.com)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -129,6 +129,12 @@ describe('HippoIframeService', () => {
$rootScope.$digest();
});
+ it('reports page loads as user activity', () => {
+spyOn($window.APP_TO_CMS, 'publish');
+HippoIframeService.signalPageLoadCompleted();
+expect($window.APP_TO_CMS.publish).toHaveBeenCalledWith('user-activity');
+ });
+
it('ignores page loads which are no reloads', () => {
spyOn($log, 'warn');
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/compare/158f2ee7bd2f20c6206bd909703956d3fb2b3860...d5a8241f33670ae800a89920603764a48faf0c66
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/compare/158f2ee7bd2f20c6206bd909703956d3fb2b3860...d5a8241f33670ae800a89920603764a48faf0c66
You're receiving this email because of your account on code.onehippo.org.
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
