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
2,743 Commits 330 Branches 2,178 Tags
66e449b715da40c73cd40ff347c59b6ca1c85c9c
Commit Graph

2743 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tuna Aksoy
e928ec54a2 RM-3647 (Fix Bamboo Release process) 2016-07-06 12:27:35 +01:00
Mihai Cozma
b35a942fbb Format code 2016-07-06 11:28:12 +03:00
Roxana Lucanu-Ghetu
b94ec44770 Merge branch 'feature-2.4/RM-3450_SFDCIntegration' into 'release/V2.4' 
Feature 2.4/rm 3450 sfdc integration

After creating content from SFDC, when trying to display it in RM we got a NPE.

See merge request !235
 2016-07-06 09:21:14 +01:00
Ana Bozianu
0f406b5d4c Merge branch 'feature/RM-2890_PartialUpdateOfSecurityControls' into 'master' 
Feature/rm 2890 partial update of security controls

RM-2890 - Update Caveat REST API to support partial update of content

- added the securityControlsUpdates element to the REST API that is a list of security controls and update actions
- refactored the base class as the PUT API couldn't work with a list of security marks
- added unit test for the PUT API and JSON helper class

See merge request !304
 2016-07-06 09:05:03 +01: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
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
Roxana Lucanu-Ghetu
7de04dd516 Renamed unit test classes and changed error message. 2016-07-05 11:25:08 +03:00
Tuna Aksoy
893923e7b2 Merge branch 'master' into feature/RM_2_5_with_Alfresco_5_1_1 2016-07-04 16:21:34 +01:00
David Draper
0bf67cf983 Merge branch 'feature/RM-3570_GroupsInSecurityClearanceView' into 'master' 
Feature/rm 3570 groups in security clearance view

This merge request addresses the changes described in RM-3570 to implement the acceptance test criteria defined in RM-3014.

See merge request !288
 2016-07-04 11:25:14 +01:00
ddraper
397bb939fb Merged 'master'. 
Conflicts:
	rm-automation/src/main/java/org/alfresco/po/rm/browse/fileplan/Record.java
	rm-automation/src/main/java/org/alfresco/po/rm/classification/ClassificationPage.java
	rm-automation/src/main/java/org/alfresco/po/rm/security/SecurityGroup.java
	rm-automation/src/test/java/org/alfresco/test/integration/security/UsersClearanceDetails.java
	rm-community/rm-community-share/pom.xml
	rm-enterprise/rm-enterprise-share/src/main/amp/config/alfresco/site-webscripts/org/alfresco/components/console/classification/security-clearance.get.js
 2016-07-04 11:24:07 +01:00
ddraper
001eaa649c Merged 'master'. 
Conflicts:
	rm-community/rm-community-share/pom.xml
	rm-enterprise/rm-enterprise-share/src/main/amp/config/alfresco/site-webscripts/org/alfresco/components/console/classification/security-clearance.get.js
 2016-07-04 10:52:42 +01:00
Tuna Aksoy
f40b70c438 Merge branch 'feature/RM_Audit_Log_Error' into feature/RM_2_5_with_Alfresco_5_1_1 2016-07-01 23:08:58 +01:00
Tuna Aksoy
b73fa7d7aa Changed line ending to Unix 2016-07-01 23:07:32 +01:00
Tuna Aksoy
1d69a20a66 Fixed line endings 2016-07-01 23:03:43 +01:00
Tuna Aksoy
522c6b7a0c Fixed audit log issue 2016-07-01 22:56:45 +01:00
Tuna Aksoy
59020be66e RM 2.5 + Alfresco 5.1.1 2016-07-01 22:24:50 +01:00
Tuna Aksoy
f873a5acba RM 2.5 + Alfresco 5.1.1 2016-07-01 17:14:27 +01:00
Roxana Lucanu-Ghetu
d2588048ab Called the method to test inside another transaction. 2016-06-30 12:00:23 +03:00
Tom Page
8fe79fb6ba Merge release/V2.5-EA1 into master. 2016-06-29 14:13:45 +01:00
Roy Wetherall
d57e0fe7a0 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
bac2e18e91 Missing license headers 2016-06-29 14:34:39 +10: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
alfresco-build
604975fed9 [maven-release-plugin] prepare for next development iteration 2016-06-28 17:59:26 +01:00
alfresco-build
4c958e5a1a [maven-release-plugin] prepare release V2.5-EA1 ags-2.5-EA1 2016-06-28 17:59:23 +01:00
Samuel Langlois
3c906f6e90 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
d62d0bbcdd [maven-release-plugin] rollback the release of V2.5-EA1 2016-06-28 16:28:20 +01:00
Samuel Langlois
3cd7eb7bc1 Put alfresco.rm.version back in top-level only 2016-06-28 16:28:00 +01:00
Samuel Langlois
259ed57063 Get rid od alfresco.rm.version 2016-06-28 16:20:18 +01:00
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