Andy Healey
5b4e651568
DOCS-2292
2016-07-27 11:32:12 +01:00
Andy Healey
cf614d5869
DOCS-2292
2016-07-27 11:03:59 +01:00
Andy Healey
00d3698ed9
DOCS-2292
2016-07-27 10:58:17 +01:00
Andy Healey
a94efb40e0
DOCS-2292
2016-07-27 10:51:09 +01:00
Andy Healey
67dfa56082
DOCS-2292
2016-07-27 10:11:38 +01:00
Andy Healey
d6b43c1c69
DOCS-2292
2016-07-27 10:10:11 +01:00
Andy Healey
bc12a33794
DOCS-2292
2016-07-27 09:53:21 +01:00
Roy Wetherall
9265540ab8
RM-3649: missing changes
2016-07-27 11:26:21 +10:00
Andy Healey
04369a2a7d
DOCS-2292
2016-07-26 17:01:56 +01:00
Andy Healey
aa7d48f0bf
DOCS-2292
2016-07-26 16:45:10 +01:00
Andy Healey
81dcbbc5d8
DOCS-2292
2016-07-26 15:08:01 +01:00
Andy Healey
4f23a7df73
DOCS-2292
2016-07-26 14:49:21 +01:00
Andy Healey
5fe37b6408
DOCS-2292
2016-07-26 10:28:39 +01:00
Roy Wetherall
7bfd292480
RM-3649: missed hard coded error messages
2016-07-26 13:07:21 +10:00
Tuna Aksoy
8fc03a5c66
Removed H2 script workaround
2016-07-20 19:09:22 +01:00
Tuna Aksoy
419b40d0d7
Merge branch 'master' into feature/RM_2_5_with_Alfresco_5_1_1
2016-07-19 19:52:56 +01:00
Roy Wetherall
9d813caa9c
RM-3649: rename disposition to retention
2016-07-19 15:04:29 +10:00
Tuna Aksoy
afe6569348
Merge branch 'master' into feature/RM_2_5_with_Alfresco_5_1_1
2016-07-14 15:46:29 +01:00
Ana Bozianu
59cdd29b40
Merge branch 'feature/RM-3669_ExtractModuleSchemaInPropFile' into 'master'
...
Feature/rm 3669 extract module schema in prop file
See merge request !336
2016-07-14 14:18:48 +01:00
Ana Bozianu
f0b1ebcf29
RM-3669 - extracted the schema number for enterprise and decremented community version
2016-07-14 14:49:13 +03:00
Roxana Lucanu-Ghetu
04b3389152
Merge branch 'feature/RM-3450_SFDCIntegration_MergeToMaster' into 'master'
...
Feature/rm 3450 sfdc integration merge to master
Merge RM-3450 from 2.4.1 to master
See merge request !328
2016-07-14 08:49:14 +01:00
Tuna Aksoy
d71aa1f97f
RM-3669 (Extract the module schema value into a properties file)
2016-07-13 21:25:09 +01:00
Tuna Aksoy
56635f7f84
Merge branch 'master' into feature/RM_2_5_with_Alfresco_5_1_1
2016-07-13 19:57:34 +01:00
Ana Bozianu
4c82fcc914
RM-3669 - first try - build is failing
2016-07-13 18:07:20 +03:00
Tuna Aksoy
40a8750e0b
Merge branch 'master' into feature/RM-3390_SystemUserIsDisplayedOnSecurityClearancePage
2016-07-13 11:59:00 +01:00
Tuna Aksoy
9a93dd67b3
RM-3390 (The system user is displayed on the security clearance page)
2016-07-13 08:07:36 +01:00
Tuna Aksoy
2c8ea4e68b
Merge branch 'master' into feature/RM_2_5_with_Alfresco_5_1_1
2016-07-12 21:37:21 +01:00
Roxana Dina
fa410deb6c
RM-3265 Explore test failures cause. Introduce "kinds" property in moveRecordFolderCapability bean.
2016-07-12 16:32:47 +03:00
Roxana Dina
f46e6e1625
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
05d4c27439
Merge RM-3450_SDFCIntegration into feature/RM-3450_SFDCIntegration_MergeToMaster
2016-07-12 11:47:10 +03:00
Silviu Dinuta
79dcc13f6c
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
7b90461c54
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
74a8af453f
RM-3651: workaround to skip code execution when first element is not a
...
record
2016-07-11 18:26:46 +03:00
Ana Bozianu
1037e9e046
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
9d556d34aa
Merge branch 'master' into feature/RM_2_5_with_Alfresco_5_1_1
2016-07-09 18:19:14 +01:00
Ana Bozianu
c8b541ff41
RM-3339 - added db enterprise schema
2016-07-08 18:42:40 +03:00
Kristijan Conkas
d111883115
Merge branch 'master' into feature/RM-3227-AttemptTwo
2016-07-08 09:16:11 +01:00
Roy Wetherall
12b94dd396
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
a077bcbcc3
RM-3265 Explore test failures cause. Remove condition for closed
...
folders.
2016-07-07 16:32:26 +03:00
Tuna Aksoy
f1cc25ece5
Merge branch 'master' into feature/RM_2_5_with_Alfresco_5_1_1
2016-07-06 12:41:53 +01:00
Mihai Cozma
e85333dd88
Format code
2016-07-06 11:28:12 +03:00
Mihai Cozma
27d2d3674f
Verify if node exists
2016-07-06 10:29:07 +03:00
Roy Wetherall
e84a2bda84
Merge outstanding commits from V2.4
2016-07-06 12:24:24 +10:00
Ana Bozianu
1c156789ca
RM-2890 - updated json structure
2016-07-05 17:58:31 +03:00
Roxana Dina
9875ba7c0f
Revert "Revert "Merge branch 'feature-2.4/RM-3265_NoOptionToMoveADestroyedRecordFolder' into 'release/V2.4'""
...
This reverts commit 57b5547167
.
2016-07-05 15:50:35 +03:00
Roxana Dina
57b5547167
Revert "Merge branch 'feature-2.4/RM-3265_NoOptionToMoveADestroyedRecordFolder' into 'release/V2.4'"
...
This reverts commit 3550fe3a28
, reversing
changes made to f87d5ca0b806ba4fc8086365ebf932c65bf350b2.
2016-07-05 15:48:51 +03:00
Roxana Dina
3550fe3a28
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
771a13194b
sync release/V2.4 into feature-2.4/RM-3450_SFDCIntegration
2016-07-05 11:54:19 +03:00
Roxana Lucanu-Ghetu
ddbf628381
Renamed unit test classes and changed error message.
2016-07-05 11:25:08 +03:00
Tuna Aksoy
cd1e350bca
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