Tom Page
9b755000e0
RM-2776 Move SortDirection to rm-community.
...
This is a general-use enum, and so it should be somewhere fairly accessible.
2016-02-15 14:24:46 +00:00
Tom Page
cc8c073ae9
Revert "Revert "Merge branch 'feature/RM-2685_caveatGroupsView_UI' into 'master'""
...
This reintroduces all the changes performed on the RM-2685_caveatGroupsView_UI
feature branch, so that development can continue.
This reverts commit 08df63624e
2016-02-11 15:34:29 +00:00
Tom Page
08df63624e
Revert "Merge branch 'feature/RM-2685_caveatGroupsView_UI' into 'master'"
...
This reverts commit 8ae74856df
2016-02-11 15:32:55 +00:00
Roy Wetherall
3d9f2b0d7b
Spring configuration for module compatibility component.
2016-02-11 14:42:23 +11:00
Roy Wetherall
753d072f51
Initial implementation
2016-02-10 12:02:37 +11:00
David Webster
abe8c8fe7c
Merge origin/master
2016-02-08 10:18:02 +00:00
Tuna Aksoy
d6ce427249
Replaced the deprecated parameter "tasks" with "target" for the maven-antrun-plugin
2016-02-06 19:54:01 +00:00
Tuna Aksoy
6bcf6a44f2
Tided up the pom files (Defined the versions for plugins so that we don't need to specify them in every pom file and we can use the same version in all submodules)
...
Conflicts:
rm-enterprise/rm-enterprise-automation/pom.xml
rm-enterprise/rm-enterprise-repo/pom.xml
rm-enterprise/rm-enterprise-share/pom.xml
2016-02-06 19:53:37 +00:00
Tuna Aksoy
c57d22fc3b
Replaced the deprecated parameter "tasks" with "target" for the maven-antrun-plugin
2016-02-05 23:38:07 +00:00
Tuna Aksoy
58586bb6e7
Tided up the pom files (Defined the versions for plugins so that we don't need to specify them in every pom file and we can use the same version in all submodules)
2016-02-05 22:21:36 +00:00
Tuna Aksoy
f74167ccc5
Merge branch 'release/V2.4'
2016-02-05 10:27:38 +00:00
Tuna Aksoy
ea5dfa9212
Changed the way how property values are maintained in module.properties.
2016-02-04 23:11:02 +00:00
David Webster
ff1b9689d2
Move editorConfig and JSHint settings to project root
2016-02-02 16:49:48 +00:00
Tuna Aksoy
0978a0add9
Sonar build was failing because of missing master.db.url when using another DB other than H2
2016-02-01 07:41:03 +00:00
Tuna Aksoy
0282769781
Fixed wrong property name for alfresco.db.master.url
2016-02-01 07:34:30 +00:00
Tuna Aksoy
4a74ef8c74
Sonar build was failing because of missing master.db.url when using another DB other than H2
2016-02-01 07:31:40 +00:00
Tuna Aksoy
adf7e9630c
RM-2940 (Create parent pom.xml file above rm-community and rm-enterprise)
2016-01-31 20:11:15 +00:00
Tuna Aksoy
75a8ddff22
RM-2940 (Create parent pom.xml file above rm-community and rm-enterprise)
2016-01-31 17:04:39 +00:00
Tuna Aksoy
95c78edc18
RM-2973 (Create the 2.4 branch)
2016-01-26 13:10:56 +00:00
Tom Page
ff6557bc5d
Merge master into RM-2616_CaveatMarksComparator.
...
Unit test fixes required to get validation working with NodeService
storage.
Also fixed compiler errors in Eclipse caused by use of inferred generics
in asSerialisableList (I'm not sure this was strictly needed to get the
merged code to work, but it stopped Eclipse from complaining).
2016-01-25 16:35:13 +00:00
Tuna Aksoy
27d4d6706c
Fixed warnings
2016-01-24 17:28:05 +00:00
Tuna Aksoy
9ab1a13e2b
Remove alfresco-global.properties from the test jar file
2016-01-24 15:19:04 +00:00
Tuna Aksoy
3faee169ec
RM-2950 (Update rm-community to use same maven sdk as enterprise)
2016-01-23 23:25:07 +00:00
nmcerlean
43987e02f2
Merge branch 'master' into RM-2587_CaveatMarkingService
2016-01-22 10:42:03 +00:00
Tom Page
ccc8a54e01
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
6adcc6b1cd
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
50f38c80d1
Merge master into RM-2616_CaveatMarksComparator.
...
Prepare branch for CaveatMarkComparator.
2016-01-20 09:34:07 +00:00
nmcerlean
88b0dec4d3
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
270f2fced0
Additional helper method in CollectionUtils to ease dealing with Serializable collections.
2016-01-12 10:36:05 +00:00
nmcerlean
b42e50f92c
Some work on CaveatMark reading.
2016-01-12 09:13:20 +00:00
Tuna Aksoy
ecdc76b215
Fixed rm-community build process
2016-01-09 15:35:50 +00:00
Tuna Aksoy
7960270111
Removed warnings
2016-01-09 15:34:51 +00:00
Tuna Aksoy
49e7740ae5
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
7c4be0ff33
Merge branch 'feature/LocalisationProperties' into 'master'
...
Feature/localisation properties
See merge request !4
2015-12-17 14:56:30 +00:00
Tom Page
340b3d09d5
Revert "Minor changes to make Eclipse happy."
...
This reverts commit 807b74b023
2015-12-17 11:43:27 +00:00
Tom Page
14f391fd1e
Update localisation file to apply to whole repository.
2015-12-17 11:37:46 +00:00
Tom Page
4b1dafada6
Merge V2.3 into master.
2015-12-17 08:53:28 +00:00
Tom Page
807b74b023
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
56c704b6b4
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
