Commit Graph

5622 Commits

Author SHA1 Message Date
Ross Gale
a4f55a4a45 Revert "RM-5931 Adding transaction fix for integration test"
This reverts commit 56dc5edfa7
2017-12-06 16:35:06 +00:00
Ross Gale
5804a62855 Revert "RM-5931 Adding transaction fix for integration test"
This reverts commit 826d6e7610
2017-12-06 16:34:49 +00:00
Ross Gale
18c954f4d4 Revert "Merge branch 'release/V2.3' of…"
This reverts commit aed60aad03
2017-12-06 16:34:33 +00:00
Ross Gale
aed60aad03 Merge branch 'release/V2.3' of git.alfresco.com:records-management/records-management into release/V2.3 2017-12-06 15:58:22 +00:00
Ross Gale
826d6e7610 RM-5931 Adding transaction fix for integration test 2017-12-06 15:57:39 +00:00
Tom Page
bee7149e8b Revert "Revert "Update Alfresco dependency to 5.0.4.""
This reverts commit eb935954e9.
2017-12-06 14:40:00 +00:00
Ross Gale
56dc5edfa7 RM-5931 Adding transaction fix for integration test 2017-12-06 14:28:26 +00:00
Ross Gale
ea4b979a5f Merge branch 'release/V2.4' into merge2.5 2017-12-06 11:29:10 +00:00
David Webster
a265daf8f1 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
7a04ec01af 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
ce1e6fe7d2 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
51a47c56c4 Documentation updates following review 2017-12-06 09:50:50 +00:00
Tom Page
eb935954e9 Revert "Update Alfresco dependency to 5.0.4."
This reverts commit 7164253241.
2017-12-06 09:33:02 +00:00
Ross Gale
c8932192f9 RM-5878 mnt changes added to a 2.4 branch 2017-12-05 16:21:07 +00:00
Tom Page
ca4cf0070f Revert "Revert "Merge branch 'merge-2.6/RM-5132_AutomationChanges' into 'release/V2.6'""
This reverts commit 2437ff415c.
2017-12-05 14:37:07 +00:00
Tom Page
2437ff415c Revert "Merge branch 'merge-2.6/RM-5132_AutomationChanges' into 'release/V2.6'"
This reverts commit 83f81da0bd, reversing
changes made to 915e99394c.
2017-12-05 14:36:38 +00:00
Tom Page
4d6aaff70e Merge release/V2.6 into master. 2017-12-05 10:20:50 +00:00
Tom Page
83f81da0bd 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
7164253241 Update Alfresco dependency to 5.0.4. 2017-12-04 14:15:40 +00:00
Ross Gale
3ce7ed8eb9 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
4f490b4699 RM-5132 Add RecordsAPI.getRecordNodeRef method. 2017-11-30 11:27:17 +00:00
Ross Gale
7eaf1ad76e 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
0ae59951ef RM-5878 removing test scope from testng 2017-11-30 09:52:35 +00:00
Ross Gale
0f5b72599f Update RMv23SavedSearchesPatch.java 2017-11-30 09:28:53 +00:00
Ross Gale
ffe5429927 RM-5878 code review changes 2017-11-29 14:05:39 +00:00
Ross Gale
097f2d848a 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
9c9f1d6098 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
a36e1773af Merge remote-tracking branch 'origin/merge-2.6/MNT-18793' into merge/MNT-18793 2017-11-27 15:17:16 +02:00
Ana Bozianu
915e99394c 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
4fcfdb164e Merge MNT-18793 from release/V2.5.0.x into release/V2.5 2017-11-27 15:09:13 +02:00
Tom Page
c73f5b9863 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
d9b6c0d6f5 [maven-release-plugin] prepare for next development iteration 2017-11-27 10:37:48 +00:00
alfresco-build
020b2a6c38 [maven-release-plugin] prepare release V2.5.0.5 ags-2.5.0.5 2017-11-27 10:37:45 +00:00
Ana Bozianu
2771022083 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
33af594d47 MNT-18793 - added paginated navigation in the disposition action executer 2017-11-24 14:27:03 +00:00
David Webster
31b4115209 RM-5900: minor link updates 2017-11-24 12:47:03 +00:00
David Webster
a3c5fc26f0 RM-5900: minor link updates 2017-11-24 12:43:35 +00:00
David Webster
d3ba4d89a2 RM-5900: Document Extended Permission Service. 2017-11-24 12:37:49 +00:00
Rodica Sutu
8765349a80 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
75469a0f5b MNT-18793 - added paginated navigation in the disposition action executer 2017-11-23 22:21:51 +02:00
Ross Gale
3b8f5a4aa9 RM-5878 add fix and patch for saved search mnt (MNT-15575) 2017-11-23 11:29:23 +00:00
Tom Page
dd2b4aafbf Minor updates to README.md. 2017-11-23 11:12:48 +00:00
Richard Smith
8fd929abec Update reporting email address on CODE_OF_CONDUCT document. 2017-11-23 11:06:06 +00:00
Richard Smith
b882ef25c6 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
0399a7cca9 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
7af2e0430b 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
38a6134ce8 Merge branch 'feature-2.6/RM-5901_SonarIssuesEmptyCollectionTest' into feature/RM-5901_SonarIssuesEmptyCollectionTest 2017-11-20 15:34:28 +00:00
Sara Aspery
7165c0d95e RM-5901 review changes 2017-11-20 15:14:53 +00:00
Sara Aspery
3a1db54876 RM-5875 review changes 2017-11-20 07:39:37 +00:00
Sara Aspery
de4f99d26b RM-5875 add license header 2017-11-17 16:40:07 +00:00