Sara Aspery
304180f49e
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
8ae4ef6290
Update license headers
2020-01-02 13:57:59 +00:00
cagache
d645c19e37
Removed unnecessary semicolon
2019-07-01 16:19:52 +03:00
cagache
3dc65aaed5
Sonar code smell: Replace the type specification in this constructor call with the diamond operator ("<>")
2019-07-01 16:01:43 +03:00
Ross Gale
c8afff9a4b
RM-6702 updating headers to 2019
2019-01-04 12:25:39 +00:00
Ross Gale
c98274f77f
RM-6702 updating headers to 2019
2019-01-03 14:30:44 +00:00
Tom Page
98765ca22c
Updating license header to 2018
2018-01-16 12:31:06 +00:00
Ana Manolache
4a145de54e
update headers to 2018
2018-01-03 12:01:00 +02:00
Tuna Aksoy
a80d4a523e
Updated license headers
2017-01-01 11:52:56 +00:00
Tom Page
d24a22264c
Merge release/V2.4 into release/V2.5.
2016-10-28 13:31:20 +01:00
David Webster
1bc282f2f5
MNT-16852: Add unit tests for postProcessor permissions configuration
2016-10-27 11:31:03 +01:00
Tuna Aksoy
cf4dc8cbb1
Merge branch 'release/V2.4' into merge-2.5/MergeV24ToV25_111016
...
Conflicts:
rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionServiceImpl.java
rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/version/RecordableVersionService.java
rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/audit/audit.get.html.ftl
2016-10-11 17:00:35 +01:00
Tuna Aksoy
d25b0423fb
Merge branch 'release/V2.3' into merge-2.4/MergeV23ToV24_101016_2
...
# Conflicts:
# rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-action-context.xml
# rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/CommonRMTestUtils.java
# rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/test/util/BaseWebScriptUnitTest.java
# rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/audit/audit.get.html.ftl
# rm-server/source/java/org/alfresco/repo/web/scripts/roles/DynamicAuthoritiesGet.java
# rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/disposition/DispositionTestSuite.java
# rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/IssueTestSuite.java
# rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/record/RecordTestSuite.java
# rm-server/unit-test/java/org/alfresco/repo/web/scripts/roles/DynamicAuthoritiesGetUnitTest.java
2016-10-10 20:49:13 +01:00
Tuna Aksoy
cba239d488
Merged V2.4 to V2.5
2016-10-07 14:42:43 +01:00
Tuna Aksoy
0614914beb
Merge branch 'release/V2.4' into merge-2.5/MergeV24ToV25
...
Conflicts:
rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-action-context.xml
rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/DestroyAction.java
2016-10-05 15:20:19 +01:00
Tuna Aksoy
2db9730702
Merge branch 'feature-2.3/RM-4162_MergeToV2.3' into release/V2.3
...
# Conflicts:
# rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-action-context.xml
# rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/CopyMoveLinkFileToBaseAction.java
# rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/IssueTestSuite.java
# rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/record/RecordTestSuite.java
2016-10-04 22:56:45 +01:00
Tom Page
b3b2585e99
Let git handle line endings for us.
2016-09-23 10:34:36 +01:00
Tom Page
014e9662bc
Let git handle line endings for us.
2016-09-21 14:55:10 +01:00
Ana Bozianu
85db34ff48
Merge release/V2.4 into release/V2.5
2016-09-21 14:33:23 +03:00
Ana Bozianu
935d6319e1
Merge release/V2.3 into release/2.4
2016-09-21 11:58:40 +03:00
Roy Wetherall
b05298f7d1
RM-3027: Fix unit tests
2016-08-22 16:32:43 +01:00
Roy Wetherall
e93bd3b74a
RM-3074: place common logic to get readers and writers of a node in one place
...
* added getReadersAndWriters method to extended permission service
* refactored calling services, consolidating code into one location
* extended unit test
Note: getFullAuthenticatedUser has been removed from writers list as it
makes no logical sense since you must be a writer in order to perform
these operations in the first place.
2016-08-09 11:20:50 +10:00
Ana Bozianu
7fd469a2e2
RM-3216 - removed verify statements as extendedImapServiceImpl is not a mock
2016-04-11 15:46:42 +03:00
Ana Bozianu
5717cbef6d
RM-3216 - added header to test file
2016-04-11 12:27:19 +03:00
Ana Bozianu
1b359ad083
RM-3216 - added unit test
2016-04-08 14:46:14 +03:00
Tuna Aksoy
8fcc027af0
RM-3132 (Update license headers)
2016-03-16 10:26:58 +00:00
Tuna Aksoy
ff1c81d825
RM-3132 (Update license headers)
2016-03-14 16:17:53 +00:00
Tuna Aksoy
f01d2e1d41
RM-3132 (Update license headers)
2016-03-14 16:07:46 +00:00
Tuna Aksoy
27c76455c8
RM-3132 (Update license headers)
2016-03-14 16:05:44 +00:00
Tuna Aksoy
4191ba9495
Reverted all license header related changes
2016-03-13 21:48:44 +00:00
Tuna Aksoy
5d1d814e13
RM-3132 (Update license headers)
2016-03-11 17:28:49 +00:00
Tuna Aksoy
224b1c4116
RM-3132 (Update license headers)
2016-03-11 17:05:12 +00:00
Tuna Aksoy
2e3a1fa270
RM-3132 (Update license headers)
2016-03-11 16:50:48 +00:00
Tuna Aksoy
9ab4e9e17e
RM-3132 (Update license headers)
2016-03-11 16:44:23 +00:00
Roy Wetherall
f98f0cb32b
Refresh license headers to include changes to community license and module description
2016-03-03 10:38:37 +11:00
Roy Wetherall
be365f98ba
Add managed license headers to community projects for java, js and ftl source files.
2016-03-01 13:06:00 +11:00
Roy Wetherall
5059bd7cec
Remove old license headers
2016-03-01 12:53:30 +11:00
Tuna Aksoy
402fc1b831
RM-2940 (Create parent pom.xml file above rm-community and rm-enterprise)
2016-01-31 20:11:15 +00:00
