inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-14 17:58:59 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,254 Commits 325 Branches 2,188 Tags
ce60d3e89f9bf41ea45793f9ff9f0a9a6fd2903a
Commit Graph

5254 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Webster
1dbf7f7f15 Update localisation properties file so we can translate 2.4 
(cherry picked from commit 03eef24287498126941eb14a5299aada5913cff5)
 2016-02-03 16:10:42 +00:00
David Webster
ec925a6a36 Update localisation properties file so we can translate 2.4 2016-02-03 10:41:23 +00:00
David Webster
ff1b9689d2 Move editorConfig and JSHint settings to project root 2016-02-02 16:49:48 +00:00
Tuna Aksoy
7013b268c3 Merge branch 'v2.4' 2016-02-02 15:43:10 +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
Tom Page
e715192fd0 Merge master into RM-2616_VariousRefactoring. 
Adding persistance of unmarked mark, along with display label keys and
description keys.
 2016-01-25 13:54:14 +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
Neil McErlean
00eaa684fb Merge branch 'feature/RM-2587_CaveatMarkingService' into 'master' 
Feature/rm 2587 caveat marking service

RM-2587, RM-2833 and RM-2834. Initial implementation of the `CaveatMarkingService` along with some unit tests. (Work in progress)
Mark persistence for NodeRefs, along with mark clearance and some mark retrieval.

See merge request !16
 2016-01-22 11:18:00 +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
12d25db5cf Add enterprise locations that might contain localisable files. 
Adding the src/main/resources folder for the server, and all of src/main
for enterprise Share.
 2015-12-17 14:29:38 +00:00
Tom Page
bcf2eb5d1e Merge V2.3 into master. 2015-12-17 12:43:26 +00:00
Tom Page
4ebd2ee859 Merge V2.2 into V2.3. 2015-12-17 12:42:52 +00:00
Tom Page
3fa09f9eaf Merge V2.3.0.x into V2.3. 2015-12-17 12:42:27 +00:00
Tom Page
fb9363d662 RM-2871 Generate .gitignore file for V2.3.0.x. 2015-12-17 12:38:25 +00:00
Tom Page
0f8f1df9ad Merge V2.1 into V2.2. 2015-12-17 12:33:23 +00:00
Tom Page
8fdd591b99 Merge V2.2.1.x into V2.2. 2015-12-17 12:31:32 +00:00
Tom Page
f8827752b0 RM-2871 Generate .gitignore file for V2.2.1.x. 2015-12-17 12:30:04 +00:00
Tom Page
e97f12ebf1 Merge V2.0 into V2.1. 2015-12-17 12:20:10 +00:00
Tom Page
d7621d7b7d Merge branch V2.1.0.x into V2.1. 2015-12-17 12:17:26 +00:00
Tom Page
5e216fbfa2 RM-2871 Generate .gitignore file for V2.1.0.x. 2015-12-17 12:14:31 +00:00
Tom Page
70f01df2cf Merge V2.0.1.x into V2.0. 2015-12-17 12:09:46 +00:00
Tom Page
8d20c8d4c0 RM-2871 Generate .gitignore file for V2.0.1.x. 2015-12-17 12:08:16 +00:00
Tom Page
eeb678337d RM-2871 Generate .gitignore file for V2.0. 2015-12-17 12:03:18 +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
cfd89c6999 Merge branch 'feature/RM-2562_TestNameTypo' into 'V2.3' 
Feature/rm 2562 test name typo

Fix a typo in the test name and check if the merge request process works.

See merge request !3
 2015-12-17 08:51:56 +00:00
Tom Page
1fea2b7fd3 RM-2562 Fix typo in test name. 
Also testing merge review process, and merging between branches.
 2015-12-17 08:27:22 +00:00
Tom Page
de8b57eee9 RM-2871 Add .gitignore file. 2015-12-16 14:21:02 +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
Tom Page
cb185f24fe Merged BRANCHES/V2.3 to HEAD: 
120140: RM-2194: Review feedback
   120142: RM-2562: review feedback


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@120258 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-12-16 08:03:52 +00:00