Commit Graph

7854 Commits

Author SHA1 Message Date
Claudia Agache
02d0ad8bd8 APPS-706 increase activeMQ memory because sometimes it stops: Transport (tcp://activemq:61616) failed, not attempting to automatically reconnect 2021-01-05 11:30:20 +02:00
Claudia Agache
7dce79211e APPS-706 increase activeMQ memory because sometimes it stops: Transport (tcp://activemq:61616) failed, not attempting to automatically reconnect 2021-01-05 09:38:18 +02:00
rodicasutu
84ec03cd9c Merge remote-tracking branch 'remotes/origin/release/V3.4' 2021-01-04 11:36:35 +02:00
rodicasutu
f37a0115bc update headers year to 2021 (release/V3.4) 2021-01-04 11:21:52 +02:00
rodicasutu
ffaed71484 Merge remote-tracking branch 'remotes/origin/release/V3.3' into release/V3.4
# Conflicts:
#	rm-community/rm-community-share/source/java/org/alfresco/module/org_alfresco_module_rm_share/evaluator/FileToActionEvaluator.java
2021-01-04 11:03:10 +02:00
rodicasutu
940d1e06f8 update headers year to 2021 (release/V3.3) 2021-01-04 10:56:04 +02:00
rodicasutu
7db2afff61 Merge remote-tracking branch 'remotes/origin/release/V3.2' into release/V3.3 2021-01-04 10:40:29 +02:00
rodicasutu
1b4f51f4ec update headers year to 2021 (release/V3.2) 2021-01-04 10:31:26 +02:00
rodicasutu
f00d444dd8 Merge remote-tracking branch 'remotes/origin/release/V3.1' into release/V3.2 2021-01-04 10:17:48 +02:00
rodicasutu
ab6aecdb74 update headers year to 2021 (release/V3.1) 2021-01-04 10:09:54 +02:00
rodicasutu
f23cbfc0e6 Merge remote-tracking branch 'remotes/origin/release/V3.0' into release/V3.1 2021-01-04 09:54:37 +02:00
rodicasutu
0f4a81a763 update headers year to 2021 2021-01-04 09:44:44 +02:00
Claudia Agache
91bc2f6868 Merge remote-tracking branch 'origin/release/V3.4' into feature/APPS-594_Intermittent_openPage 2020-12-18 09:50:11 +02:00
Claudia Agache
6aad767102 Merge pull request #1298 from Alfresco/feature-3.4/APPS-594_Intermittent_openPage_no
Apps 594 Tests fail intermittently with timeout when opening page
2020-12-18 09:45:22 +02:00
evasques
509e0836fb Merge pull request #1307 from Alfresco/merge/MNT-22062_revert-the-revert-commit
Merge/mnt 22062 revert the revert commit
2020-12-17 13:29:32 +00:00
Eva Vasques
7c79c95e75 Merge remote-tracking branch 'origin/release/V3.4' into merge/MNT-22062_revert-the-revert-commit 2020-12-16 15:28:56 +00:00
evasques
9d1c89323f Merge pull request #1306 from Alfresco/merge-3.4/MNT-22062_revert_the_revert_commit
Merge 3.4/mnt 22062 revert the revert commit
2020-12-16 15:22:57 +00:00
Eva Vasques
4c69a81713 Merge remote-tracking branch 'origin/release/V3.4.1.x' into merge-3.4/MNT-22062_revert_the_revert_commit 2020-12-16 10:13:11 +00:00
Travis CI User
a3c56c6547 [maven-release-plugin][skip ci] prepare for next development iteration 2020-12-16 07:55:38 +00:00
Travis CI User
c8dd4b1288 [maven-release-plugin][skip ci] prepare release V3.4.1.1 ags-3.4.1.1 2020-12-16 07:55:29 +00:00
ehardon
d14a4ecdc8 [enterprise release 3.4.1.1 3.4.1.2-SNAPSHOT][publish] [skip tests] 2020-12-16 08:57:40 +02:00
estan
c5db115320 APPS-659 : [Upgrade] Search Result points to incorrect link to Folder on Hold
--disable behaviours
2020-12-15 22:40:27 +02:00
ramunteanu
e3826d105c Merge pull request #1303 from Alfresco/feature/APPS-625
feature/APPS-625
2020-12-15 17:14:35 +02:00
evasques
0da9bf1b49 Merge pull request #1305 from Alfresco/hotfix-3.4/MNT-22062_revert_the_revert_commit
Revert "Revert "Merge pull request #1291 from Alfresco/hotfix-3.2.0.1…
2020-12-15 10:01:41 +00:00
Rodica Sutu
159c3f8132 Merge pull request #1304 from Alfresco/feature/APPS-591_UpdatesForACS7.0.0
Feature/apps 591 updates for acs7.0.0
2020-12-15 09:31:25 +02:00
estan
a51c1c91c7 Merge remote-tracking branch 'origin/release/V3.4' into feature-3.4/APPS-659_Upgrade_issue 2020-12-15 09:01:26 +02:00
rodicasutu
64fc695efb revert unwanted changes 2020-12-14 13:18:22 +02:00
rodicasutu
aab7705b44 updates to ACS 7.0.0 M3 2020-12-14 13:13:11 +02:00
rodicasutu
52b610e256 Merge branch 'master' of https://github.com/Alfresco/governance-services into feature/APPS-591_UpdatesForACS7.0.0
# Conflicts:
#	rm-enterprise/pom.xml
2020-12-14 12:56:03 +02:00
Eva Vasques
cfc5d1ac74 Revert "Revert "Merge pull request #1291 from Alfresco/hotfix-3.2.0.11/MNT-22062_diplay_cat_retention_poor_performance""
This reverts commit e7b3724d44.
2020-12-14 09:56:54 +00:00
Claudia Agache
7011b30201 Merge remote-tracking branch 'origin/release/V3.4' into feature-3.4/APPS-594_Intermittent_openPage_no 2020-12-11 11:25:37 +02:00
Travis CI User
ecb6b1e037 [maven-release-plugin][skip ci] prepare for next development iteration 2020-12-10 15:29:11 +00:00
Travis CI User
a3370255f7 [maven-release-plugin][skip ci] prepare release V3.5.0-M1 ags-3.5.0-M1 2020-12-10 15:29:02 +00:00
Claudia Agache
f11b152d08 [enterprise release 3.5.0-M1 3.5.0-SNAPSHOT] [skip tests] 2020-12-10 16:31:42 +02:00
Raluca Munteanu
8a76e6369f APPS-625: [AGS/S3] Content can be changed for a record previously moved between stores
- Removed unused test left over merge with V3.4
2020-12-10 11:34:19 +02:00
Travis CI User
5add69342c [maven-release-plugin][skip ci] prepare for next development iteration 2020-12-09 15:52:36 +00:00
Travis CI User
315d464409 [maven-release-plugin][skip ci] prepare release V3.5.0-A2 ags-3.5.0-A2 2020-12-09 15:52:27 +00:00
Claudia Agache
593ac413e9 [enterprise release 3.5.0-A2 3.5.0-SNAPSHOT] [skip tests] 2020-12-09 16:47:36 +02:00
Claudia Agache
c817cc6e0b Merge pull request #1302 from Alfresco/fix/APPS-580-final-fix
fix for APPS-580 and APPS-688
2020-12-09 16:22:49 +02:00
Piero Cittadino
945f918bee applied bogdan fixes 2020-12-09 13:26:14 +02:00
estan
72c1390c65 APPS-659 - [Upgrade] Search Result points to incorrect link to Folder 2020-12-09 10:14:46 +02:00
Piero Cittadino
c43170a531 fix for APPS-580 and APPS-688 2020-12-09 09:49:42 +02:00
Claudia Agache
09def0985e Record only merge of version change. 2020-12-08 16:22:55 +02:00
Bogdan Ioan Gabor
8bbb7dbf5d Merge pull request #1300 from Alfresco/revert-1292-feature-3.4/APPS-580_create_site_authority_issue
Revert "APPS-580: Fixed the issue by using System user instead of the admin u…"
2020-12-08 14:50:16 +02:00
Claudia Agache
663956909f Record only merge of version change. 2020-12-08 14:34:15 +02:00
Claudia Agache
3cfbc9b954 Update version to 3.4.1.1-SNAPSHOT 2020-12-08 14:30:40 +02:00
Bogdan Ioan Gabor
eecf34d0c2 Revert "APPS-580: Fixed the issue by using System user instead of the admin u…" 2020-12-08 14:19:12 +02:00
Bogdan Ioan Gabor
dba0da71c9 Merge pull request #1292 from Alfresco/feature-3.4/APPS-580_create_site_authority_issue
APPS-580: Fixed the issue by using System user instead of the admin u…
2020-12-08 13:47:36 +02:00
Travis CI User
6d79020e86 [maven-release-plugin][skip ci] prepare for next development iteration 2020-12-08 11:41:14 +00:00
Travis CI User
4d33f2033e [maven-release-plugin][skip ci] prepare release V3.4.1 ags-3.4.1 2020-12-08 11:41:06 +00:00