Commit Graph

4767 Commits

Author SHA1 Message Date
Tom Page
7c8c6098dd Revert "Revert "Update Alfresco dependency to 5.0.4.""
This reverts commit 6d8a273e27.
2017-12-06 14:40:00 +00:00
Ross Gale
3f5363351e RM-5931 Adding transaction fix for integration test 2017-12-06 14:28:26 +00:00
Ross Gale
caa99535a1 Merge branch 'release/V2.4' into merge2.5 2017-12-06 11:29:10 +00:00
David Webster
a2c5e81bbc Merge branch 'feature/RM-5900-document-extended-permission-service_no' into 'master'
Feature/rm 5900 document extended permission service no

See merge request !700
2017-12-06 10:59:28 +00:00
Ross Gale
01dbdc04a7 Merge branch 'feature-2.4/MNT-2.4_MERGE' into 'release/V2.4'
RM-5878 mnt changes added to a 2.4 branch

See merge request !717
2017-12-06 10:09:01 +00:00
Richard Smith
10cc24b1a8 RM-5878: Replace ~/slingshot/search/live-search.lib.js in RM to exclude RM specific document types from live search results. 2017-12-06 10:04:25 +00:00
David Webster
dafb2165de Documentation updates following review 2017-12-06 09:50:50 +00:00
Tom Page
6d8a273e27 Revert "Update Alfresco dependency to 5.0.4."
This reverts commit 6866c7d5ad.
2017-12-06 09:33:02 +00:00
Ross Gale
f70ad4df3e RM-5878 mnt changes added to a 2.4 branch 2017-12-05 16:21:07 +00:00
Tom Page
8a2d931267 Revert "Revert "Merge branch 'merge-2.6/RM-5132_AutomationChanges' into 'release/V2.6'""
This reverts commit dc2c1d9aee.
2017-12-05 14:37:07 +00:00
Tom Page
dc2c1d9aee Revert "Merge branch 'merge-2.6/RM-5132_AutomationChanges' into 'release/V2.6'"
This reverts commit f8b9e86bcb, reversing
changes made to d8da2251e6.
2017-12-05 14:36:38 +00:00
Tom Page
2e0a194042 Merge release/V2.6 into master. 2017-12-05 10:20:50 +00:00
Tom Page
f8b9e86bcb Merge branch 'merge-2.6/RM-5132_AutomationChanges' into 'release/V2.6'
Merge 2.6/rm 5132 automation changes

See merge request !710
2017-12-05 10:00:57 +00:00
Tom Page
6866c7d5ad Update Alfresco dependency to 5.0.4. 2017-12-04 14:15:40 +00:00
Ross Gale
67eedec6d8 Merge branch 'feature-2.3/RM-5878_SavedSearchMNT' into 'release/V2.3'
Feature 2.3/rm 5878 saved search mnt

See merge request !705
2017-12-04 12:11:41 +00:00
Tom Page
84e8444812 RM-5132 Add RecordsAPI.getRecordNodeRef method. 2017-11-30 11:27:17 +00:00
Ross Gale
7a36cbcd12 Merge branch 'feature-2.3/RM-5878_SavedSearchMNT' of git.alfresco.com:records-management/records-management into feature-2.3/RM-5878_SavedSearchMNT 2017-11-30 09:52:51 +00:00
Ross Gale
b727108789 RM-5878 removing test scope from testng 2017-11-30 09:52:35 +00:00
Ross Gale
f76a52d4b9 Update RMv23SavedSearchesPatch.java 2017-11-30 09:28:53 +00:00
Ross Gale
8ce3dd6126 RM-5878 code review changes 2017-11-29 14:05:39 +00:00
Ross Gale
379b3a2257 RM-5878 adding config so patch will run on start up, fixing issue caused by missing maven dependancy for jcommander 1.66 2017-11-28 10:05:36 +00:00
Claudia Agache
a933dd19f2 Merge branch 'feature/RestApiRefactoring' into 'master'
deleted duplicates and moved some methods from RmEnterpriseTestUtils to specific…

See merge request !697
2017-11-28 07:56:29 +00:00
Ana Bozianu
3b93aeb977 Merge remote-tracking branch 'origin/merge-2.6/MNT-18793' into merge/MNT-18793 2017-11-27 15:17:16 +02:00
Ana Bozianu
d8da2251e6 Merge remote-tracking branch 'origin/merge-2.5/MNT-18793_to_2.5.x' into merge-2.6/MNT-18793 2017-11-27 15:15:03 +02:00
Ana Bozianu
895e863f11 Merge MNT-18793 from release/V2.5.0.x into release/V2.5 2017-11-27 15:09:13 +02:00
Tom Page
66bb30f1ec Use apache commons Pair, rather than javafx.
This makes automated import ordering simpler if nothing else.
2017-11-27 11:22:43 +00:00
alfresco-build
e0c66b4265 [maven-release-plugin] prepare for next development iteration 2017-11-27 10:37:48 +00:00
alfresco-build
905ea903e4 [maven-release-plugin] prepare release V2.5.0.5 2017-11-27 10:37:45 +00:00
Ana Bozianu
90652ddb6c Merge branch 'hotfix-2.5/MNT-18793_EligibleActionsNotExecuted' into 'release/V2.5.0.x'
MNT-18793 - added paginated navigation in the disposition action executer

See merge request !699
2017-11-24 14:27:03 +00:00
Ana Bozianu
0f62fbe006 MNT-18793 - added paginated navigation in the disposition action executer 2017-11-24 14:27:03 +00:00
David Webster
fee6dc886b RM-5900: minor link updates 2017-11-24 12:47:03 +00:00
David Webster
68e6ac80fd RM-5900: minor link updates 2017-11-24 12:43:35 +00:00
David Webster
4b59aaa0f7 RM-5900: Document Extended Permission Service. 2017-11-24 12:37:49 +00:00
Rodica Sutu
1f6e2c1c6f Merge remote-tracking branch 'remotes/origin/hotfix-2.5/MNT-18793_EligibleActionsNotExecuted' into merge-2.5/MNT-18793_to_2.5.x 2017-11-24 09:51:59 +02:00
Ana Bozianu
0fbe36eaa3 MNT-18793 - added paginated navigation in the disposition action executer 2017-11-23 22:21:51 +02:00
Ross Gale
885ef4faaa RM-5878 add fix and patch for saved search mnt (MNT-15575) 2017-11-23 11:29:23 +00:00
Tom Page
69e57283ab Minor updates to README.md. 2017-11-23 11:12:48 +00:00
Richard Smith
9ccc0dfb8e Update reporting email address on CODE_OF_CONDUCT document. 2017-11-23 11:06:06 +00:00
Richard Smith
211752f6e4 Reformatting README.txt to README.md and adding in a CODE_OF_CONDUCT.md file. 2017-11-23 10:56:33 +00:00
Sara Aspery
914f1b1613 Merge branch 'feature-2.6/RM-5875_YamlFileUnitTest_no' into 'release/V2.6'
Feature 2.6/rm 5875 yaml file unit test no

See merge request !690
2017-11-22 11:43:07 +00:00
Tom Page
c97ab15d10 RM-5875 Manage the version of guava from the root pom.
We'll need to use the regression tests to check that upgrading guava like this
doesn't break anything in the application, but it fixes the unit tests.
2017-11-22 09:10:44 +00:00
Sara Aspery
65a8ac9c2d Merge branch 'feature-2.6/RM-5901_SonarIssuesEmptyCollectionTest' into feature/RM-5901_SonarIssuesEmptyCollectionTest 2017-11-20 15:34:28 +00:00
Sara Aspery
8fddf75ed3 RM-5901 review changes 2017-11-20 15:14:53 +00:00
Sara Aspery
31b7c57afb RM-5875 review changes 2017-11-20 07:39:37 +00:00
Sara Aspery
52bcb28446 RM-5875 add license header 2017-11-17 16:40:07 +00:00
Tom Page
c858cbeeeb Record-only merge of release/V2.6 into master. 2017-11-17 08:24:18 +00:00
Tom Page
e277c247ff Merge release/V2.6.0.x into release/V2.6. 2017-11-17 08:22:33 +00:00
alfresco-build
f4e46528aa [maven-release-plugin] prepare for next development iteration 2017-11-17 08:05:37 +00:00
alfresco-build
648a05314c [maven-release-plugin] prepare release V2.6.c 2017-11-17 08:05:35 +00:00
Sara Aspery
e15635de80 RM-5901 fixes in benchmark driver 2017-11-16 18:15:59 +00:00