inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-31 17:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity
6,805 Commits 324 Branches 2,170 Tags
40c78dc29865544c2da5b51a48d9c00f24e1229b
Commit Graph

2040 Commits

Author SHA1 Message Date
Tuna Aksoy
de789d9381 Merge branch 'feature/RM-2685_caveatGroupsView_UI' into 'master' 
Feature/rm 2685 caveat groups view ui

See merge request !34
 2016-02-15 20:22:04 +00:00
Tom Page
1dbc47aa8c 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
ebeb051c91 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 ad2678cc69.
 2016-02-11 15:34:29 +00:00
Tom Page
ad2678cc69 Revert "Merge branch 'feature/RM-2685_caveatGroupsView_UI' into 'master'" 
This reverts commit 38c25ced51, reversing
changes made to 141e84aa3cb4ffd6c0332b45e91c23f5031f4007.
 2016-02-11 15:32:55 +00:00
Roy Wetherall
8836ef2912 Spring configuration for module compatibility component. 2016-02-11 14:42:23 +11:00
Roy Wetherall
eec80029cf Initial implementation 2016-02-10 12:02:37 +11:00
David Webster
154d621645 Merge origin/master 2016-02-08 10:18:02 +00:00
Tuna Aksoy
6ce7a56db1 Replaced the deprecated parameter "tasks" with "target" for the maven-antrun-plugin 2016-02-06 19:54:01 +00:00
Tuna Aksoy
e16c79f200 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
cf1637141c Replaced the deprecated parameter "tasks" with "target" for the maven-antrun-plugin 2016-02-05 23:38:07 +00:00
Tuna Aksoy
4dbc79219f 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
ad8595045f Merge branch 'release/V2.4' 2016-02-05 10:27:38 +00:00
Tuna Aksoy
8a32f37cfa Changed the way how property values are maintained in module.properties. 2016-02-04 23:11:02 +00:00
David Webster
aa1a4f67d2 Move editorConfig and JSHint settings to project root 2016-02-02 16:49:48 +00:00
Tuna Aksoy
cf6fd7f6b2 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
712aa1a6ac Fixed wrong property name for alfresco.db.master.url 2016-02-01 07:34:30 +00:00
Tuna Aksoy
bfb1f7511f 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
402fc1b831 RM-2940 (Create parent pom.xml file above rm-community and rm-enterprise) 2016-01-31 20:11:15 +00:00
Tuna Aksoy
886c9bbab8 RM-2940 (Create parent pom.xml file above rm-community and rm-enterprise) 2016-01-31 17:04:39 +00:00
Tuna Aksoy
91a6efb0fe RM-2973 (Create the 2.4 branch) 2016-01-26 13:10:56 +00:00
Tom Page
470952f8ad 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
14d0cd6eea Fixed warnings 2016-01-24 17:28:05 +00:00
Tuna Aksoy
3100b867ad Remove alfresco-global.properties from the test jar file 2016-01-24 15:19:04 +00:00
Tuna Aksoy
10b90b5a5b RM-2950 (Update rm-community to use same maven sdk as enterprise) 2016-01-23 23:25:07 +00:00
nmcerlean
f12e9f867a Merge branch 'master' into RM-2587_CaveatMarkingService 2016-01-22 10:42:03 +00:00
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