inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,433 Commits 330 Branches 2,178 Tags
1377cc8e118ac49ad2591bb901b49ac4f50218ca
Commit Graph

3433 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tuna Aksoy
d8bf1acb9c Fixed audit log issue 2016-07-01 22:56:45 +01:00
Tuna Aksoy
4702b6fe60 RM 2.5 + Alfresco 5.1.1 2016-07-01 22:24:50 +01:00
Tuna Aksoy
021a1077b0 RM 2.5 + Alfresco 5.1.1 2016-07-01 17:14:27 +01:00
Roxana Lucanu-Ghetu
07227ed9e0 Called the method to test inside another transaction. 2016-06-30 12:00:23 +03:00
Tom Page
361d77532e Merge release/V2.5-EA1 into master. 2016-06-29 14:13:45 +01:00
Roy Wetherall
54b2c446e2 Merge branch 'feature-2.4/RM-3227-Merge2V2.4' into 'release/V2.4' 
Feature 2.4/rm 3227 merge2 v2.4

Merge RM-3227 from 2.3 to 2.4

See merge request !283
 2016-06-29 10:41:45 +01:00
Roy Wetherall
9ff616467e Missing license headers 2016-06-29 14:34:39 +10:00
Roy Wetherall
850783b64a Merge RM-3227 from V2.3 to V2.4 2016-06-29 10:15:13 +10:00
Roxana Lucanu-Ghetu
dc933bc80c 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
5de8289725 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
alfresco-build
2dd28a6ac2 [maven-release-plugin] prepare for next development iteration 2016-06-28 17:59:26 +01:00
alfresco-build
ac4460ee9e [maven-release-plugin] prepare release V2.5-EA1 2016-06-28 17:59:23 +01:00
Samuel Langlois
e65e0c93f3 Remove alfresco.rm.version property and use project.version instead, so the maven-release-plugin works 2016-06-28 16:56:29 +01:00
Samuel Langlois
20173b18b2 [maven-release-plugin] rollback the release of V2.5-EA1 2016-06-28 16:28:20 +01:00
Samuel Langlois
47d4ec4656 Put alfresco.rm.version back in top-level only 2016-06-28 16:28:00 +01:00
Samuel Langlois
9b662e6dad Get rid od alfresco.rm.version 2016-06-28 16:20:18 +01:00
Roxana Lucanu-Ghetu
c459c10e68 Merge RM-3286 2016-06-28 14:52:30 +03:00
Mihai Cozma
a39850a3d4 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
f38f4b24f6 Merge RM-3060 into master 2016-06-28 11:49:36 +03:00
Roxana Lucanu-Ghetu
280746b19c 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
ee428af92f Merge commit '5f8225360a1f322d2522171edc04aa7a54da41b3' into feature/RM-3300_mergeToMaster 2016-06-28 11:39:49 +03:00
Mihai Cozma
006f46dc74 Revert dispositionlifecycletrigger to 0 0/5 * * * ? 2016-06-28 11:28:01 +03:00
Roy Wetherall
3cc614d3d3 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
7fd7cf10f3 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
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