inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-31 17:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity
7,417 Commits 324 Branches 2,170 Tags
31cd8cc8b1154868b69c3de71dc1d57d2f14a881
Commit Graph

1096 Commits

Author SHA1 Message Date
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
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
Roxana Dina
ff2d6eb64a RM-3265 Explore test failures cause. Remove condition for closed 
folders.
 2016-07-07 16:32:26 +03: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, reversing
changes made to f87d5ca0b806ba4fc8086365ebf932c65bf350b2.
 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
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
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
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
Roxana Lucanu-Ghetu
88963c210d Merge branch 'feature-2.4/RM-3300' into 'release/V2.4' 
Feature 2.4/rm 3300

Run code as system

See merge request !265
 2016-06-24 14:46:38 +01:00
Roxana Lucanu-Ghetu
c8a05ad8f2 Merge commit 'd2b348b9d08465f9c202a9e0b1e9f211c3ccdf6c' into RM-3300_mergeToMaster 
RM-3300
 2016-06-24 13:45:50 +03:00
Roxana Lucanu-Ghetu
7a4d7d5b03 Merge commit 'cc5b9ee32d006f3e8c02010332411eadac101017' into RM-3300_mergeToMaster 
RM-3300
 2016-06-24 13:41:08 +03:00
Roxana Lucanu-Ghetu
d711ae1c1d Run the code as system, as some users may not have the rights to add the aspect. 2016-06-24 12:08:41 +03:00
Tom Page
4d7fcae9b9 RM-3566 Update security controls API. 
Create a Java API to allow adding and removing specified security controls
without affecting other marks on the node.
 2016-06-23 15:05:15 +01:00
Mihai Cozma
cdf9807aec RM-3293 RM Audit History does not log 2016-06-23 12:10:06 +03:00
Roxana Dina
f06ac4772f Merge remote-tracking branch 'origin/feature-2.4/RM-3265_NoOptionToMoveADestroyedRecordFolder' into release/V2.4 2016-06-17 17:28:17 +03:00
Roxana Dina
b9f6e58990 Change capability condition name. Add comments and version number. 2016-06-17 16:32:43 +03:00
Roxana Lucanu-Ghetu
6f99d94357 Changed check to throw exception when we try to create records from different types other than cm:folder 2016-06-17 12:25:22 +03:00
Roxana Lucanu-Ghetu
d97a6e3aa1 Merge branch 'feature-2.4/RM-3286' into 'release/V2.4' 
Feature 2.4/rm 3286

Changed behavior:is not possible to create a record folder inside another record folder from IMAP client.
When adding emails with attachments from Outlook client a hidden folder is created inside the record folder, to store the attachments.

See merge request !214
 2016-06-17 10:06:43 +01:00
Roxana Lucanu-Ghetu
a431e84f8e Created a property for AlfrescoRuntimeException instead ot the message. 2016-06-17 12:05:19 +03:00
Roxana Lucanu-Ghetu
7345f55384 Merge branch 'feature-2.4/RM-3060' into 'release/V2.4' 
Feature 2.4/rm 3060 - Record linked to folder with the same disposition schedule couldn't be cut off

Added search by name for current disposition action; when the record has multiple disposition schedules the current disposition action may not be found by id.

See merge request !157
 2016-06-17 08:25:27 +01:00
Roxana Lucanu-Ghetu
85b965dea9 Changed the test a bit and uncommented intial fix, as we agree it's an workaround for the moment. 2016-06-16 15:50:35 +03:00
Roxana Dina
9fda616251 rm-3265 Add new capability condition to deal with displaying the "Move" action. 2016-06-16 14:00:28 +03:00
Mihai Cozma
60d2a00644 RM-3293 RM Audit History does not log Cutoff 2016-06-15 15:42:11 +03:00
Roxana Lucanu-Ghetu
09beb08332 Merge branch 'feature-2.4/RM-3300' into 'release/V2.4' 
Feature 2.4/rm 3300

On versioning, document can be declared as record if adding record and version aspect is done running as System.
I noticed that the aspect is added only like this in other places where it is used; and the method for creating new recorded version, where the aspect is added, is not used in other places such that changing behavior elsewhere.

See merge request !152
 2016-06-15 10:19:48 +01:00
Roxana Lucanu-Ghetu
9964b70b52 Throw exception when trying to create records from different types other than cm:content 2016-06-14 12:27:17 +03:00
Roy Wetherall
563cae7555 Changes to integration to better reflect the scenario to be tested 2016-06-09 13:53:07 +10:00
Tom Page
fbc9c79ca2 Refactor WebScriptUtils to have consistent capitalisation of JSON. 
Also fix capitalisation in putValuetoJSONObject (so that it's now
putValueToJSONObject).
 2016-06-06 14:55:56 +01:00
Mihai Cozma
a5b59b4356 RM-3341 - Outlook Integrations:Emails can be added to the Holds 
/Transfers from Outlook Integration
 2016-06-06 11:21:51 +03:00
Roxana Lucanu-Ghetu
3d74c81abc Moved check for content to be done on commit. 2016-06-06 10:25:46 +03:00