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
4,990 Commits 335 Branches 2,191 Tags
02eec901b3758acba0442712999efe30cd0b43d6
Commit Graph

4990 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tom Page
ca46be936e RM-2968 Update disposition query used to find nodes to cutoff or retain. 2016-02-17 10:50:05 +00:00
Tom Page
f67c5fe319 Update version to 2.3.0.2-SNAPSHOT. 2016-02-17 10:36:53 +00:00
Tuna Aksoy
43412d9211 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
Tuna Aksoy
0a0dd17d86 Merge branch 'feature/RM-2717_ListCaveatMarks' into 'master' 
Feature/rm 2717 list caveat marks

See merge request !33
 2016-02-15 20:15:31 +00:00
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
Tuna Aksoy
0d9babad6c Merge branch 'master' into feature/RM-3039_AikauUpgrade 2016-02-15 10:57:01 +00:00
David Webster
9a15fb188c Merge remote-tracking branch 'origin/master' into feature/RM-2685_caveatGroupsView_UI 2016-02-12 17:03:28 +00:00
Tom Page
06064c8fbb Merge release/V2.4 into master. 2016-02-12 08:32:15 +00:00
Tom Page
dfe51239d1 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
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, reversing
changes made to 141e84aa3cb4ffd6c0332b45e91c23f5031f4007.
 2016-02-11 15:32:55 +00:00
David Webster
efc8a0d328 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
8ae74856df 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
77c9e656b9 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
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
Tuna Aksoy
5ba5e74874 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
6d07ddfc79 Merge release/V2.4 into master. 2016-02-09 08:34:31 +00:00
Ana Bozianu
20809b6d8d 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
f3cdd30937 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 329d39a316)
 2016-02-08 15:34:36 +00:00
Tom Page
22236ba924 Convert rm-automation pom file to have windows line endings. 2016-02-08 15:33:41 +00:00
Tom Page
329d39a316 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
abe8c8fe7c Merge origin/master 2016-02-08 10:18:02 +00:00
Tuna Aksoy
d50702d400 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
ca30c0f3e2 Fixed the version number for rm-automation on master 2016-02-07 22:28:38 +00:00
Tuna Aksoy
b03a15b23c RM-2944 (Make RM UI Test builds predictable) 2016-02-07 21:50:06 +00:00
Tuna Aksoy
0f1d6a9cd0 RM-2944 (Make RM UI Test builds predictable) 2016-02-07 17:49:22 +00:00
Tuna Aksoy
3e2b4013d3 Merge branch 'feature/RM-2991_ConvertMockRESTAPI' 2016-02-06 21:52:13 +00:00
Tuna Aksoy
c6356a4105 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
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
Tom Page
1c9756f168 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
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