inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-21 18:09:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,433 Commits 335 Branches 2,191 Tags
1377cc8e118ac49ad2591bb901b49ac4f50218ca
Commit Graph

3433 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tom Page
4a268e8a7a Merge release/V2.4 into master. 2016-02-12 08:32:15 +00:00
Tom Page
a334b7967a Merge branch 'feature-2.4/FixBrowseListWait' into 'release/V2.4' 
Feature 2.4/fix browse list wait

See merge request !31
 2016-02-12 08:31:12 +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
David Webster
8acc5ce11a README updates to clarify the directory commands should be run from and to specify the command for the UI tests 2016-02-11 13:30:11 +00:00
David Webster
38c25ced51 Merge branch 'feature/RM-2685_caveatGroupsView_UI' into 'master' 
RM-2686: View Caveat Groups

See merge request !30
 2016-02-11 11:43:23 +00:00
Tom Page
f68c039490 Fix the BrowseList getItemCount call. 
Previously, for the standard format of message "1 - 4 of 4", this was
returning 0 because the code was expecting three space separated values,
not five.
 2016-02-11 11:39: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
Tuna Aksoy
1dab98b654 RM-2709 (The Add Relationship dialog is not displayed properly and is unusable on Alfresco 5.1) 2016-02-09 20:13:28 +00:00
Tom Page
4b2a2d5132 Merge release/V2.4 into master. 2016-02-09 08:34:31 +00:00
Ana Bozianu
d24ec3eaf6 Merge branch 'feature-2.4/RM-2947_FixChemistryDependency' into 'release/V2.4' 
Feature 2.4/rm 2947 fix chemistry dependency

Fix recent failing UI tests that have the message "java.lang.NoSuchMethodError:
org.apache.chemistry.opencmis.client.bindings.CmisBindingFactory.createCmisBrowserBinding"
This cherry picks the fix which I accidentally committed to master rather than release/V2.4.

See merge request !29
 2016-02-09 08:26:08 +00:00
Tom Page
fbd032b753 RM-2947 Remove unnecessary chemistry dependency. 
This dependency is provided by the dataprep librarywhich also provides
the implementation. Both should be version 0.10.0 or 0.11.0, but we
were taking 0.10.0 of one and 0.11.0 of the other. This should fix the
NoSuchMethodErrors we were seeing.

(cherry picked from commit 9d510a46c9)
 2016-02-08 15:34:36 +00:00
Tom Page
b9adb397ab Convert rm-automation pom file to have windows line endings. 2016-02-08 15:33:41 +00:00
Tom Page
9d510a46c9 RM-2947 Remove unnecessary chemistry dependency. 
This dependency is provided by the dataprep librarywhich also provides
the implementation. Both should be version 0.10.0 or 0.11.0, but we
were taking 0.10.0 of one and 0.11.0 of the other. This should fix the
NoSuchMethodErrors we were seeing.
 2016-02-08 14:47:10 +00:00
David Webster
154d621645 Merge origin/master 2016-02-08 10:18:02 +00:00
Tuna Aksoy
56340b85cb Merge branch 'release/V2.4' 
Conflicts:
	rm-automation/pom.xml
	rm-automation/src/main/java/org/alfresco/po/share/details/DetailsPage.java
	rm-automation/src/test/java/org/alfresco/test/integration/smoke/AutoDeclareVersionsAsRecords.java
	rm-automation/src/test/java/org/alfresco/test/integration/smoke/DeclareInPlaceRecord.java
	rm-automation/src/test/java/org/alfresco/test/integration/smoke/FileUnfiledRecords.java
	rm-enterprise/rm-enterprise-repo/pom.xml
	rm-enterprise/rm-enterprise-share/pom.xml
 2016-02-07 22:50:53 +00:00
Tuna Aksoy
13d06e9c15 Fixed the version number for rm-automation on master 2016-02-07 22:28:38 +00:00
Tuna Aksoy
5b76ddccb7 RM-2944 (Make RM UI Test builds predictable) 2016-02-07 21:50:06 +00:00
Tuna Aksoy
7ab6f72c1d RM-2944 (Make RM UI Test builds predictable) 2016-02-07 17:49:22 +00:00
Tuna Aksoy
418eaa58e1 Merge branch 'feature/RM-2991_ConvertMockRESTAPI' 2016-02-06 21:52:13 +00:00
Tuna Aksoy
88d53929ef 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 20:53:11 +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
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