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
Tom Page
26070c66c5 Revert "Revert "Merge branch 'feature/RM-3063_Creation_of_Groups_and_Marks' into 'master'"" 
This reverts commit 869ffc7aeb.
 2016-03-08 10:26:12 +00:00
Tom Page
869ffc7aeb Revert "Merge branch 'feature/RM-3063_Creation_of_Groups_and_Marks' into 'master'" 
This reverts commit 65a6771cc9, reversing
changes made to 878b423b305633aac5ca7c80cec3ee3e1c148cfe.

Conflicts:
	rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/test/util/ExceptionUtils.java
	rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/test/util/ExceptionUtilsUsageExamplesUnitTest.java
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/templates/webscripts/org/alfresco/rma/caveat/caveatgroup.delete.json.ftl
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/templates/webscripts/org/alfresco/rma/caveat/caveatgroup.post.json.ftl
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/templates/webscripts/org/alfresco/rma/caveat/caveatgroup.put.json.ftl
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/templates/webscripts/org/alfresco/rma/caveat/caveatmark.delete.json.ftl
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/templates/webscripts/org/alfresco/rma/caveat/caveatmark.post.json.ftl
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/templates/webscripts/org/alfresco/rma/caveat/caveatmark.put.json.ftl
	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/caveat/model/CaveatModel.java
	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/caveat/scheme/CaveatGroup.java
	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/caveat/scheme/CaveatSchemeService.java
	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/caveat/CaveatBase.java
	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/caveat/CaveatGroupDelete.java
	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/caveat/CaveatGroupPost.java
	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/caveat/CaveatGroupPut.java
	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/caveat/CaveatMarkDelete.java
	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/caveat/CaveatMarkPost.java
	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/caveat/CaveatMarkPut.java
	rm-enterprise/rm-enterprise-repo/src/unit-test/java/org/alfresco/module/org_alfresco_module_rm/script/caveat/CaveatGroupDeleteUnitTest.java
	rm-enterprise/rm-enterprise-repo/src/unit-test/java/org/alfresco/module/org_alfresco_module_rm/script/caveat/CaveatGroupPostUnitTest.java
	rm-enterprise/rm-enterprise-repo/src/unit-test/java/org/alfresco/module/org_alfresco_module_rm/script/caveat/CaveatGroupPutUnitTest.java
	rm-enterprise/rm-enterprise-repo/src/unit-test/java/org/alfresco/module/org_alfresco_module_rm/script/caveat/CaveatGroupsGetUnitTest.java
	rm-enterprise/rm-enterprise-repo/src/unit-test/java/org/alfresco/module/org_alfresco_module_rm/script/caveat/CaveatMarkPostUnitTest.java
	rm-enterprise/rm-enterprise-repo/src/unit-test/java/org/alfresco/module/org_alfresco_module_rm/script/caveat/CaveatTestUtils.java
 2016-03-08 10:17:31 +00:00
Roy Wetherall
89b05b3502 Add missing headers 2016-03-08 12:17:01 +11:00
Roy Wetherall
0131a72e8b Merge remote-tracking branch 'origin/release/V2.4' 2016-03-08 11:44:25 +11:00
Neil McErlean
65a6771cc9 Merge branch 'feature/RM-3063_Creation_of_Groups_and_Marks' into 'master' 
Feature/rm 3063 creation of groups and marks

See merge request !41
 2016-03-07 14:55:58 +00:00
nmcerlean
f1e1f21886 Merge remote-tracking branch 'origin/master' into feature/RM-3063_Creation_of_Groups_and_Marks 2016-03-07 14:55:03 +00:00
Roy Wetherall
4fe356a35c updated and added headers where required. 2016-03-07 15:05:05 +11:00
Roy Wetherall
644bd01c0f Merge branch 'release/V2.4' of gitlab.alfresco.com:records-management/records-management into RM-2969_UpdateLicenseHeaders 2016-03-07 14:19:08 +11:00
Roy Wetherall
47c3746ba3 Review feedback. 2016-03-07 11:06:43 +11:00
Ana Bozianu
e32c49ad81 Merge release/V2.4 into master 2016-03-04 17:37:03 +02:00
Ana Bozianu
f948c26489 Merge branch 'feature-2.4/RM-2770_CannotValidateCaveatConfigIfContentStoreEncrypted' into 'release/V2.4' 
Feature 2.4/rm 2770 cannot validate caveat config if content store encrypted

RM-2770 - List of Values: Unable to grant access to a values (Transfer Location/Supplemental)
   - run check on transaction commit when the encryption key will also be stored

See merge request !53
 2016-03-04 15:13:21 +00:00
David Webster
a269923148 Merge remote-tracking branch 'origin/master' into feature/RM-2718_ViewCaveatMarks 2016-03-04 11:54:50 +00:00
Tom Page
53a23b8253 Merge release/V2.4 into master. 
Conflicts:
	rm-enterprise/pom.xml
	rm-enterprise/rm-enterprise-repo/pom.xml
 2016-03-04 08:32:55 +00:00
Tom Page
cee255fd02 Revert "Trying to fix the builds." 
This reverts commit 31bcd35f7a.
 2016-03-04 08:27:48 +00:00
Tom Page
4a630a145a RM-3110 Upgrade to Alfresco 5.1. 
This will currently break local builds, but should fix Bamboo builds.
Local builds should start to pass again once 5.1 has been released.
 2016-03-04 08:21:03 +00:00
Tom Page
cb12336389 Revert "Trying to fix builds." 
This reverts commit eea31e595f.
 2016-03-04 08:20:45 +00:00
Roy Wetherall
6ba4cabab4 Add missing headers 2016-03-04 10:16:19 +11:00
Roy Wetherall
1b0c83bf02 Merge branch 'release/V2.4' of gitlab.alfresco.com:records-management/records-management into RM-2969_UpdateLicenseHeaders 2016-03-04 09:05:15 +11:00
Roy Wetherall
acf1f40c5d Change automation project license to Enterprise following review discusions 2016-03-04 09:04:48 +11:00
Roy Wetherall
44091c3b9f Improve configuration of license plugin in POMs 2016-03-04 08:59:15 +11:00
onechiforescu
31bcd35f7a Trying to fix the builds. 2016-03-03 22:07:47 +02:00
onechiforescu
eea31e595f Trying to fix builds. 2016-03-03 22:00:41 +02:00
Tom Page
3b33ab0161 Merge release/V2.4 into master. 2016-03-03 17:00:37 +00:00
Tom Page
8364d1aa5c Merge branch 'feature-2.4/RM-3099_UpgradeDataprep' into 'release/V2.4' 
Feature 2.4/rm 3099 upgrade dataprep

See merge request !55
 2016-03-03 16:59:49 +00:00
Ana Bozianu
83889be759 RM-2770 - run check on transaction commit when the encryption key will also be stored 2016-03-03 18:17:17 +02:00
Tom Page
8bb0a0dc66 RM-3099 Upgrade data prep library to 1.8. 
This should fix the Activiti error seen when inviting users to a site.
 2016-03-03 11:20:26 +00:00
Roy Wetherall
274d97ce67 Fix build failure 2016-03-03 14:50:24 +11:00
Roy Wetherall
0254b5166a Merge remote-tracking branch 'origin/release/V2.4' 2016-03-03 14:14:58 +11:00
Roy Wetherall
316e009d6b Merge branch 'feature-2.4/RM-2700_CommunityOnEnterprise' into 'release/V2.4' 
Feature 2.4/rm 2700 community on enterprise

Added module compatibility component that inspects the installed core and rm modules and determines if there is an incompatibility or not.

The application context is closed if there is an issue and an error logged/reported.

See merge request !49
 2016-03-03 03:13:42 +00:00
Roy Wetherall
c0d044a0ec Merge remote-tracking branch 'origin/release/V2.4' 2016-03-03 14:02:18 +11:00
Roy Wetherall
be0986e010 Use POM hierarchy to remove plugin configuration duplication 2016-03-03 13:07:19 +11:00
Roy Wetherall
c3ea2b5317 Merge remote-tracking branch 'origin/release/v2.4' into feature/RM-2700_CommunityOnEnterprise 2016-03-03 11:16:11 +11:00
Roy Wetherall
b2b4db3e41 Review feedback 2016-03-03 10:50:16 +11:00
Roy Wetherall
f98f0cb32b Refresh license headers to include changes to community license and module description 2016-03-03 10:38:37 +11:00
Roy Wetherall
04b74bc12b Update to community license header 2016-03-03 10:29:23 +11:00
Roy Wetherall
a46ecda122 Ensure license header does not appear before import statements in JS files. 2016-03-02 11:59:19 +11:00
Roy Wetherall
f333f57086 update POM config to fix issues on Bamboo 2016-03-02 10:38:33 +11:00
Roy Wetherall
6e3b987948 Updated README with information on how to refresh license headers 2016-03-02 10:25:43 +11:00
nmcerlean
f3a0b84515 Added javadoc to explain how to use smuggleCheckedExceptions utility method. 2016-03-01 20:45:55 +00:00
nmcerlean
45d0ef093e Added additional utility methods and types for easier use of Java 8 lambdas with checked exceptions. 2016-03-01 19:01:06 +00:00
Roy Wetherall
7d358e9662 Added enterprise header, target to enterprise projects and headers to enterprise source. 2016-03-01 13:45:32 +11:00
Roy Wetherall
2515ade37c Merge branch 'release/V2.4' of gitlab.alfresco.com:records-management/records-management into RM-2969_UpdateLicenseHeaders 2016-03-01 13:16:51 +11:00
Roy Wetherall
9aac935880 Add update license header goal to automation project and add community license to automation project source. 2016-03-01 13:16:05 +11:00
Roy Wetherall
be365f98ba Add managed license headers to community projects for java, js and ftl source files. 2016-03-01 13:06:00 +11:00
Roy Wetherall
5059bd7cec Remove old license headers 2016-03-01 12:53:30 +11:00
Roy Wetherall
4cd3a82391 Extended configuration to cover share community, added file exclusions. 2016-03-01 11:35:28 +11:00
Roy Wetherall
201d542c1a Added update header plugin to community repo 2016-03-01 10:58:56 +11:00
Roy Wetherall
10b3e028e2 Added update-file-header goal 2016-02-29 15:11:07 +11:00
Roy Wetherall
246823beab Fixed issues with detecting correct license 2016-02-29 13:52:17 +11:00
Ana Bozianu
45ff8cf39d Merge release/2.4 into master 2016-02-26 11:00:00 +02:00