Commit Graph

3097 Commits

Author SHA1 Message Date
Oana Nechiforescu
591728eb31 The only pom changes needed for release 2.5. 2017-04-09 19:42:07 +03:00
Ana Bozianu
4ea6723600 Merge 'release/V2.4' into 'release/V2.5' 2017-04-06 10:18:16 +03:00
Ana Bozianu
b10c3f59a2 RM-3727 - reverted property removal from property files other than english 2017-04-05 17:06:18 +03:00
Ana Bozianu
31331d91bc Merge branch 'feature-2.4/RM-3727_VitalRecordsToReviewNotification' into 'release/V2.4'
Feature 2.4/rm 3727 vital records to review notification

See merge request !194
2017-04-05 14:41:04 +01:00
Ana Bozianu
e2bbfbd73c RM-3727 - reset cron expression to original one 2017-04-05 16:28:05 +03:00
Ana Bozianu
6a1b32a405 RM-3727 - fixed typo 2017-04-05 15:18:11 +03:00
Ana Bozianu
4e91c9b4ed RM-3727 - added unit test for reviewed action and removed notification issued property 2017-04-05 12:04:31 +03:00
Ana Bozianu
38a81d5934 RM-3727 - fixed query and exposed cron job expression in properties 2017-04-04 18:31:17 +03:00
Tuna Aksoy
610621c2cd RM-2396: Fixed method security config value 2017-04-04 16:25:03 +01:00
Tuna Aksoy
db492e568f RM-2396: Fixed failing integration tests 2017-04-03 12:05:24 +01:00
Tuna Aksoy
b4a788be3d RM-2396 (Upload record via WebDAV fails with org.alfresco.repo.security.permissions.AccessDeniedException) 2017-03-28 07:23:39 +01:00
Tuna Aksoy
8591b2cad4 Merge branch 'release/V2.4' into merge-2.5/RM-3265_to2.5_3
Conflicts:
	pom.xml
	rm-enterprise/rm-enterprise-repo/pom.xml
	rm-enterprise/rm-enterprise-share/pom.xml
2017-03-21 06:09:44 +00:00
Tuna Aksoy
2c295a35f4 RM-4760 (Update source control management info in the parent pom) 2017-03-20 18:42:01 +00:00
Tuna Aksoy
b49015a804 Merge branch 'merge-2.5/Merge_2332_2396' into 'release/V2.5'
Merge 2.5/merge 2332 2396

See merge request !139
2017-03-15 21:54:29 +00:00
Tuna Aksoy
c1103ffbf5 Merge branch 'release/V2.4' into merge-2.5/Merge_2332_2396 2017-03-15 16:38:37 +00:00
Tuna Aksoy
e6ba677cfe Excluded system test from the test suite. 2017-03-15 16:35:22 +00:00
Tuna Aksoy
4ef4a1a2b9 Merge branch 'feature-2.4/RM-2396_Record_upload_failure_via_webdav' into release/V2.4 2017-03-15 16:28:38 +00:00
Ana Bozianu
b9d27f60d5 Merge release/2.4 into release/V2.5 2017-03-15 16:48:26 +02:00
Tuna Aksoy
cbad0acae3 Fixed share port for local UI tests and also addressed review comment. 2017-03-15 14:39:57 +00:00
Ana Bozianu
36935814ff Merge release/V2.4 into release/V2.5 2017-03-15 13:05:23 +02:00
Ana Bozianu
7fdba4c7f6 Merge branch 'feature-2.4/RM-3265_MoveDestroyedRecordFolders' into 'release/V2.4'
Feature 2.4/rm 3265 move destroyed record folders

See merge request !127
2017-03-14 08:22:39 +00:00
David Webster
c40b240af1 Merge commit 'c547a5601eaabe4cf29218014aee9a186d8e4163' into release/V2.5 2017-03-13 16:37:34 +00:00
Ana Bozianu
785be592b2 RM-3265 - added integration test for moving a closed folder 2017-03-13 18:20:39 +02:00
David Webster
43faae8f7b Merge remote-tracking branch 'origin/release/V2.3' into release/V2.4 2017-03-13 16:16:06 +00:00
David Webster
884de597d0 Merge remote-tracking branch 'origin/release/V2.2' into release/V2.3 2017-03-13 16:11:04 +00:00
David Webster
6921dff066 Merge remote-tracking branch 'origin/release/V2.2.1.x' into release/V2.2 2017-03-13 16:09:24 +00:00
Ana Bozianu
62ef6644f0 RM-3265 - fix merge error 2017-03-13 14:53:21 +02:00
Ana Bozianu
8c59aac344 Merge feature-2.4/RM-3265_NoOptionToMoveADestroyedRecordFolder into
feature-2.4/RM-3265_MoveDestroyedRecordFolders
2017-03-13 14:25:18 +02:00
Tuna Aksoy
2f06487a3b RM-2396 (Upload record via WebDAV fails with org.alfresco.repo.security.permissions.AccessDeniedException) 2017-03-13 01:01:33 +00:00
Tuna Aksoy
92f0e5bff0 RM-2396 (Upload record via WebDAV fails with org.alfresco.repo.security.permissions.AccessDeniedException) 2017-03-12 21:00:19 +00:00
Tuna Aksoy
5acdf861cf RM-2396 (Upload record via WebDAV fails with org.alfresco.repo.security.permissions.AccessDeniedException) 2017-03-10 17:45:48 +00:00
David Webster
fb48a1d90b 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
586ad3d560 Merge branch 'release/V2.3.0.x' into release/V2.3 2017-03-10 15:53:13 +00:00
David Webster
b9bfd93187 Merge branch 'release/V2.2' into release/V2.3 2017-03-10 15:51:22 +00:00
Rodica Sutu
69fc1a2cfe Merge branch 'merge-2.5/RM-4835_UpdateUITests' into 'release/V2.5'
Merge 2.5/rm 4835 update ui tests

See merge request !119
2017-03-10 15:18:21 +00:00
Samuel Langlois
a1a9684540 MNT-17550/BDE-996 Fix TestNG version to 6.10 2017-03-10 14:57:15 +00:00
David Webster
ff748f7c3a MNT-17550: Update POM to work around build issue (BDE-996) 2017-03-10 14:57:15 +00:00
Samuel Langlois
079c0a6823 MNT-17550/BDE-996 Fix TestNG version to 6.10 2017-03-10 14:55:38 +00:00
David Webster
6c6d9398b1 MNT-17550: Update POM to work around build issue (BDE-996) 2017-03-10 14:55:38 +00:00
David Webster
7b2fe91534 Merge remote-tracking branch 'origin/release/V2.2.0.x' into release/V2.2 2017-03-10 14:52:23 +00:00
David Webster
78bdeada80 Update versions following release of 2.2.0.3 2017-03-10 14:48:11 +00:00
Silviu Dinuta
b68e12b8b3 Merge branch 'feature-2.4/RM-4163_DeclareRecordsConcurrencyIssue' into 'release/V2.4'
RM-4163: added integration test for scenario provided by Roy and got the

See merge request !116
2017-03-10 12:51:18 +00:00
Rodica Sutu
82d33ee82e Merge branch 'release/V2.4' into merge-2.5/RM-4835_UpdateUITests 2017-03-10 13:44:40 +02:00
Rodica Sutu
c7da05f65a Merge branch 'feature-2.4/RM-4835_UpdateInviteUsersMethod' into 'release/V2.4'
Feature 2.4/rm 4835 update invite users method

See merge request !117
2017-03-10 10:22:36 +00:00
David Webster
23c901af64 MNT-17550: Release 2.2.0.3 2017-03-09 17:02:39 +00:00
Rodica Sutu
c861747b84 -update dataprep dependency
-change the method to invite user from inviteUserToSiteAndAccept to createSiteMember (see MNT-17427)
2017-03-09 16:56:35 +02:00
Silviu Dinuta
e7176597e8 RM-4163: added integration test for scenario provided by Roy and got the
fix from master
2017-03-09 16:27:50 +02:00
David Webster
c547a5601e 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
217ec53966 MNT-17550/BDE-996 Fix TestNG version to 6.10 2017-03-09 11:37:13 +00:00
David Webster
0ae2d548c7 MNT-17550: Update POM to work around build issue (BDE-996) 2017-03-09 10:55:37 +00:00