Commit Graph

1065 Commits

Author SHA1 Message Date
Tom Page
5187ef1b76 Synchronise RM-2616_VariousRefactoring with RM-2587_CaveatMarkingService.
Incorporate the latest changes to the CaveatMarkingService while maintaining
the unmarked mark functionality.
2016-01-22 10:40:52 +00:00
nmcerlean
c00f1d9fc0 RM-2587, RM-2833 and RM-2834. Applying changes in reponse to Tom's review comments. Thanks Tom. 2016-01-21 11:45:29 +00:00
Tom Page
0a8801f234 Merge master into RM-2616_CaveatMarksComparator.
Prepare branch for CaveatMarkComparator.
2016-01-20 09:34:07 +00:00
nmcerlean
b1d8bcc16b Fixing a compiler error as javac isn't able to infer a generic type when I thought it could. 2016-01-12 12:17:07 +00:00
nmcerlean
578ff64b23 Additional helper method in CollectionUtils to ease dealing with Serializable collections. 2016-01-12 10:36:05 +00:00
nmcerlean
29e496b5ac Some work on CaveatMark reading. 2016-01-12 09:13:20 +00:00
Tuna Aksoy
321d76ae05 Fixed rm-community build process 2016-01-09 15:35:50 +00:00
Tuna Aksoy
b2a4a1e80f Removed warnings 2016-01-09 15:34:51 +00:00
Tuna Aksoy
dc5777d4ef Updated Alfresco dependencies for RM Community and Enterprise, e.g. from
5.1.c-EA to 5.1.d-EA and
from
5.1-EA-2 to 5.1-EA-3.
2015-12-29 15:50:12 +00:00
David Webster
5eba23ba17 Merge branch 'feature/LocalisationProperties' into 'master'
Feature/localisation properties

See merge request !4
2015-12-17 14:56:30 +00:00
Tom Page
4571e28fc8 Revert "Minor changes to make Eclipse happy."
This reverts commit 51ea5bb952.
2015-12-17 11:43:27 +00:00
Tom Page
b7fea34e05 Update localisation file to apply to whole repository. 2015-12-17 11:37:46 +00:00
Tom Page
191160736f Merge V2.3 into master. 2015-12-17 08:53:28 +00:00
Tom Page
51ea5bb952 Minor changes to make Eclipse happy.
Explicit cast to generic type in unit test. Change pom file line endings
to Windows.
2015-12-16 13:11:43 +00:00
Tom Page
d13958d6c8 Combine enterprise and community repositories.
The two existing code structures have now been moved under rm-community
and rm-enterprise.
2015-12-16 12:12:01 +00:00