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,525 Commits 335 Branches 2,191 Tags
2239b23e40b0dc62efb51a5b47d2fed2ea059cfe
Commit Graph

4525 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tuna Aksoy
9a93dd67b3 RM-3390 (The system user is displayed on the security clearance page) 2016-07-13 08:07:36 +01:00
Tuna Aksoy
2c8ea4e68b Merge branch 'master' into feature/RM_2_5_with_Alfresco_5_1_1 2016-07-12 21:37:21 +01:00
Ana Bozianu
13c2c115d9 RM-3339 - review updates 2016-07-12 17:31:37 +03:00
Roxana Dina
fa410deb6c RM-3265 Explore test failures cause. Introduce "kinds" property in moveRecordFolderCapability bean. 2016-07-12 16:32:47 +03:00
Roxana Dina
f46e6e1625 Merge branch 'release/V2.4' of ssh://gitlab.alfresco.com/records-management/records-management into RM-3265_NoOptionToMoveADestroyedRecordFolder 2016-07-12 16:06:49 +03:00
Roxana Lucanu-Ghetu
05d4c27439 Merge RM-3450_SDFCIntegration into feature/RM-3450_SFDCIntegration_MergeToMaster 2016-07-12 11:47:10 +03:00
Silviu Dinuta
79dcc13f6c Merge branch 'feature/RM-3651' into 'master' 
Feature/rm 3651

Workaround to get rid of the NPE from the logs.

See merge request !326
 2016-07-12 09:03:13 +01:00
Roy Wetherall
7b90461c54 Merge branch 'feature/RM-3329_Trashcan_gives_an_error' into 'master' 
Feature/rm 3329 trashcan gives an error

See merge request !305
 2016-07-12 00:36:40 +01:00
Tuna Aksoy
c9e5e73d99 Merge branch 'master' into feature/RM_2_5_with_Alfresco_5_1_1 2016-07-11 20:20:33 +01:00
Silviu Dinuta
74a8af453f RM-3651: workaround to skip code execution when first element is not a 
record
 2016-07-11 18:26:46 +03:00
Silviu Dinuta
8cc5dacd5d Merge master into feature/RM-3643_PatchForUpdatingExistingUsersAndGroups 2016-07-11 11:16:25 +03:00
Ana Bozianu
605504815d Revert "Revert "Merge branch 'feature/RM-3339_IndependentDBSchemaNumber_2' into 'master'"" 
This reverts commit 1037e9e046.
 2016-07-11 10:27:18 +03:00
Ana Bozianu
1037e9e046 Revert "Merge branch 'feature/RM-3339_IndependentDBSchemaNumber_2' into 'master'" 
This reverts commit 4bdfcfc5594c909a2d2e651d09ab211c1a7638f6, reversing
changes made to 25d5b19908395e59543473b574818845dcb207ba.
 2016-07-11 10:25:20 +03:00
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
Roxana Dina
a077bcbcc3 RM-3265 Explore test failures cause. Remove condition for closed 
folders.
 2016-07-07 16:32:26 +03: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
9875ba7c0f Revert "Revert "Merge branch 'feature-2.4/RM-3265_NoOptionToMoveADestroyedRecordFolder' into 'release/V2.4'"" 
This reverts commit 57b5547167.
 2016-07-05 15:50:35 +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