Commit Graph

7657 Commits

Author SHA1 Message Date
Travis CI User
f2c607d488 [maven-release-plugin][skip ci] prepare release V3.4.1 2020-12-08 11:41:06 +00:00
ehardon
94fca6d267 [enterprise release 3.4.1 3.4.2-SNAPSHOT][publish] [skip tests] 2020-12-08 12:44:02 +02:00
ehardon
66f85d9d6b Revert "Merge pull request #1291 from Alfresco/hotfix-3.2.0.11/MNT-22062_diplay_cat_retention_poor_performance"
This reverts commit 95f47d0afa, reversing
changes made to bb8e7d9c93.
2020-12-08 12:06:01 +02:00
Claudia Agache
39751dfc84 Merge remote-tracking branch 'origin/release/V3.4' into feature-3.4/APPS-594_Intermittent_openPage_no 2020-12-08 10:14:06 +02:00
ehardon
896aa23196 Record only merge 2020-12-08 09:15:07 +02:00
ehardon
37d42fac30 Updated regex for release version 2020-12-08 09:13:11 +02:00
ehardon
165b05f71b Merge branch 'release/V2.7' into release/V3.0 2020-12-08 09:13:04 +02:00
ehardon
bc8ddfc035 Merge branch 'release/V3.3' into release/V3.4 2020-12-08 09:12:16 +02:00
ehardon
ad25357387 Record only merge 2020-12-08 09:11:05 +02:00
ehardon
5f4b2ad488 Record only merge 2020-12-08 09:10:59 +02:00
ehardon
99b72da5a8 Updated regex for release version 2020-12-08 09:10:18 +02:00
ehardon
a7bd256e76 Merge branch 'release/V2.7' into release/V3.0 2020-12-08 09:10:14 +02:00
ehardon
d14a52746c Updated regex for release version 2020-12-08 09:08:36 +02:00
ehardon
ceada4d6e8 Merge branch 'release/V2.7' into release/V3.0 2020-12-08 09:08:18 +02:00
ehardon
a8a4b75ea5 Merge branch 'release/V3.2' into release/V3.3 2020-12-08 09:05:35 +02:00
ehardon
40dac29033 Merge remote-tracking branch 'origin/release/V3.2.0.x' into release/V3.2
# Conflicts:
#	pom.xml
#	rm-automation/pom.xml
#	rm-automation/rm-automation-community-rest-api/pom.xml
#	rm-automation/rm-automation-enterprise-rest-api/pom.xml
#	rm-automation/rm-automation-ui/pom.xml
#	rm-benchmark/pom.xml
#	rm-community/pom.xml
#	rm-community/rm-community-repo/pom.xml
#	rm-community/rm-community-rest-api-explorer/pom.xml
#	rm-community/rm-community-share/pom.xml
#	rm-enterprise/pom.xml
#	rm-enterprise/rm-enterprise-repo/pom.xml
#	rm-enterprise/rm-enterprise-rest-api-explorer/pom.xml
#	rm-enterprise/rm-enterprise-share/pom.xml
2020-12-08 09:02:16 +02:00
ehardon
e9c1e36a0e Merge remote-tracking branch 'origin/release/V3.2.0.x' into release/V3.2.0.x
# Conflicts:
#	travis/.travis.publish-stage.yml
2020-12-08 08:58:36 +02:00
ehardon
3441fde97b Merge branch 'release/V3.1' into release/V3.2
# Conflicts:
#	scripts/set-release-variables.sh
2020-12-08 08:57:39 +02:00
ehardon
0bb9b1b879 Merge branch 'release/V3.1' into release/V3.2 2020-12-07 17:53:42 +02:00
ehardon
e3a3aee6c8 Record only merge 2020-12-07 17:51:27 +02:00
ehardon
188beeb60b Merge branch 'release/V3.0' into release/V3.1 2020-12-07 17:50:03 +02:00
ehardon
f9c36c78b2 Merge branch 'release/V3.0' into release/V3.1 2020-12-07 17:45:22 +02:00
ehardon
f2dbe3ce09 Record only merge 2020-12-07 17:42:11 +02:00
ehardon
5d520e20ce Record only merge 2020-12-07 17:42:06 +02:00
ehardon
e19bbcb708 Record only merge 2020-12-07 17:42:00 +02:00
ehardon
b982294311 Updated regex for release version 2020-12-07 17:39:23 +02:00
ehardon
98d0152be8 Merge branch 'release/V2.7' into release/V3.0 2020-12-07 17:39:19 +02:00
ehardon
ae554871fe Updated regex for release version 2020-12-07 17:38:01 +02:00
ehardon
e323717fb5 Merge branch 'release/V2.7' into release/V3.0 2020-12-07 17:37:53 +02:00
ehardon
e5f8260339 Updated regex for release version 2020-12-07 17:35:30 +02:00
ehardon
7d108c8e48 Merge branch 'release/V2.7' into release/V3.0 2020-12-07 17:35:15 +02:00
ehardon
1c244c8fff Updated regex for release version 2020-12-07 17:30:57 +02:00
ehardon
a7376945da Merge branch 'release/V2.7' into release/V3.0 2020-12-07 16:59:00 +02:00
ehardon
2e312da479 Record only merge 2020-12-07 16:48:32 +02:00
ehardon
6c4b96c3c2 Record only merge 2020-12-07 16:48:25 +02:00
ehardon
53bfc5496b Record only merge 2020-12-07 16:48:19 +02:00
ehardon
04470b55a7 Merge remote-tracking branch 'origin/release/V2.7.2.x' into release/V2.7.2.x 2020-12-07 16:45:03 +02:00
ehardon
2ead6da3db Fix publish stage credentials and release script regex 2020-12-07 16:44:28 +02:00
ehardon
eacc9686fb Fix publish stage credentials and release script regex 2020-12-07 16:37:24 +02:00
ehardon
d6528592f2 Fix publish stage credentials and release script regex 2020-12-07 16:35:38 +02:00
ehardon
9efb9a2071 Fix publish stage credentials and release script regex 2020-12-07 16:27:44 +02:00
ehardon
50b020bd96 Fix publish stage in travis 2020-12-07 14:43:22 +02:00
Travis CI User
dd2e335de5 [maven-release-plugin][skip ci] prepare for next development iteration 2020-12-07 11:55:40 +00:00
Travis CI User
7b4c413bf1 [maven-release-plugin][skip ci] prepare release V3.2.0.11 2020-12-07 11:55:31 +00:00
Claudia Agache
75aec4ef25 Merge branch 'release/V3.4' into feature-3.4/APPS-594_Intermittent_openPage_no 2020-12-07 13:52:44 +02:00
ehardon
942f58b92b [enterprise release 3.2.0.11 3.2.0.12-SNAPSHOT][publish] [skip tests] 2020-12-07 12:49:10 +02:00
ehardon
d8cfba51fe [enterprise release 3.2.0.11 3.2.0.12-SNAPSHOT][publish][skip tests] 2020-12-07 09:43:33 +02:00
Alexandru-Eusebiu Epure
95f47d0afa Merge pull request #1291 from Alfresco/hotfix-3.2.0.11/MNT-22062_diplay_cat_retention_poor_performance
MNT-22062 : poor performance viewing category retention schedule
2020-12-04 19:43:38 +02:00
Epure Alexandru-Eusebiu
4b5978e199 Revert "Change travis.yml setting to trigger a build."
This reverts commit a70555b11c.
2020-12-04 19:42:49 +02:00
Bogdan Ioan Gabor
9920ef1500 APPS-580: Fixed the issue by using System user instead of the admin user. 2020-12-04 13:45:04 +02:00