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
Tuna Aksoy
9d556d34aa Merge branch 'master' into feature/RM_2_5_with_Alfresco_5_1_1 2016-07-09 18:19:14 +01:00
Ana Bozianu
c8b541ff41 RM-3339 - added db enterprise schema 2016-07-08 18:42:40 +03:00
Silviu Dinuta
8693b41385 RM-3643: Added a patch for adding newly introduced aspect to authorities 
that have marks. This will be applied from 2.5-EA1 to latest versions
 2016-07-08 13:04:08 +03:00
Kristijan Conkas
9c6b7db3da Merge branch 'feature/RM-3227-AttemptTwo' into 'master' 
Feature/rm 3227 attempt two

V2.4 merge to master

See merge request !313
 2016-07-08 09:17:01 +01:00
Kristijan Conkas
d111883115 Merge branch 'master' into feature/RM-3227-AttemptTwo 2016-07-08 09:16:11 +01:00
Roy Wetherall
12b94dd396 Ensure that the test listeners are only loaded into the application context when the relevant test is executed. 2016-07-08 11:49:15 +10:00
Tuna Aksoy
f1cc25ece5 Merge branch 'master' into feature/RM_2_5_with_Alfresco_5_1_1 2016-07-06 12:41:53 +01:00
Tuna Aksoy
4b6b5e1927 Merge branch 'feature/RM-3647_Fix_Bamboo_Release_process' into 'master' 
Feature/rm 3647 fix bamboo release process

See merge request !310
 2016-07-06 12:34:42 +01:00
Tuna Aksoy
b3f58a72be RM-3647 (Fix Bamboo Release process) 2016-07-06 12:27:35 +01:00
Mihai Cozma
e85333dd88 Format code 2016-07-06 11:28:12 +03:00
Roxana Lucanu-Ghetu
05a817c60c 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
fb62ea9e1d 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
27d2d3674f Verify if node exists 2016-07-06 10:29:07 +03:00
Roy Wetherall
e84a2bda84 Merge outstanding commits from V2.4 2016-07-06 12:24:24 +10:00
Ana Bozianu
1c156789ca RM-2890 - updated json structure 2016-07-05 17:58:31 +03:00
Roxana Dina
57b5547167 Revert "Merge branch 'feature-2.4/RM-3265_NoOptionToMoveADestroyedRecordFolder' into 'release/V2.4'" 
This reverts commit 3550fe3a28, reversing
changes made to f87d5ca0b806ba4fc8086365ebf932c65bf350b2.
 2016-07-05 15:48:51 +03:00
Roxana Dina
3550fe3a28 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
771a13194b sync release/V2.4 into feature-2.4/RM-3450_SFDCIntegration 2016-07-05 11:54:19 +03:00
Roxana Lucanu-Ghetu
ddbf628381 Renamed unit test classes and changed error message. 2016-07-05 11:25:08 +03:00
Tuna Aksoy
8d534e3cab Merge branch 'master' into feature/RM_2_5_with_Alfresco_5_1_1 2016-07-04 16:21:34 +01:00
David Draper
244523ac5c 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
dbbcd84f01 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
7d6a5c7036 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
cd1e350bca 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
0a578fc91f Changed line ending to Unix 2016-07-01 23:07:32 +01:00
Tuna Aksoy
3615bbda60 Fixed line endings 2016-07-01 23:03:43 +01:00
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