Commit Graph

1159 Commits

Author SHA1 Message Date
ehardon
4bad138d82 Merge remote-tracking branch 'origin/master' into feature/APPS-832_IntermittentStartupFailure 2021-03-05 14:42:41 +02:00
ehardon
a9d0ff98b3 Merge remote-tracking branch 'origin/master' into feature/APPS-852
# Conflicts:
#	rm-enterprise/rm-enterprise-repo/src/unit-test/java/org/alfresco/rm/rest/api/classification/SecuringMarksChildrenRelationUnitTest.java
2021-03-05 14:28:41 +02:00
ehardon
b8847e4089 - remove logger check 2021-03-05 13:59:52 +02:00
ehardon
ab3f4a16eb address PR comment 2021-03-05 10:14:53 +02:00
Tom Page
162247df68 APPS-659 Whitespace fix. 2021-03-04 16:54:41 +00:00
Tom Page
2f0c70eed6 APPS-659 Avoid relying on the primary parent being a CONTAINS relation. 2021-03-04 16:47:31 +00:00
ehardon
20f877d5fe add header for LockCallback class 2021-03-04 15:54:31 +02:00
ehardon
74deefe0c0 APPS-852: Allow lowercase operation
- modify operation field to op
2021-03-04 15:27:35 +02:00
estan
5326ebad04 APPS-659
[Upgrade] Search Result points to incorrect link to Folder on Hold
2021-03-04 14:42:30 +02:00
ehardon
9c3c2354a8 APPS-832: address PR comment 2021-03-04 13:40:15 +02:00
ehardon
e191018231 APPS-832: prevent multiple nodes from initializing the custom properties 2021-03-03 15:10:33 +02:00
estan
b3d8975444 APPS-659
[Upgrade] Search Result points to incorrect link to Folder on Hold
2021-03-02 15:04:41 +02:00
estan
e7f8862a7b APPS-659
[Upgrade] Search Result points to incorrect link to Folder on Hold
2021-02-28 19:22:31 +02:00
estan
a27e2aaa9e APPS-659
[Upgrade] Search Result points to incorrect link to Folder on Hold
2021-02-28 10:48:20 +02:00
Piero Cittadino
e8d5425538 Share upgrade 2021-02-25 18:56:59 +02:00
Piero Cittadino
60b0a40a11 Update UpdateObjectAuditEvent.java 2021-02-24 19:03:05 +02:00
estan
ae3e843cb9 APPS-761 [Regression]Icon and audit entry for "Link to" 2021-02-23 19:31:07 +02:00
ehardon
36726ad375 Merge remote-tracking branch 'origin/master' into feature/APPS-737_SecurityGroupRestAPI 2021-02-08 14:11:51 +02:00
pieCit87
bd5271a2d8 Merge pull request #1324 from Alfresco/feature/APPS-714-lib-upgrade
Feature/apps 714 lib upgrade and fixes
2021-02-08 14:04:38 +02:00
ehardon
3d4fc15042 Merge remote-tracking branch 'origin/master' into feature/APPS-737_SecurityGroupRestAPI 2021-02-08 11:06:57 +02:00
Piero Cittadino
871a5bcfe7 fix for community rest api 2021-02-03 23:34:52 +02:00
Andreea Nechifor
a48a5bb8cd Fix copyright 2021-02-01 13:39:34 +02:00
ehardon
275cc12f65 Merge remote-tracking branch 'origin/master' into feature/APPS-737_SecurityGroupRestAPI 2021-02-01 12:17:34 +02:00
Andreea Nechifor
82ec8680d7 change notificationFrequency to Transaction_Commit (TRANSACTION_COMMIT: The event handler is queued and invoked at the end of the transaction after it has been committed. A proxy around the event handler manages the queuing.) 2021-02-01 12:15:09 +02:00
estan
1c03a3028b APPS-659 [Upgrade] Search Result points to incorrect link to Folder on Hold
--added test and renamed from 3.4 to 3.5
2021-01-21 10:38:33 +02:00
ehardon
820b8b0fc6 APPS-737: Update headers and replace deprecated methods 2021-01-14 14:12:28 +02:00
estan
fed5acf63c APPS-659 [Upgrade] Search Result points to incorrect link to Folder on Hold 2021-01-11 21:47:33 +02:00
estan
ce58601ec9 Merge branch 'feature-3.4/APPS-659_Upgrade_issue' into MNT-21132_UpgradeIncorrectLinkToFolder 2021-01-08 11:51:56 +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
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
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
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
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
estan
72c1390c65 APPS-659 - [Upgrade] Search Result points to incorrect link to Folder 2020-12-09 10:14:46 +02:00
ehardon
c7bf66fd2c Merge branch 'release/V3.4' 2020-12-08 12:07:30 +02:00
ehardon
e7b3724d44 Revert "Merge pull request #1291 from Alfresco/hotfix-3.2.0.11/MNT-22062_diplay_cat_retention_poor_performance"
This reverts commit 2f0b1c997f, reversing
changes made to ea7b125fda.
2020-12-08 12:06:01 +02:00
ehardon
ba44d5b83e Merge branch 'release/V3.4' 2020-12-08 09:16:17 +02:00
ehardon
0de6bcf820 Merge branch 'release/V3.3' into release/V3.4 2020-12-08 09:12:16 +02:00
ehardon
e087975349 Merge branch 'release/V3.2' into release/V3.3 2020-12-08 09:05:35 +02:00
ehardon
e591ce755e 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
estan
69e1db0845 APPS-659 - [Upgrade] Search Result points to incorrect link to Folder on Hold
--first commit
2020-12-07 09:44:33 +02:00
Rodica Sutu
d869f3c92a Merge pull request #1290 from Alfresco/feature/APPS-591_UpdatesForACS7.0.0
Feature/apps 591 updates for acs7.0.0
2020-12-07 09:35:57 +02:00
Epure Alexandru-Eusebiu
8c511ddec4 Fix the early returning of the recurssion. 2020-12-04 10:36:11 +02:00