Tuna Aksoy
d8871b5d59
Merge branch 'master' into feature/RM_2_5_with_Alfresco_5_1_1
2016-07-12 21:37:21 +01:00
Roxana Dina
ca77b1c782
RM-3265 Explore test failures cause. Introduce "kinds" property in moveRecordFolderCapability bean.
2016-07-12 16:32:47 +03:00
Roxana Dina
081e8faecd
Merge branch 'release/V2.4' of ssh://gitlab.alfresco.com/records-management/records-management into RM-3265_NoOptionToMoveADestroyedRecordFolder
2016-07-12 16:06:49 +03:00
Roxana Lucanu-Ghetu
588155bc33
Merge RM-3450_SDFCIntegration into feature/RM-3450_SFDCIntegration_MergeToMaster
2016-07-12 11:47:10 +03:00
Silviu Dinuta
815013fb07
Merge branch 'feature/RM-3651' into 'master'
...
Feature/rm 3651
Workaround to get rid of the NPE from the logs.
See merge request !326
2016-07-12 09:03:13 +01:00
Roy Wetherall
41120e3298
Merge branch 'feature/RM-3329_Trashcan_gives_an_error' into 'master'
...
Feature/rm 3329 trashcan gives an error
See merge request !305
2016-07-12 00:36:40 +01:00
Silviu Dinuta
2e1cc03bf4
RM-3651: workaround to skip code execution when first element is not a
...
record
2016-07-11 18:26:46 +03:00
Ana Bozianu
d9f9372da3
Revert "Merge branch 'feature/RM-3339_IndependentDBSchemaNumber_2' into 'master'"
...
This reverts commit 4bdfcfc5594c909a2d2e651d09ab211c1a7638f6, reversing
changes made to 25d5b19908395e59543473b574818845dcb207ba.
2016-07-11 10:25:20 +03:00
Tuna Aksoy
c8170dbfe0
Merge branch 'master' into feature/RM_2_5_with_Alfresco_5_1_1
2016-07-09 18:19:14 +01:00
Ana Bozianu
1b1dce9447
RM-3339 - added db enterprise schema
2016-07-08 18:42:40 +03:00
Kristijan Conkas
9eb4174145
Merge branch 'master' into feature/RM-3227-AttemptTwo
2016-07-08 09:16:11 +01:00
Roy Wetherall
07b1985c1f
Ensure that the test listeners are only loaded into the application context when the relevant test is executed.
2016-07-08 11:49:15 +10:00
Roxana Dina
ff2d6eb64a
RM-3265 Explore test failures cause. Remove condition for closed
...
folders.
2016-07-07 16:32:26 +03:00
Tuna Aksoy
eac680591b
Merge branch 'master' into feature/RM_2_5_with_Alfresco_5_1_1
2016-07-06 12:41:53 +01:00
Mihai Cozma
b35a942fbb
Format code
2016-07-06 11:28:12 +03:00
Mihai Cozma
d0e3daba66
Verify if node exists
2016-07-06 10:29:07 +03:00
Roy Wetherall
e4d57f5f2d
Merge outstanding commits from V2.4
2016-07-06 12:24:24 +10:00
Ana Bozianu
83fa0fec11
RM-2890 - updated json structure
2016-07-05 17:58:31 +03:00
Roxana Dina
1242cc4081
Revert "Revert "Merge branch 'feature-2.4/RM-3265_NoOptionToMoveADestroyedRecordFolder' into 'release/V2.4'""
...
This reverts commit 36d5dc46ea
2016-07-05 15:50:35 +03:00
Roxana Dina
36d5dc46ea
Revert "Merge branch 'feature-2.4/RM-3265_NoOptionToMoveADestroyedRecordFolder' into 'release/V2.4'"
...
This reverts commit 0e97de496f
2016-07-05 15:48:51 +03:00
Roxana Dina
0e97de496f
Merge branch 'feature-2.4/RM-3265_NoOptionToMoveADestroyedRecordFolder' into 'release/V2.4'
...
Feature 2.4/rm 3265 no option to move a destroyed record folder
RM-3265 No option to move a destroyed record folder.
Disable "Move" action for closed record folder. Change the
display order of the actions for destroyed record folders so that it
remains consistent with the order at other dispositions steps. Rename
Movable(CapabilityCondition) to MovableRecordFolder(CapabilityCondition)
as this condition is designed especially for record folders.
See merge request !277
2016-07-05 10:57:28 +01:00
Roxana Lucanu-Ghetu
a81616d857
sync release/V2.4 into feature-2.4/RM-3450_SFDCIntegration
2016-07-05 11:54:19 +03:00
Roxana Lucanu-Ghetu
7de04dd516
Renamed unit test classes and changed error message.
2016-07-05 11:25:08 +03:00
Tuna Aksoy
f40b70c438
Merge branch 'feature/RM_Audit_Log_Error' into feature/RM_2_5_with_Alfresco_5_1_1
2016-07-01 23:08:58 +01:00
Tuna Aksoy
b73fa7d7aa
Changed line ending to Unix
2016-07-01 23:07:32 +01:00
Tuna Aksoy
1d69a20a66
Fixed line endings
2016-07-01 23:03:43 +01:00
Tuna Aksoy
522c6b7a0c
Fixed audit log issue
2016-07-01 22:56:45 +01:00
Tuna Aksoy
59020be66e
RM 2.5 + Alfresco 5.1.1
2016-07-01 22:24:50 +01:00
Tuna Aksoy
f873a5acba
RM 2.5 + Alfresco 5.1.1
2016-07-01 17:14:27 +01:00
Roxana Lucanu-Ghetu
d2588048ab
Called the method to test inside another transaction.
2016-06-30 12:00:23 +03:00
Tom Page
8fe79fb6ba
Merge release/V2.5-EA1 into master.
2016-06-29 14:13:45 +01:00
Roy Wetherall
d57e0fe7a0
Merge branch 'feature-2.4/RM-3227-Merge2V2.4' into 'release/V2.4'
...
Feature 2.4/rm 3227 merge2 v2.4
Merge RM-3227 from 2.3 to 2.4
See merge request !283
2016-06-29 10:41:45 +01:00
Roy Wetherall
bac2e18e91
Missing license headers
2016-06-29 14:34:39 +10:00
Roy Wetherall
d5ae13a829
Merge RM-3227 from V2.3 to V2.4
2016-06-29 10:15:13 +10:00
Roxana Lucanu-Ghetu
1de53bd52b
Merge branch 'feature/RM-3286' into 'master'
...
Feature/rm 3286
Merge into master
See merge request !281
2016-06-28 21:28:59 +01:00
Roxana Lucanu-Ghetu
28340b9285
Merge branch 'feature/RM-3060_mergeToMaster' into 'master'
...
Feature/rm 3060 merge to master
Merge fix for record with multiple dispositions.
See merge request !280
2016-06-28 21:26:58 +01:00
alfresco-build
604975fed9
[maven-release-plugin] prepare for next development iteration
2016-06-28 17:59:26 +01:00
alfresco-build
4c958e5a1a
[maven-release-plugin] prepare release V2.5-EA1
2016-06-28 17:59:23 +01:00
Roxana Lucanu-Ghetu
3e715433f1
Merge RM-3286
2016-06-28 14:52:30 +03:00
Roxana Lucanu-Ghetu
ad3dac0874
Merge RM-3060 into master
2016-06-28 11:49:36 +03:00
Roxana Lucanu-Ghetu
5fad0d2592
Merge commit '07db0973c4d4c718de5bf52c8dbcb4450c2f3d72' into feature/RM-3300_mergeToMaster
2016-06-28 11:39:49 +03:00
Mihai Cozma
994630be52
Revert dispositionlifecycletrigger to 0 0/5 * * * ?
2016-06-28 11:28:01 +03:00
Roxana Dina
4514eb392e
RM-3265 Disable "Move" action for closed record folder. Change the
...
display order of the actions for destroyed record folders so that it
remains consistent with the order at other dispositions steps. Rename
Movable(CapabilityCondition) to MovableRecordFolder(CapabilityCondition)
as this condition is designed especially for record folders.
2016-06-27 17:41:13 +03:00
Roxana Lucanu-Ghetu
906cb992e1
Merge branch 'master' of https://gitlab.alfresco.com/records-management/records-management into RM-3300_mergeToMaster
2016-06-27 16:58:24 +03:00
Roxana Lucanu-Ghetu
a75fe88eb9
Unit and integration test for RM-3450
2016-06-27 10:58:01 +03:00
Tom Page
d053b699bc
Merge feature/RM-3341_MergeToMaster into Everything.
2016-06-24 17:25:38 +01:00
Roxana Lucanu-Ghetu
d175c8590c
Merge branch 'feature-2.4/RM-3300' into 'release/V2.4'
...
Feature 2.4/rm 3300
See merge request !271
2016-06-24 15:46:34 +01:00
Roxana Lucanu-Ghetu
07db0973c4
no message
2016-06-24 17:43:52 +03:00
Mihai Cozma
ca533f0023
Merge branch 'feature-2.4/RM-3293_Audit_not_log_default_scheduled' into 'release/V2.4'
...
Feature 2.4/rm 3293 audit not log default scheduled
See merge request !242
2016-06-24 15:24:52 +01:00
Mihai Cozma
4c511cd396
Merge commit 'af7fe8' into RM-3341_MergeToMaster
2016-06-24 17:03:11 +03:00
