Tom Page
b80b1647a3
Update version to 2.3.2.
2017-12-07 08:36:45 +00:00
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
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
Tom Page
eb935954e9
Revert "Update Alfresco dependency to 5.0.4."
...
This reverts commit 7164253241
.
2017-12-06 09:33:02 +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
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
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
adda202a88
Record-only merge release/V2.3.1.x into release/V2.3.
2017-04-18 08:13:23 +01:00
Tom Page
c7d6bc4850
Update version to 2.3.1.2-SNAPSHOT.
2017-04-13 14:47:41 +01:00
Tom Page
03488378e8
Update version to 2.3.1.1.
2017-04-13 14:11:51 +01:00
Tom Page
07d5a3e33c
RM-5020 Merge release/V2.3.0.x into release/V2.3.
2017-04-13 12:39:57 +01:00
Tom Page
1bf47b9864
Merge branch 'merge-2.3/RM-5013_VitalRecordPreventsAccess_230x' into 'release/V2.3.0.x'
...
RM-5013 Cherry-pick "Merge branch 'hotfix-2.5/MNT-17007_solr_query' into 'release/V2.5.0.x'"
See merge request !217
2017-04-13 12:39:00 +01:00
Ana Bozianu
80a84870f1
RM-5013 Cherry-pick "Merge branch 'hotfix-2.5/MNT-17007_solr_query' into 'release/V2.5.0.x'"
...
Hotfix 2.5/mnt 17007 solr query
2.5.0.1 hotfix will contain the fix for the SOLR issue and Audit issue
MNT-17007 - Cannot login with other user than admin, after RM 2.5 was installed
RM-4249 - RM Audit doesn't work with alfresco 5.2
See merge request !602
Nb. This does not copy across the updates to the automation tests.
(cherry picked from commit 54d673c176
)
(cherry picked from commit 3d7a93e3ce
)
2017-04-13 10:05:58 +01:00
Tom Page
2d3d5f2648
Merge branch 'merge-2.3/RM-5013_VitalRecordPreventsAccess' into 'release/V2.3'
...
Merge 2.3/rm 5013 vital record prevents access
See merge request !214
2017-04-13 06:16:54 +01:00
Tom Page
e70803c3ba
RM-5013 Merge release/V2.3.1.x into release/V2.3.
2017-04-12 16:19:51 +01:00
Tom Page
e0ccb06ee5
Merge branch 'feature-2.3/RM-5013_VitalRecordPreventsAccess' into 'release/V2.3.1.x'
...
RM-5013 Cherry-pick "Merge branch 'hotfix-2.5/MNT-17007_solr_query' into 'release/V2.5.0.x'"
See merge request !213
2017-04-12 16:17:05 +01:00
Ana Bozianu
3d7a93e3ce
RM-5013 Cherry-pick "Merge branch 'hotfix-2.5/MNT-17007_solr_query' into 'release/V2.5.0.x'"
...
Hotfix 2.5/mnt 17007 solr query
2.5.0.1 hotfix will contain the fix for the SOLR issue and Audit issue
MNT-17007 - Cannot login with other user than admin, after RM 2.5 was installed
RM-4249 - RM Audit doesn't work with alfresco 5.2
See merge request !602
Nb. This does not copy across the updates to the automation tests.
(cherry picked from commit 54d673c176
)
2017-04-12 13:02:10 +01:00
David Webster
336d120ceb
Merge remote-tracking branch 'origin/release/V2.2' into release/V2.3
2017-03-13 16:11:04 +00:00
David Webster
8e2f53ac09
Merge remote-tracking branch 'origin/release/V2.2.1.x' into release/V2.2
2017-03-13 16:09:24 +00:00
David Webster
0512d6a308
MNT-17550: Remove unnecessary file changes (should have been a record only merge from V2.3.0.x)
2017-03-10 16:00:23 +00:00
David Webster
4f355ad10d
Merge branch 'release/V2.3.0.x' into release/V2.3
2017-03-10 15:53:13 +00:00
David Webster
3e3349a919
Merge branch 'release/V2.2' into release/V2.3
2017-03-10 15:51:22 +00:00
Samuel Langlois
ff00888ac4
MNT-17550/BDE-996 Fix TestNG version to 6.10
2017-03-10 14:57:15 +00:00
David Webster
9950f4868c
MNT-17550: Update POM to work around build issue (BDE-996)
2017-03-10 14:57:15 +00:00
Samuel Langlois
407e1f1e65
MNT-17550/BDE-996 Fix TestNG version to 6.10
2017-03-10 14:55:38 +00:00
David Webster
7dce59e4c8
MNT-17550: Update POM to work around build issue (BDE-996)
2017-03-10 14:55:38 +00:00
David Webster
5960df0286
Merge remote-tracking branch 'origin/release/V2.2.0.x' into release/V2.2
2017-03-10 14:52:23 +00:00
David Webster
50bb522a3e
Update versions following release of 2.2.0.3
2017-03-10 14:48:11 +00:00
David Webster
b19235004d
MNT-17550: Release 2.2.0.3
2017-03-09 17:02:39 +00:00
David Webster
52d46bef65
Merge branch 'hotfix-2.2/MNT-17550' into 'release/V2.2.0.x'
...
MNT-17550: Add in null checks to prevent NPE and allow correct error codes to bubble up.
See merge request !114
2017-03-09 13:16:14 +00:00
Samuel Langlois
c6a698ad55
MNT-17550/BDE-996 Fix TestNG version to 6.10
2017-03-09 11:37:13 +00:00
David Webster
a29ac3e653
MNT-17550: Update POM to work around build issue (BDE-996)
2017-03-09 10:55:37 +00:00
David Webster
57b4de11b2
MNT-17550: Add in null checks to prevent NPE and allow correct error codes to bubble up.
2017-03-08 16:05:00 +00:00
Tuna Aksoy
4090a7e66f
Merge branch 'release/V2.3.0.x' into release/V2.3
2017-01-04 13:58:14 +00:00
Tuna Aksoy
373bac00e3
Updated version number to 2.3.0.10-SNAPSHOT
2017-01-04 13:54:12 +00:00
Tuna Aksoy
f4c344b54f
Release RM 2.3.0.9
2017-01-04 12:40:14 +00:00
Tuna Aksoy
868766c586
Merge branch 'release/V2.3.0.x' into release/V2.3
2016-12-27 20:38:30 +00:00
Tuna Aksoy
e7133bd5c6
Copied the ui-automation code from release/v2.3
2016-12-20 11:04:18 +00:00
Tuna Aksoy
b9c4defdb9
Fixed Alfresco installer download config
2016-12-19 21:24:29 +00:00