Sara Aspery
f7e69629bb
Merge branch 'release/V3.0' into release/V3.1
2020-01-02 18:21:48 +00:00
Sara Aspery
03eee1b8e3
Update license headers
2020-01-02 16:20:24 +00:00
Sara Aspery
841340c1e8
Merge branch 'release/V2.7' into release/V3.0
...
# Conflicts:
# rm-automation/rm-automation-ui/src/test/java/org/alfresco/test/enterprise/security/apiTesting/SearchClassifiedContent.java
# rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/job/AutomaticDispositionTest.java
# rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/RMCaveatConfigServiceImplTest.java
# rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/util/SecurityMarkChecker.java
# rm-enterprise/rm-enterprise-repo/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/classification/interceptor/DocumentSearchClassificationEnforcementTest.java
# rm-enterprise/rm-enterprise-repo/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/classification/interceptor/RecordSearchClassificationEnforcementTest.java
# rm-enterprise/rm-enterprise-repo/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/classification/interceptor/SavedSearchClassificationEnforcementTest.java
# rm-enterprise/rm-enterprise-repo/src/unit-test/java/org/alfresco/module/org_alfresco_module_rm/util/SecurityMarkCheckerUnitTest.java
2020-01-02 16:15:49 +00:00
Sara Aspery
b48d31457a
Update license headers
2020-01-02 15:05:02 +00:00
Sara Aspery
0ed125b0b5
Merge branch 'release/V2.6' into release/V2.7
...
# Conflicts:
# rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/model/AbstractSecureItem.java
2020-01-02 14:19:01 +00:00
Sara Aspery
943dc45a10
Update license headers
2020-01-02 13:57:59 +00:00
Tom Page
0b3652b5a4
Merge release/V3.0 into release/V3.1.
2019-08-05 15:28:53 +01:00
Tom Page
79c9244a14
Merge release/V2.7 into release/V3.0.
2019-08-05 08:11:57 +01:00
Tom Page
a97bf04cff
Merge release/V2.6 into release/V2.7.
2019-08-01 13:39:25 +01:00
Tom Page
1df5a307c4
Revert "Use AlfrescoRuntimeException."
...
This reverts commit b2c0afd8d5
2019-08-01 13:33:26 +01:00
Tom Page
b2c0afd8d5
Use AlfrescoRuntimeException.
2019-08-01 13:23:43 +01:00
Tom Page
9a36a9e8d6
Remove unthrown checked exceptions.
...
Update the javadoc to refer to RuntimeExceptions instead. Also conversion from
IOException to RuntimeException in UnfiledContainerAPI and UnfiledRecordFolderAPI
to add consistency with RecordFolderAPI.
2019-08-01 09:51:31 +01:00
alfresco-build
aed94d26cf
[maven-release-plugin] prepare for next development iteration
2019-07-15 12:22:08 +01:00
alfresco-build
0788a065c6
[maven-release-plugin] prepare release V3.0.2
2019-07-15 12:22:04 +01:00
Rodica Sutu
8bedb94a5e
Merge remote-tracking branch 'remotes/origin/release/V3.0' into merge-3.1/RM-6823_MergeIERMTests
...
# Conflicts:
# rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/requests/gscore/api/RMUserAPI.java
# rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/v0/RMRolesAndActionsAPI.java
# rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/v0/service/RoleService.java
# rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/base/BaseRMRestTest.java
# rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/records/DeleteRecordTests.java
# rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/records/UpdateRecordsTests.java
# rm-automation/rm-automation-enterprise-rest-api/src/test/java/org/alfresco/rest/rm/enterprise/base/BaseRMEnterpriseRestTest.java
# rm-automation/rm-automation-enterprise-rest-api/src/test/java/org/alfresco/rest/rm/enterprise/v0/classification/content/ClassifyCompleteRecordsTest.java
# rm-automation/rm-automation-enterprise-rest-api/src/test/java/org/alfresco/rest/rm/enterprise/v0/classification/content/SetRMExemptionReasonTest.java
# rm-automation/rm-automation-enterprise-rest-api/src/test/java/org/alfresco/rest/rm/enterprise/v0/search/SearchClassifiedRecordFoldersTests.java
# rm-automation/rm-automation-enterprise-rest-api/src/test/java/org/alfresco/rest/rm/enterprise/v0/search/SearchClassifiedRecordsTests.java
2019-07-09 08:48:13 +03:00
Rodica Sutu
8ab3078bba
fix sonar final warning
2019-07-05 12:50:19 +03:00
cagache
5a30bb57d1
transform UserPermissions in enum; add helper methods to create users with rm role, permissions or clearance
...
(cherry picked from commit e8725860eb
2019-07-05 10:32:10 +03:00
Rodica Sutu
ab6a5dbe02
Merge branch 'release/V3.0' of https://git.alfresco.com/records-management/records-management into feature-3-0/RM-6577_AutomatedRestApiTests
2019-07-04 17:59:38 +03:00
cagache
a976789861
transform UserPermissions in enum; add helper methods to create users with rm role, permissions or clearance
...
(cherry picked from commit a54a80f6a6
2019-07-04 16:03:20 +03:00
Rodica Sutu
53b843d958
review updates
2019-07-04 13:18:16 +03:00
Rodica Sutu
65fd23c294
code review changes
2019-07-03 18:23:45 +03:00
Rodica Sutu
da636f2061
Merge branch 'release/V3.0' of https://git.alfresco.com/records-management/records-management into feature-3-0/RM-6577_AutomatedRestApiTests
2019-07-02 10:34:50 +03:00
Rodica Sutu
7c323aa809
refactoring of the added rest api tests for SQL queries
...
new tests added for sql queries for: record categories, record folders and records
2019-07-02 10:29:21 +03:00
cagache
26019f50ea
Merge changes from V3.0 branch
2019-07-01 12:12:32 +03:00
Ross Gale
4500017453
RM-6746 update from code review
2019-06-25 16:01:53 +01:00
Rodica Sutu
0c4b0dc23b
test updates: minor refactoring and formatting fixes
2019-06-24 10:16:20 +03:00
cagache
8bac296cff
Revert "removed unused variable"
...
This reverts commit c55c5929
2019-06-21 16:33:08 +03:00
cagache
b5d4d79fcb
Fix "Either re-interrupt this method or rethrow the "InterruptedException"." sonar bug
...
(cherry picked from commit 929980e7c2
2019-06-21 16:14:53 +03:00
cagache
c97adfaac4
delete unnecessary semicolon
...
(cherry picked from commit 5dcae9c608
2019-06-21 16:14:30 +03:00
cagache
cc203c0cf2
removed contentService from child classes and made it protected in parent class
...
(cherry picked from commit 4fa230a322
2019-06-21 16:12:31 +03:00
cagache
c55c5929fb
removed unused variable
...
(cherry picked from commit ba729a0f2e
2019-06-21 16:11:11 +03:00
cagache
aceaef2f44
removed contentService from child classes and made it protected in parent class
...
(cherry picked from commit a11feb9bfe
2019-06-21 16:10:30 +03:00
Claudia Agache
cc49cb09fa
RM-6746 cherry picking merge request from RM-6803 and RM-6835
2019-06-20 15:24:39 +01:00
Claudia Agache
0e201874bc
RM-6746 cherry picking merge request from RM-6790
2019-06-20 15:13:03 +01:00
cagache
9238737f68
Update version to 3.1.1-SNAPSHOT
2019-06-20 14:28:45 +03:00
alfresco-build
93175c24ae
[maven-release-plugin] prepare release V3.1.0
2019-06-20 10:46:16 +01:00
Ross Gale
75b4bc5ca5
Merge branch 'feature/RM-6865_RemoveEncoding' into 'master'
...
Resolve RM-6865 "Feature/ removeencoding"
Closes RM-6865
See merge request records-management/records-management!1196
2019-06-20 07:33:47 +01:00
Rodica Sutu
29a64a8507
add the alfresco.port property
2019-06-19 14:55:23 +03:00
Ross Gale
8daac2d403
Revert "RM-6865 code review changes"
...
This reverts commit b4bc9195
2019-06-19 10:57:08 +01:00
Ross Gale
b4bc91950b
RM-6865 code review changes
2019-06-19 10:16:25 +01:00
Tom Page
0bdc774240
RM-6141 Revert change of how a user is a member of the RM site.
...
The user should be an RM User, not a site manager. Also revert a couple
of changes that were done to make this work.
Minor tweaks to use constants rather than member variables.
(cherry picked from commit b284ba90388ef360f5321826e292ec43bf2e5197)
2019-06-19 11:43:31 +03:00
Tom Page
9b89bdee32
RM-6141 Update SQL tests to use correct users.
...
Also hardcode the site id of the RM site to be "rm", so that we can use
this when adding site members.
(cherry picked from commit 92a6dcf8ae04151699b0b5a4bad79bc82f36ae71)
# Conflicts:
# rm-enterprise/pom.xml
2019-06-19 11:41:23 +03:00
Rodica Sutu
23d1a3f7c1
adding search tests for the SQL support
...
(cherry picked from commit 29f2ddf2203261f477464528a9f5b83a7679223c)
# Conflicts:
# rm-automation/rm-automation-enterprise-rest-api/pom.xml
2019-06-19 11:36:45 +03:00
Tom Page
1d10f0666f
Update TAS rest api to the latest version from 5.2.0.X - 5.2.0.15
2019-06-19 11:34:04 +03:00
Rodica Sutu
b010bf1c3e
update tas rest api version to 5.2.0.12
...
(cherry picked from commit f76491b09fb9d2daff3387a4d19de32fd0dd179d)
2019-06-19 11:20:28 +03:00
Ross Gale
c82d586479
RM-6865 removing encoding of path in action body
2019-06-18 17:45:46 +01:00
Ross Gale
06b8001362
RM-6865 adding param to test
2019-06-18 08:57:46 +01:00
Sara Aspery
35a1fd00e7
Merge branch 'feature/RM-6865_EnableEncodedDeclareAndFileRecPath' into 'master'
...
Resolve RM-6865 "Feature/ enableencodeddeclareandfilerecpath"
Closes RM-6865
See merge request records-management/records-management!1188
2019-06-07 08:48:04 +01:00
cagache
6819516c58
Update the rejectLinkedRecord test to use files api and records api instead of actions api
2019-06-05 16:01:03 +01:00
Sara Aspery
36ba457cfa
RM-6865 Rest API v0 test
2019-06-05 15:27:05 +01:00
