inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-14 17:58:59 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,759 Commits 325 Branches 2,188 Tags
feb9bc09c7d55c8906ebbc1f93e98ffcbe9e597c
Commit Graph

2759 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Roxana Lucanu-Ghetu
3c67dc14f5 Merge branch 'master' of https://gitlab.alfresco.com/records-management/records-management into RM-3300_mergeToMaster 2016-06-27 16:58:24 +03:00
Tom Page
649088a001 Record-only merge of commit '306c6f' into master. 2016-06-27 14:25:49 +01:00
Roxana Lucanu-Ghetu
1c7a84e481 Unit and integration test for RM-3450 2016-06-27 10:58:01 +03:00
Ana Bozianu
30d3b3aad6 Read-only merge release/V2.3 into release/V2.4 2016-06-27 09:13:21 +03:00
Tom Page
e25ff1c64a Merge feature/RM-3341_MergeToMaster into Everything. 2016-06-24 17:25:38 +01:00
Roxana Lucanu-Ghetu
e687fa40cf 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
5f8225360a no message 2016-06-24 17:43:52 +03:00
Mihai Cozma
0ff85ba446 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
9d235a8286 Merge commit 'af7fe8' into RM-3341_MergeToMaster 2016-06-24 17:03:11 +03:00
Mihai Cozma
84d352754b Merge commit '4d7581' into RM-3426_MergeToMaster 2016-06-24 16:54:11 +03:00
Roxana Lucanu-Ghetu
c4c238c439 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
7e31be2d52 Merge commit '5c8cc6fef25bd8b37724ee09a7fbfc210f9db2f7' into RM-3300_mergeToMaster 
RM-3300
 2016-06-24 13:47:15 +03:00
Roxana Lucanu-Ghetu
00bb21a0fd Merge commit '51c7b1b59cb47bb4dd61a32ebf8defc1d698fd87' into RM-3300_mergeToMaster 
RM-3300
 2016-06-24 13:45:50 +03:00
Roxana Lucanu-Ghetu
e94ba209c1 Merge commit '56190f0cb11840ae1d773fbd53ced19111ea7535' into RM-3300_mergeToMaster 
RM-3300
 2016-06-24 13:41:08 +03:00
Roxana Lucanu-Ghetu
b626bfd888 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
Roy Wetherall
b38df8aa4e Merge remote-tracking branch 'origin/release/V2.2' into feature-2.3/RM-3114-2.3Merge 2016-06-24 15:26:22 +10:00
Tom Page
2d539f639d 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
bf83f34716 RM-3293 RM Audit History does not log 2016-06-23 12:10:06 +03:00
Roxana Dina
f3663bcd58 RM-3265 Add test for the Move action on a destroyed record folder. 2016-06-22 20:27:26 +03:00
Tom Page
f3358e9d60 Merge branch 'feature-2.2/RM-3114_Merge' into 'release/V2.2' 
Feature 2.2/rm 3114 merge

RM-3114 Merge from release/V2.2.1.x to release/V2.2.

See merge request !251
 2016-06-21 08:42:00 +01:00
Tom Page
34fa0c4ec3 Merge release/V2.4.0.x into release/V2.4. 
Record-only merge of the version number increase on the hotfix branch.
 2016-06-20 14:24:29 +01:00
Tom Page
86c6cd3d7f Merge release/V2.2.1.x into release/V2.2. 
Conflicts:
	pom.xml
	rm-server/config/alfresco/module/org_alfresco_module_rm/module.properties
	rm-server/pom.xml
	rm-share/config/alfresco/module/org_alfresco_module_rm_share/module.properties
	rm-share/pom.xml
	rm-ui-tests/pom.xml
 2016-06-20 10:31:36 +01:00
Roxana Dina
39ee6e9c02 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
3d8f609c4c Change capability condition name. Add comments and version number. 2016-06-17 16:32:43 +03:00
Roxana Lucanu-Ghetu
4bb4783705 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
Kristijan Conkas
07aac0058c Merge branch 'feature/RM-3471_Fix_Latest_Aikau_Tests' into 'master' 
Feature/rm 3471 fix latest aikau tests

- Fixes tests to cater for Aikau 1.0.71.1.
- Bumps up Aikau to 1.0.71.1.
- Fixes some tests that were failing sporadically.

See merge request !246
 2016-06-17 10:17:20 +01:00
Roxana Lucanu-Ghetu
8f692811f9 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
db390cfb8c Created a property for AlfrescoRuntimeException instead ot the message. 2016-06-17 12:05:19 +03:00
Roxana Lucanu-Ghetu
d9883a3b02 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
b1db2fcd04 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
28551bb78a rm-3265 Add new capability condition to deal with displaying the "Move" action. 2016-06-16 14:00:28 +03:00
Mihai Cozma
69a20b7adf RM-3293 RM Audit History does not log Cutoff 2016-06-15 15:42:11 +03:00
Roxana Lucanu-Ghetu
70f3071f39 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
5c8cc6fef2 Changed to BehaviourDrivenTest to be more obvious the steps and what is checked. 2016-06-15 12:01:47 +03:00
Roxana Lucanu-Ghetu
96142085d8 Throw exception when trying to create records from different types other than cm:content 2016-06-14 12:27:17 +03:00
Kristijan Conkas
ffa9298f40 Merge remote-tracking branch 'origin/master' into feature/RM-3471_Fix_Latest_Aikau_Tests 2016-06-14 09:52:15 +01:00
David Webster
7de55303a7 Merge remote-tracking branch 'origin/feature/RM-3134_caveat_package_rename' 2016-06-10 22:28:49 +01:00
Kristijan Conkas
79e2815032 RM-3471: Fix for ClassifyContentDialog + HtmlElements bump-up 2016-06-10 10:04:42 +01:00
Roy Wetherall
36b6916a88 Changes to integration to better reflect the scenario to be tested 2016-06-09 13:53:07 +10:00
David Webster
aed5bd3b57 RM-3134: Fix community build - delete files not deleted by previous revert 2016-06-08 19:36:13 +01:00
Tom Page
ee96a03075 Merge branch 'feature/WebScriptUtilsCapitalisation' into 'master' 
Feature/web script utils capitalisation

Fix capitalisation in a few method names in WebScriptUtils.

This also provides an opportunity to test whether the mirroring script works, as this includes changes to community files.

See merge request !218
 2016-06-08 17:16:57 +01:00
Mihai Cozma
f7b0589371 Merge branch 'feature-2.4/RM-3341_Emails_can_be_added_to_the_HoldsTransfers' into 'release/V2.4' 
Feature 2.4/rm 3341 emails can be added to the holds transfers

See merge request !217
 2016-06-08 12:34:11 +01:00
David Webster
fb23e6f276 RM-3134: Revert change to rm-community caveat code as legacy feature isn't being renamed 2016-06-08 10:05:02 +01:00
David Webster
9442cfc103 RM-3134: Rename caveat package securitymarks 2016-06-07 15:46:50 +01:00
Tom Page
80bb28d782 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
c429005c33 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
b372ff0900 Moved check for content to be done on commit. 2016-06-06 10:25:46 +03:00
Roxana Lucanu-Ghetu
8d8f5fb5c3 Added check to allow creating only records inside a record folder. 2016-06-03 11:10:18 +03:00
Roxana Lucanu-Ghetu
841c21df80 Changed test class and commented initial fix. 2016-06-01 17:41:36 +03:00
Mihai Cozma
7cb56b5c5c Create Hold and Transfer container exception 2016-05-31 18:16:32 +03:00