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
Roy Wetherall
41120e3298 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
a3f1098fa1 Merge branch 'master' into feature/RM_2_5_with_Alfresco_5_1_1 2016-07-11 20:20:33 +01:00
Silviu Dinuta
2e1cc03bf4 RM-3651: workaround to skip code execution when first element is not a 
record
 2016-07-11 18:26:46 +03:00
Silviu Dinuta
bfa03ca124 Merge master into feature/RM-3643_PatchForUpdatingExistingUsersAndGroups 2016-07-11 11:16:25 +03:00
Ana Bozianu
8ca85000e1 Revert "Revert "Merge branch 'feature/RM-3339_IndependentDBSchemaNumber_2' into 'master'"" 
This reverts commit d9f9372da3.
 2016-07-11 10:27:18 +03:00
Ana Bozianu
d9f9372da3 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
c8170dbfe0 Merge branch 'master' into feature/RM_2_5_with_Alfresco_5_1_1 2016-07-09 18:19:14 +01:00
Ana Bozianu
1b1dce9447 RM-3339 - added db enterprise schema 2016-07-08 18:42:40 +03:00
Silviu Dinuta
050e02184b 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
5fc8700275 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
9eb4174145 Merge branch 'master' into feature/RM-3227-AttemptTwo 2016-07-08 09:16:11 +01:00
Roy Wetherall
07b1985c1f 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
ff2d6eb64a RM-3265 Explore test failures cause. Remove condition for closed 
folders.
 2016-07-07 16:32:26 +03:00
Tuna Aksoy
eac680591b Merge branch 'master' into feature/RM_2_5_with_Alfresco_5_1_1 2016-07-06 12:41:53 +01:00
Tuna Aksoy
be82a7ce80 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
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
1242cc4081 Revert "Revert "Merge branch 'feature-2.4/RM-3265_NoOptionToMoveADestroyedRecordFolder' into 'release/V2.4'"" 
This reverts commit 36d5dc46ea.
 2016-07-05 15:50:35 +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