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
|
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
|
014e9662bc
|
Let git handle line endings for us.
|
2016-09-21 14:55:10 +01:00 |
|
Ana Bozianu
|
935d6319e1
|
Merge release/V2.3 into release/2.4
|
2016-09-21 11:58:40 +03: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 |
|