inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-21 18:09:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,117 Commits 335 Branches 2,191 Tags
ff31236cd5263f23dda3707fc6496fc49e9b6e8c
Commit Graph

4117 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Roxana Lucanu-Ghetu
3e715433f1 Merge RM-3286 2016-06-28 14:52:30 +03:00
Mihai Cozma
c7e38d65a1 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 !279
 2016-06-28 10:53:18 +01:00
Roxana Lucanu-Ghetu
ad3dac0874 Merge RM-3060 into master 2016-06-28 11:49:36 +03:00
Roxana Lucanu-Ghetu
6cbe022956 Merge branch 'feature/RM-3300_mergeToMaster' into 'master' 
Feature/rm 3300 merge to master

Merge RM-3300 into master

See merge request !264
 2016-06-28 09:45:59 +01: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
Roy Wetherall
9fb17b461c Merge branch 'feature-2.3/RM-3114-2.3Merge' into 'release/V2.3' 
Feature 2.3/rm 3114 2.3 merge

See merge request !278
 2016-06-28 03:38:24 +01: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
Tom Page
334a4f6e49 Record-only merge of commit '306c6f' into master. 2016-06-27 14:25:49 +01:00
Roxana Lucanu-Ghetu
a75fe88eb9 Unit and integration test for RM-3450 2016-06-27 10:58:01 +03:00
Ana Bozianu
f2458b812b Read-only merge release/V2.3 into release/V2.4 2016-06-27 09:13:21 +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
Mihai Cozma
03119d88f3 Merge commit '4d7581' into RM-3426_MergeToMaster 2016-06-24 16:54: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
490bf686b9 Merge commit '019e9d637527b5592e8ee1854b6d2169a74d2fa4' into RM-3300_mergeToMaster 
RM-3300
 2016-06-24 13:47:15 +03: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
Roy Wetherall
8dd1f0ff25 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
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
e0db9fbb05 RM-3265 Add test for the Move action on a destroyed record folder. 2016-06-22 20:27:26 +03:00
Tom Page
89a2d71e27 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
4b0ffc272d 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
ae1e200920 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
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
Kristijan Conkas
41fe57f81a 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
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
019e9d6375 Changed to BehaviourDrivenTest to be more obvious the steps and what is checked. 2016-06-15 12:01:47 +03: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
Kristijan Conkas
4e56a1ae2f Merge remote-tracking branch 'origin/master' into feature/RM-3471_Fix_Latest_Aikau_Tests 2016-06-14 09:52:15 +01:00
David Webster
8275ce6a51 Merge remote-tracking branch 'origin/feature/RM-3134_caveat_package_rename' 2016-06-10 22:28:49 +01:00
Kristijan Conkas
0b40650694 RM-3471: Fix for ClassifyContentDialog + HtmlElements bump-up 2016-06-10 10:04:42 +01:00
Roy Wetherall
563cae7555 Changes to integration to better reflect the scenario to be tested 2016-06-09 13:53:07 +10:00
David Webster
1e187d8f36 RM-3134: Fix community build - delete files not deleted by previous revert 2016-06-08 19:36:13 +01:00
Tom Page
1ea82ae380 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
c838cb2aaf 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