Jean-Pierre
427e6e9ec8
Merge branch 'feature/BDE-743_Elastic' into 'master'
...
Change installer download logic for rm-automation
It changes from SCP to ANT get so Elastic Bamboo agents can download the installers.
This requires a change in the bamboo build plan for the {{installer.path}} variable
See merge request !362
2016-07-21 13:42:09 +01:00
Jean-Pierre
dda93bca24
BDE-743: Switch installer download to ANT get instead of SCP
2016-07-21 15:36:02 +03:00
Tuna Aksoy
832dfa90fc
Merge branch 'feature/RM_2_5_with_Alfresco_5_1_1' into 'master'
...
Feature/rm 2 5 with alfresco 5 1 1
DO NOT MERGE THIS!!!
I will regularly merge master onto this branch and keep an eye on the builds. The results are looking good
See merge request !299
2016-07-21 08:44:04 +01:00
Tuna Aksoy
61357018d3
Removed H2 script workaround
2016-07-20 19:09:22 +01:00
Tuna Aksoy
71911afff9
Removed the staging repository
2016-07-20 17:48:50 +01:00
Tuna Aksoy
2423279e67
Merge branch 'master' into feature/RM_2_5_with_Alfresco_5_1_1
2016-07-20 17:35:04 +01:00
Roy Wetherall
32ff763fac
Merge branch 'feature/RM-3558-recently-modified-marks' into 'master'
...
Feature/rm 3558 recently modified marks
@Tom can you take a look at this and let me know what you think.
The interesting changes are in the security mark content model. I've run the builds and they were green with the exception of a couple of seemingly unrelated tests (rerunning that build now to see if it makes any difference)
See merge request !341
2016-07-20 05:58:28 +01:00
Roy Wetherall
d67a132b1f
Merge branch 'master' of gitlab.alfresco.com:records-management/records-management into feature/RM-3558-recently-modified-marks
2016-07-20 09:14:59 +10:00
Tuna Aksoy
7876852e6a
Merge branch 'master' into feature/RM_2_5_with_Alfresco_5_1_1
2016-07-19 19:52:56 +01:00
Andy Healey
4938968d9f
Merge branch 'feature/RM-3649-rename-disposition' into 'master'
...
Feature/rm 3649 rename disposition
@ahealey can you take a look and see if you are happy with these changes please.
See merge request !352
2016-07-19 10:14:03 +01:00
Oana Nechiforescu
c480d3076b
Merge branch 'feature/RM-3561_BreadcrumbTests' into 'master'
...
Feature/rm 3561 breadcrumb tests
Tests for RM-3561 and changes for the edit classification title.
See merge request !342
2016-07-19 09:30:23 +01:00
Roy Wetherall
77b5c99bb4
RM-3649: rename disposition to retention
2016-07-19 15:04:29 +10:00
Tuna Aksoy
f48bdba3dc
Merge branch 'master' into feature/RM_2_5_with_Alfresco_5_1_1
2016-07-15 22:49:01 +01:00
Silviu Dinuta
8b0b4679b3
Merge master into
...
feature/RM-3643_PatchForUpdatingExistingUsersAndGroups_alternativeSolution
2016-07-15 19:31:38 +03:00
Tom Page
81f7c09d8b
Merge release/V2.4 into master.
2016-07-15 08:19:20 +01:00
Roy Wetherall
ad3fd81a59
Merge branch 'master' of gitlab.alfresco.com:records-management/records-management into feature/RM-3558-recently-modified-marks
2016-07-15 13:45:33 +10:00
Roy Wetherall
06da0489d8
RM-3558 - Security mark changes appear in My Docs dashlet
...
* added UI test to reproduce issue
* modified security marks model
2016-07-15 12:44:32 +10:00
Tuna Aksoy
485d44887f
Merge branch 'master' into feature/RM_2_5_with_Alfresco_5_1_1
2016-07-14 15:46:29 +01:00
Silviu Dinuta
8c452cb1e5
Merge master into feature/RM-3643_PatchForUpdatingExistingUsersAndGroups
2016-07-14 16:29:03 +03:00
Ana Bozianu
db4e45b789
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
39f9977625
RM-3669 - extracted the schema number for enterprise and decremented community version
2016-07-14 14:49:13 +03:00
Roxana Lucanu-Ghetu
6d597d8cf6
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
9894e56917
RM-3669 (Extract the module schema value into a properties file)
2016-07-13 21:25:09 +01:00
Tuna Aksoy
b3b480fa4e
Merge branch 'master' into feature/RM_2_5_with_Alfresco_5_1_1
2016-07-13 19:57:34 +01:00
Silviu Dinuta
5134cf4930
Merge master into feature/RM-3643_PatchForUpdatingExistingUsersAndGroups
2016-07-13 19:39:18 +03:00
Ana Bozianu
790da55aa4
RM-3669 - first try - build is failing
2016-07-13 18:07:20 +03:00
Tuna Aksoy
c70b2a0163
Merge branch 'feature/RM-3390_SystemUserIsDisplayedOnSecurityClearancePage' into 'master'
...
Feature/rm 3390 system user is displayed on security clearance page
RM-3390 system user is displayed on security clearance page.
Check if the person exists (in the SecurityMarkingsService), before getting it, as this can cause the person to be created. Modify
SecurityMarkings test to accommodate new implementation.
A lot of changes appear in SecurityMarkingsServiceImpl due to formatting. The code modifications are in method "verifyNotChangingSelf", line 727.
See merge request !296
2016-07-13 14:56:10 +01:00
Silviu Dinuta
db64bfd614
RM-3643: modified patch configuration after separating db schemas
2016-07-13 15:48:04 +03:00
Silviu Dinuta
2f76e2b744
Merge master into feature/RM-3643_PatchForUpdatingExistingUsersAndGroups
2016-07-13 15:36:38 +03:00
Tuna Aksoy
570acd6138
Merge branch 'master' into feature/RM-3390_SystemUserIsDisplayedOnSecurityClearancePage
2016-07-13 11:59:00 +01:00
Tuna Aksoy
46cd4e73fc
Merge branch 'feature/RM-3339_IndependentDBSchemaNumber_2' into 'master'
...
Feature/rm 3339 independent db schema number 2
RM-3339 - Independent Community and Enterprise db-schema numbers
Unit tests were failing because customModelService.getCustomModel(DYN_MODEL_NAME) returns null if the model node ref doesn't have the ContentModel.PROP_MODEL_NAME property which is added at transaction commit when the model is compiled. Both customModelService.getCustomModelByUri(DYN_SC_URI) and customModelService.getModelNodeRef(DYN_MODEL_NAME) will return the model instance even if the model is not compiled. We should use one of these methods to avoid defining the same custom model in the same transaction.
See merge request !323
2016-07-13 11:22:40 +01:00
Tuna Aksoy
93789a583b
RM-3390 (The system user is displayed on the security clearance page)
2016-07-13 08:07:36 +01:00
Tuna Aksoy
d8871b5d59
Merge branch 'master' into feature/RM_2_5_with_Alfresco_5_1_1
2016-07-12 21:37:21 +01:00
Ana Bozianu
6979f6ce44
RM-3339 - review updates
2016-07-12 17:31:37 +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
Tuna Aksoy
a3f1098fa1
Merge branch 'master' into feature/RM_2_5_with_Alfresco_5_1_1
2016-07-11 20:20:33 +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
Silviu Dinuta
bfa03ca124
Merge master into feature/RM-3643_PatchForUpdatingExistingUsersAndGroups
2016-07-11 11:16:25 +03:00
Ana Bozianu
8ca85000e1
Revert "Revert "Merge branch 'feature/RM-3339_IndependentDBSchemaNumber_2' into 'master'""
...
This reverts commit d9f9372da3
2016-07-11 10:27:18 +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
Silviu Dinuta
050e02184b
RM-3643: Added a patch for adding newly introduced aspect to authorities
...
that have marks. This will be applied from 2.5-EA1 to latest versions
2016-07-08 13:04:08 +03:00
Kristijan Conkas
5fc8700275
Merge branch 'feature/RM-3227-AttemptTwo' into 'master'
...
Feature/rm 3227 attempt two
V2.4 merge to master
See merge request !313
2016-07-08 09:17:01 +01: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
Tuna Aksoy
eac680591b
Merge branch 'master' into feature/RM_2_5_with_Alfresco_5_1_1
2016-07-06 12:41:53 +01:00
Tuna Aksoy
be82a7ce80
Merge branch 'feature/RM-3647_Fix_Bamboo_Release_process' into 'master'
...
Feature/rm 3647 fix bamboo release process
See merge request !310
2016-07-06 12:34:42 +01:00
