Commit Graph

6805 Commits

Author SHA1 Message Date
Claudia Agache
166d6a7afa Merge remote-tracking branch 'remotes/origin/release/V3.1' into merge-3.2/RM-7154UnitTests_no 2020-04-14 13:22:15 +03:00
Claudia Agache
4a8c5c337d Merge remote-tracking branch 'remotes/origin/release/V3.0' into merge-3.1/RM-7154UnitTests_no 2020-04-14 11:36:46 +03:00
Claudia Agache
3e2998784e Merge remote-tracking branch 'origin/release/V3.0' into release/V3.0 2020-04-14 11:17:31 +03:00
Claudia Agache
26a96c9645 Mock search language to afts
(cherry picked from commit b8acf45b53)
2020-04-14 09:22:00 +03:00
Claudia Agache
da063ffa3c Revert "Deleting tests because there's no version of ACS community that supports this yet"
This reverts commit c7a55840

(cherry picked from commit 3e5d9d6ba3)
2020-04-14 09:21:57 +03:00
Claudia Agache
a06c3fec1b Merge remote-tracking branch 'remotes/origin/release/V3.3' into merge/RM-7148_RM-7145 2020-04-13 16:26:26 +03:00
Claudia Agache
b8acf45b53 Mock search language to afts 2020-04-13 15:31:23 +03:00
Claudia Agache
3e5d9d6ba3 Revert "Deleting tests because there's no version of ACS community that supports this yet"
This reverts commit c7a55840
2020-04-12 19:13:09 +03:00
Claudia Agache
0642d52afc Revert "Merge branch 'release/V2.7' into merge-3.0/MNT-20822_CMIS_tests, disabled test for now"
This reverts commit 2c334298
2020-04-12 19:12:32 +03:00
Claudia Agache
daa8e97684 Merge remote-tracking branch 'remotes/origin/release/V3.2' into merge-3.3/RM-7148_RM-7145
# Conflicts:
#	rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/search/CmisQueryTests.java
2020-04-12 19:10:31 +03:00
Claudia Agache
12b4d949ed small fix 2020-04-10 19:49:17 +03:00
Claudia Agache
e12612eee0 small fix 2020-04-10 19:25:06 +03:00
Claudia Agache
1b5ff187db Merge remote-tracking branch 'remotes/origin/release/V3.1' into merge-3.2/RM-7148_RM-7145 2020-04-10 19:21:02 +03:00
Claudia Agache
cda030cd80 wait for solr indexing 2020-04-10 14:53:45 +03:00
Claudia Agache
08b833b677 assignUserPermissionsOnCategoryAndRMRole method has been moved to RoleService 2020-04-10 08:58:22 +03:00
Roxana Lucanu
12d014d8d5 Merge branch 'release/V3.0' into merge-3.1/RM-7148_And_RM-7145 2020-04-10 08:26:14 +03:00
rlucanu
f1af7e12d1 Merge pull request #1123 from Alfresco/merge-3.0/MNT-20822_CMIS_tests
Merge 3.0/mnt 20822 cmis tests
2020-04-10 08:11:47 +03:00
Roxana Lucanu
2c334298b0 Merge branch 'release/V2.7' into merge-3.0/MNT-20822_CMIS_tests, disabled test for now 2020-04-09 19:01:44 +03:00
Roxana Lucanu
dad0d17fb1 Merge branch 'release/V2.7' into merge-3.0/MNT-20822_CMIS_tests 2020-04-09 16:40:08 +03:00
rlucanu
074f799274 Merge pull request #1122 from Alfresco/merge-2.7/MNT-20822_CMIS_tests
Merge 2.7/mnt 20822 cmis tests
2020-04-09 12:20:31 +03:00
ehardon
8705f27222 RM-6645: Created WhitelistedDMActions for RM site
- added whitelisted actions into the rm rule actions
2020-04-09 12:16:33 +03:00
Claudia Agache
bf77bf7997 fix the parameter 2020-04-08 19:07:33 +03:00
Claudia Agache
e1b2a626cb Merge remote-tracking branch 'remotes/origin/release/V2.6' into merge-2.7/MNT-20822_CMIS_tests 2020-04-08 18:52:37 +03:00
Claudia Agache
a2a60a50ac Merge remote-tracking branch 'remotes/origin/release/V3.0' into merge-3.1/RM-7148_And_RM-7145 2020-04-08 18:50:29 +03:00
Claudia Agache
c7a558405a Deleting tests because there's no version of ACS community that supports this yet 2020-04-08 15:26:29 +03:00
Claudia Agache
8008ace24e Merge branch 'release/V2.7' into merge-3.0/RM-7148_And_RM-7145
# Conflicts:
#	rm-automation/rm-automation-ui/src/test/java/org/alfresco/test/community/smoke/CmisQueryTests.java
#	rm-enterprise/pom.xml
2020-04-08 15:14:00 +03:00
rlucanu
55d037edd1 Merge pull request #1120 from Alfresco/feature-2.6/MNT-20822_CMIS_tests
Feature 2.6/mnt 20822 cmis tests
2020-04-08 14:43:37 +03:00
Roxana Lucanu
07c6e56704 RM-7145 Code review changes 2020-04-08 14:32:22 +03:00
Tom Page
dc229e34d2 Merge pull request #1118 from Alfresco/feature/ThreadSafeInstanceOfCache
Fix cache in NodeTypeUtility to be thread safe.
2020-04-08 12:03:10 +01:00
Roxana Lucanu
5bc81482a4 RM-7145 Addressed code review comments 2020-04-08 13:43:51 +03:00
Roxana Lucanu
eb2e085dd6 RM-7145 Addressed code review comments 2020-04-07 18:27:58 +03:00
ehardon
9ef1db7005 RM-6645: Added DelegateAction beans for archive and restore glacier actions
- added actions in the rules page
- added actions definitions and title
2020-04-07 17:53:29 +03:00
Roxana Lucanu
235a2bc248 RM-7145 Added test for AFTS query 2020-04-06 17:10:56 +03:00
Roxana Lucanu
6daf69afde Merge branch 'release/V2.6' into feature-2.6/MNT-20822_CMIS_tests 2020-04-06 14:13:30 +03:00
Claudia Agache
4c4b41bfb8 fix the parameter 2020-04-03 16:26:03 +03:00
Claudia Agache
d222954e15 Merge remote-tracking branch 'remotes/origin/release/V2.6' into merge-2.7/RM-7148_UpdateACSVersion
# Conflicts:
#	rm-enterprise/pom.xml
2020-04-03 16:21:40 +03:00
Claudia Agache
8ec75aa6a1 Merge pull request #1115 from Alfresco/feature-2.6/RM-7148_UpdateACSVersion
Feature 2.6/rm 7148 update acs version
2020-04-03 15:22:27 +03:00
Claudia Agache
59feba75e4 code review comments 2020-04-03 14:51:02 +03:00
Tom Page
97813d542d Fix issue, as previous command was including a title row 'IMAGE'. 2020-04-03 11:53:13 +01:00
Tom Page
852e65167c If deleting specified images fails then try deleting all images instead.
This might be needed if we hit the 'image has dependent child images' issue.
2020-04-03 11:41:48 +01:00
Tom Page
25f87a54ce Fix cache in NodeTypeUtility to be thread safe.
Inspired by @cetra3 in PR: https://github.com/Alfresco/records-management/pull/8
2020-04-03 10:00:11 +01:00
Claudia Agache
3b51ce4966 fix header 2020-04-03 09:40:46 +03:00
Rodica Sutu
019a9a0375 move the cmis query tests
add some additional usecase

(cherry picked from commit d3284b1400)
2020-04-03 09:30:52 +03:00
Claudia Agache
bc7aa82479 Revert "Merge branch 'feature-2.7/RM-7119_ACS527StartUpFix' into 'release/V2.7'"
This reverts commit 594931a1
2020-04-02 16:30:29 +03:00
Claudia Agache
3a0bfff79a Merge remote-tracking branch 'remotes/origin/release/V2.6' into feature-2.6/RM-7148_UpdateACSVersion 2020-04-02 14:34:02 +03:00
rlucanu
e51fb20ccb Merge pull request #1112 from Alfresco/feature-2.6/RM-7145_SearchQueryHasMoreItems
RM-7145 Fix for hasMoreItems
2020-04-02 13:23:18 +03:00
Tom Page
594931a1f2 Merge branch 'feature-2.7/RM-7119_ACS527StartUpFix' into 'release/V2.7'
RM-7119 Fix startup with ACS 5.2.7.

See merge request records-management/records-management!1393
2020-04-02 10:53:45 +03:00
rodicasutu
3fe01badff add the missing class 2020-04-02 08:34:34 +03:00
Tom Page
f25e12939e RM-7145 Wire in RM AuthenticationUtil. 2020-04-01 15:34:25 +01:00
Tom Page
2f476bdb0d RM-7145 Unit tests for processing ResultSet with RMAfterInvocationProviderUnitTest. 2020-04-01 15:28:40 +01:00