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
2,759 Commits 325 Branches 2,188 Tags
feb9bc09c7d55c8906ebbc1f93e98ffcbe9e597c
Commit Graph

2759 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Tom Page
cb0b0a9cb3 Merge V2.4 into master. 
This doesn't bring any changes to master, but makes it clear that all
commits have been merged (e.g. when viewing the network history on GitLab).
 2016-02-04 08:00:50 +00:00
David Webster
a0b20e5c5e 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
5c9c2335f8 Update localisation properties file so we can translate 2.4 2016-02-03 10:41:23 +00:00
David Webster
aa1a4f67d2 Move editorConfig and JSHint settings to project root 2016-02-02 16:49:48 +00:00
Tuna Aksoy
fa85e77b75 Merge branch 'v2.4' 2016-02-02 15:43:10 +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
Tom Page
9153f1c4ed 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
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
Neil McErlean
7c1568e24d 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
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
d784b1d387 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
0255ae795a Merge V2.3 into master. 2015-12-17 12:43:26 +00:00
Tom Page
e565a408f0 Merge V2.2 into V2.3. 2015-12-17 12:42:52 +00:00
Tom Page
d7a3d90060 Merge V2.3.0.x into V2.3. 2015-12-17 12:42:27 +00:00
Tom Page
4d9c4f2955 RM-2871 Generate .gitignore file for V2.3.0.x. 2015-12-17 12:38:25 +00:00
Tom Page
78e7162d97 Merge V2.1 into V2.2. 2015-12-17 12:33:23 +00:00
Tom Page
422d14106a Merge V2.2.1.x into V2.2. 2015-12-17 12:31:32 +00:00
Tom Page
c90c0efea6 RM-2871 Generate .gitignore file for V2.2.1.x. 2015-12-17 12:30:04 +00:00
Tom Page
764cc89afc Merge V2.0 into V2.1. 2015-12-17 12:20:10 +00:00
Tom Page
73d47cf627 Merge branch V2.1.0.x into V2.1. 2015-12-17 12:17:26 +00:00
Tom Page
13bb4d9fa2 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
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
fa8df596eb 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