[HippoCMS-scm] [Git][cms-community/hippo-jackrabbit][trunk] JCR-4244: Upgrade tomcat dependency to 8.5.24
GitLab Mirror pushed to branch trunk at cms-community / hippo-jackrabbit Commits: 9a51355e by Julian Reschke at 2018-01-08T15:45:34+00:00 JCR-4244: Upgrade tomcat dependency to 8.5.24 git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/trunk@1820573 13f79535-47bb-0310-9956-ffa450edef68 - - - - - 1 changed file: - jackrabbit-webapp/pom.xml Changes: = jackrabbit-webapp/pom.xml = --- a/jackrabbit-webapp/pom.xml +++ b/jackrabbit-webapp/pom.xml @@ -36,7 +36,7 @@ 1.0.39 -7.0.82 +8.5.24 View it on GitLab: https://code.onehippo.org/cms-community/hippo-jackrabbit/commit/9a51355ea57dca39afd6b891d93aa4dc500fd47c --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-jackrabbit/commit/9a51355ea57dca39afd6b891d93aa4dc500fd47c 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][bugfix/CHANNELMGR-1658] CHANNELMGR-1658 Backport: Report page loads as user activity
Michael Metternich pushed to branch bugfix/CHANNELMGR-1658 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)
- - - - -
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/commit/36d17f85ea515fe97b27e22133d44d798d0aa4ee
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/36d17f85ea515fe97b27e22133d44d798d0aa4ee
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-1658
Michael Metternich pushed new branch bugfix/CHANNELMGR-1658 at cms-community / hippo-addon-channel-manager --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-addon-channel-manager/tree/bugfix/CHANNELMGR-1658 You're receiving this email because of your account on code.onehippo.org. ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager] Deleted branch bugfix/CHANNELMGR-1659
Michael Metternich deleted branch bugfix/CHANNELMGR-1659 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] Deleted branch feature/CHANNELMGR-1578
Michael Metternich deleted branch feature/CHANNELMGR-1578 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] Deleted branch feature/CHANNELMGR-1555
Michael Metternich deleted branch feature/CHANNELMGR-1555 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-cms][release/4.2] CMS-10945 update copyright year
Bert Leunis pushed to branch release/4.2 at cms-community / hippo-cms Commits: 88e1cfd3 by Bert Leunis at 2018-01-08T12:54:14+01:00 CMS-10945 update copyright year - - - - - 1 changed file: - richtext/ckeditor/plugins/src/main/resources/ckeditor/plugins/hippopicker/plugin.js Changes: = richtext/ckeditor/plugins/src/main/resources/ckeditor/plugins/hippopicker/plugin.js = --- a/richtext/ckeditor/plugins/src/main/resources/ckeditor/plugins/hippopicker/plugin.js +++ b/richtext/ckeditor/plugins/src/main/resources/ckeditor/plugins/hippopicker/plugin.js @@ -1,5 +1,5 @@ /* - * Copyright 2013-2016 Hippo B.V. (http://www.onehippo.com) + * Copyright 2013-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. View it on GitLab: https://code.onehippo.org/cms-community/hippo-cms/commit/88e1cfd346ea22bf6f425bc6614a5c75ff415170 --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-cms/commit/88e1cfd346ea22bf6f425bc6614a5c75ff415170 You're receiving this email because of your account on code.onehippo.org. ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms-release][release/12.0] CMS-10944 for clarity also update cms version
Bert Leunis pushed to branch release/12.0 at cms-community / hippo-cms-release Commits: d4b70e56 by Bert Leunis at 2018-01-08T12:02:02+01:00 CMS-10944 for clarity also update cms version - - - - - 1 changed file: - pom.xml Changes: = pom.xml = --- a/pom.xml +++ b/pom.xml @@ -48,7 +48,7 @@ 4.0.1 4.7.1-h12.0.1-SNAPSHOT 4.0.2 -5.0.4 +5.0.5-SNAPSHOT 4.0.0 4.0.0 5.0.4-SNAPSHOT View it on GitLab: https://code.onehippo.org/cms-community/hippo-cms-release/commit/d4b70e56993a0ec779f3ef62177c6f5251ab680b --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-cms-release/commit/d4b70e56993a0ec779f3ef62177c6f5251ab680b 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] Deleted branch feature/ESSENTIALS-1106
Jeroen Hoffman deleted branch feature/ESSENTIALS-1106 at cms-community / hippo-essentials --- 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][master] 6 commits: ESSENTIALS-1106 disbale behavior and remove suggestion
Jeroen Hoffman pushed to branch master at cms-community / hippo-essentials Commits: 996cb58d by Jasper Floor at 2017-11-27T16:41:53+01:00 ESSENTIALS-1106 disbale behavior and remove suggestion - - - - - 57b6dfc7 by Jasper Floor at 2017-11-27T16:42:50+01:00 ESSENTIALS-1106 copyright - - - - - c49fb4fb by Jasper Floor at 2017-11-27T16:52:41+01:00 ESSENTIALS-1106 disable input in not checked - - - - - 0b5d4f6b by Jeroen Hoffman at 2018-01-08T10:20:36+01:00 ESSENTIALS-1106 Merge branch master into feature/ESSENTIALS-1106 - - - - - c50e92e0 by Jeroen Hoffman at 2018-01-08T11:51:08+01:00 ESSENTIALS-1106 put back the placeholder=10, but with always required. Also add reg exp pattern so there must be a 1 or 2 digit value. - - - - - 40190f3e by Jeroen Hoffman at 2018-01-08T11:58:26+01:00 ESSENTIALS-1106 Reintegrate branch feature/ESSENTIALS-1106 into master - - - - - 1 changed file: - plugins/related-documents/src/main/resources/META-INF/resources/feature/relatedDocumentsPlugin/relatedDocumentsPlugin.html Changes: = plugins/related-documents/src/main/resources/META-INF/resources/feature/relatedDocumentsPlugin/relatedDocumentsPlugin.html = --- a/plugins/related-documents/src/main/resources/META-INF/resources/feature/relatedDocumentsPlugin/relatedDocumentsPlugin.html +++ b/plugins/related-documents/src/main/resources/META-INF/resources/feature/relatedDocumentsPlugin/relatedDocumentsPlugin.html @@ -1,5 +1,5 @@
[HippoCMS-scm] [Git][cms-community/hippo-essentials][feature/ESSENTIALS-1106] 36 commits: ESSENTIALS-1119 Add "built-in" instruction for adding mvn dependency
Jeroen Hoffman pushed to branch feature/ESSENTIALS-1106 at cms-community / hippo-essentials Commits: 80aef3cf by Tobias Jeger at 2017-11-27T16:27:50+01:00 ESSENTIALS-1119 Add built-in instruction for adding mvn dependency - use this instruction rather than custom instruction classes - fix the casing of the hst-bean-classes built-in instruction - make the SDK utilities more robust against missing files or data - remove now-superfluous ParameterService classes - remove unused class FrontendPluginBuilder - - - - - 1cd8ad39 by Tobias Jeger at 2017-11-27T16:27:51+01:00 ESSENTIALS-1119 Refactor SEO plugin to use mavenDependency instruction Doing so removes the need to rebuild twice when installing this feature. - - - - - 6c7185e2 by Tobias Jeger at 2017-11-27T16:27:51+01:00 ESSENTIALS-1119 Refactor some plugins to use mavenDependency instructions - - - - - c60cc40e by Tobias Jeger at 2017-11-27T17:08:59+01:00 ESSENTIALS-1119 Refactor BR plugins to use mavenDependency instructions this shaves off the need for a few rebuilds. - - - - - 625a6bea by Arent-Jan Banck at 2017-11-28T15:22:24+01:00 ESSENTIALS-1126 prepare the 12.2 development iteration - - - - - 0bfc2861 by Tobias Jeger at 2017-11-29T09:55:00+01:00 ESSENTIALS-1119 Reintegrate feature/ESSENTIALS-1119-rebased - - - - - cb9ef7f6 by Tobias Jeger at 2017-11-29T14:39:27+01:00 ESSENTIALS-1127 Refactor the change message compilation to remove Guava dependency of API - - - - - e703163a by Tobias Jeger at 2017-11-29T14:41:08+01:00 ESSENTIALS-1127 Refactor WebXmlUtils into WebXmlService Get rid of unused plugin dependencies on SDK-implementation. - - - - - 2e51cb03 by Tobias Jeger at 2017-11-29T14:41:29+01:00 ESSENTIALS-1127 Refactor Log4j2Utils to become an injectable service. - - - - - 1f3e56df by Tobias Jeger at 2017-11-30T14:53:15+01:00 ESSENTIALS-1127 Refactor ContextXmlUtils to become an injectable service Also extract some common usage patterns for updating XML files in order to reduce code duplication. - - - - - 0bbb2278 by Tobias Jeger at 2017-12-01T09:17:24+01:00 ESSENTIALS-1127 Refactor MavenAssemblyUtils to become an injectable service - - - - - 38bac71b by Tobias Jeger at 2017-12-01T12:09:09+01:00 ESSENTIALS-1127 Refactor MavenCargoUtils to become an injectable service - - - - - 3f0c8f3a by Tobias Jeger at 2017-12-03T13:26:06+01:00 ESSENTIALS-1127 Mark plugin pom to discourage depending on implementation - - - - - 019251c1 by Arent-Jan Banck at 2017-12-04T14:14:58+01:00 ESSENTIALS-1130 Update Essentials to use the Jackson2 classes - - - - - dd6b50c6 by Tobias Jeger at 2017-12-05T10:43:01+01:00 ESSENTIALS-1127 Fix return value of URL rewriter install instruction - - - - - a55356b4 by Tobias Jeger at 2017-12-05T12:06:16+01:00 ESSENTIALS-1127 Reduce API overhead for simple data class MavenDependency - - - - - 8196fb62 by Tobias Jeger at 2017-12-05T12:06:44+01:00 ESSENTIALS-1127 Reintegrate feature/ESSENTIALS-1127 - - - - - 0c036794 by Tobias Jeger at 2017-12-05T12:07:42+01:00 ESSENTIALS-1132 Get rid of PluginParameterService - - - - - 3a3028b8 by Arent-Jan Banck at 2017-12-06T19:30:33+01:00 ESSENTIALS-1134 Use request.getScheme() instead of hardcoded http:// - - - - - f424828c by Tobias Jeger at 2017-12-07T21:17:04+01:00 ESSENTIALS-1132 Remove superfluous @type JSON props from descriptors - - - - - a197c800 by Tobias Jeger at 2017-12-07T23:43:59+01:00 ESSENTIALS-1132 Remove remaining @type JSON props from descriptors - Replace bean+interface construction for maven dependencies with a simple plain bean hierarchy in the API. - Extract dependency utils into MavenDependencyService - - - - - a186a2db by Tobias Jeger at 2017-12-08T10:30:58+01:00 ESSENTIALS-1132 Trivial refactoring to improve ordering of attributes - - - - - 7401a3cc by Tobias Jeger at 2017-12-08T22:31:58+01:00 ESSENTIALS-1132 Create MavenRepositoryService - Migrate repository-related functionality from MavenDependencyUtils to implementation of new service - Replace interface+class construct for Repository bean with simple data bean MavenRepository in API module - - - - - 5ff37f50 by Tobias Jeger at 2017-12-08T23:06:38+01:00 ESSENTIALS-1132 Rename DependencyUtils to EnterpriseUtils - - - - - f59e21a5 by Tobias Jeger at 2017-12-10T10:04:47+01:00 ESSENTIALS-1132 Refactor Vendor to simple data bean rather than defining an interface + implementation. - - - - - 624684b7 by Tobias Jeger at 2017-12-11T15:51:23+01:00 ESSENTIALS-1132 Delete PluginDescriptor interface to promote data bean - - - - - 19bfe701 by Tobias Jeger at 2017-12-11T15:53:14+01:00 ESSENTIALS-1132 Move PluginDescriptorRestful (impl) to PluginDescriptor (api) - - - - - 12539fc8 by Tobias Jeger at 2017-12-11T22:01:41+01:00 ESSENTIALS-1132 Fix EnterpriseUtils to avoid duplicate dependencies - - - - - d456134d by Tobias Jeger at 2017-12-11T22:04:28+01:00 ESSENTIALS-1132 Refactor PluginDescriptorRestful into PluginDescriptor - without dependencies on the SDK implementation module. - - - - -
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager] Deleted branch feature/CHANNELMGR-1274
Michael Metternich deleted branch feature/CHANNELMGR-1274 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] Deleted branch feature/CC-CHANNELMGR-1615
Michael Metternich deleted branch feature/CC-CHANNELMGR-1615 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] Deleted branch feature/CC-CHANNELMGR-1598
Michael Metternich deleted branch feature/CC-CHANNELMGR-1598 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] Deleted branch feature/CC-CHANNELMGR-1563
Michael Metternich deleted branch feature/CC-CHANNELMGR-1563 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] Deleted branch feature/CC-CHANNELMGR-1552
Michael Metternich deleted branch feature/CC-CHANNELMGR-1552 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] Deleted branch feature/CC-CHANNELMGR-1526
Michael Metternich deleted branch feature/CC-CHANNELMGR-1526 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] Deleted branch feature/CC-CHANNELMGR-1480
Michael Metternich deleted branch feature/CC-CHANNELMGR-1480 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] Deleted branch feature/CC-CHANNELMGR-1484
Michael Metternich deleted branch feature/CC-CHANNELMGR-1484 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] Deleted branch bugfix/CHANNELMGR-1544
Michael Metternich deleted branch bugfix/CHANNELMGR-1544 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] Deleted branch bugfix/CHANNELMGR-1464
Michael Metternich deleted branch bugfix/CHANNELMGR-1464 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] Deleted branch bugfix/CHANNELMGR-1463
Michael Metternich deleted branch bugfix/CHANNELMGR-1463 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
