inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-31 17:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,239 Commits 324 Branches 2,170 Tags
3b0540a19b65257c3e2a0daeebc1631a4f23442c
Commit Graph

2239 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tuna Aksoy
93f709edc2 Removed .gitattributes file as it was causing problems. 2016-03-23 08:18:51 +00:00
Tuna Aksoy
4372073088 Merge branch 'feature-2.4/crlf' into release/V2.4 2016-03-22 07:52:34 +00:00
Jean-Pierre Huynh
e64025e055 BDE-548: 
- Modified pom to use the maven-release-plugin
- Disable doclint
- Removed the explicit call to maven-source-plugin. The source jars will be created by the maven-release-plugin
 2016-03-18 16:01:54 +00:00
David Webster
1c7aa1de1f CRLF: Update following review. Remove explicit binary types and trust Git to work it out on its own 2016-03-16 14:45:32 +00:00
David Webster
87ffd26d09 Configure CRLF line endings for whole repo 
(cherry picked from commit 5f594edd19e37e0c6a838104c80d0da93943c428)
(cherry picked from commit d179e44f7cba552554be5aa3bf30c5eec20dd2e5)
 2016-03-16 14:42:00 +00:00
Tuna Aksoy
8fcc027af0 RM-3132 (Update license headers) 2016-03-16 10:26:58 +00:00
Tuna Aksoy
2c7ed37785 RM-3132 (Update license headers) 2016-03-15 15:48:38 +00:00
Roy Wetherall
2dfc8d0f27 Merge branch 'release/V2.4' of gitlab.alfresco.com:records-management/records-management into feature-2.4/RM-3148-FilePlanInheritedRulesNotFiring 2016-03-15 11:59:32 +11:00
Roy Wetherall
3768638ffe Remove now unessesary checks from rule execution (RM-3148) 2016-03-15 11:59:13 +11:00
Roy Wetherall
169b975b46 Extend integration test to show rule inheritance on record categories working as expected (RM-3148) 2016-03-15 11:20:53 +11:00
Roy Wetherall
587a966477 Ensure that rules are not inherited onto the file plan, unfiled records, holds and transfers root containers (RM-3148) 2016-03-15 10:49:19 +11:00
Tuna Aksoy
c923dc0b9f RM-3132 (Update license headers) 2016-03-14 17:15:02 +00:00
Tuna Aksoy
aa690919b2 RM-3132 (Update license headers) 2016-03-14 17:04:23 +00:00
Tuna Aksoy
687307edbe RM-3132 (Update license headers) 2016-03-14 17:01:03 +00:00
Tuna Aksoy
626f7e4da7 Merge branch 'feature-2.4/RM-3132_Update_license_headers' into release/V2.4 
Conflicts:
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/customizations/components/rules/rules-header.get.js
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/context/webscript-context.xml
	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/classification/package-info.java
	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/referredmetadata/package-info.java
	rm-enterprise/rm-enterprise-share/src/main/amp/config/alfresco/site-webscripts/org/alfresco/rm-enterprise/components/rules/config/rule-config-action.get.js
	rm-enterprise/rm-enterprise-share/src/main/amp/config/alfresco/site-webscripts/org/alfresco/rm-enterprise/components/rules/config/rule-config-condition.get.js
	rm-enterprise/rm-enterprise-share/src/main/amp/config/alfresco/site-webscripts/org/alfresco/rm-enterprise/components/rules/rule-details.get.js
	rm-enterprise/rm-enterprise-share/src/main/amp/config/alfresco/site-webscripts/org/alfresco/rm-enterprise/components/rules/rule-edit.get.js
 2016-03-14 16:37:43 +00:00
Tuna Aksoy
ff1c81d825 RM-3132 (Update license headers) 2016-03-14 16:17:53 +00:00
Tuna Aksoy
54fba30c44 RM-3132 (Update license headers) 2016-03-14 16:12:09 +00:00
Tuna Aksoy
f01d2e1d41 RM-3132 (Update license headers) 2016-03-14 16:07:46 +00:00
Tuna Aksoy
27c76455c8 RM-3132 (Update license headers) 2016-03-14 16:05:44 +00:00
Tuna Aksoy
ba6dee1cd6 RM-3132 (Update license headers) 2016-03-14 15:26:32 +00:00
Tuna Aksoy
4804bffd89 RM-3132 (Update license headers) 2016-03-14 11:54:37 +00:00
Tuna Aksoy
8df85a69c1 RM-3132 (Update license headers) 2016-03-14 11:49:29 +00:00
Tuna Aksoy
69dbe0449f RM-3132 (Update license headers) 2016-03-14 09:51:05 +00:00
Tuna Aksoy
4191ba9495 Reverted all license header related changes 2016-03-13 21:48:44 +00:00
Tuna Aksoy
be2931b565 RM-3132 (Update license headers) 2016-03-13 20:52:10 +00:00
Tuna Aksoy
9886ffb374 Merge branch 'feature-2.4/RM-3082_UpdateAlfrescoCommunityDependency' into release/V2.4 2016-03-13 20:22:42 +00:00
Tuna Aksoy
41d8a7c0db Reverted changes 2016-03-13 20:22:25 +00:00
Tuna Aksoy
7ecfdd540b Merge branch 'feature-2.4/RM-3132_Update_license_headers' into release/V2.4 2016-03-13 16:41:46 +00:00
Tuna Aksoy
d41d325ba1 RM-3132 (Update license headers) 2016-03-11 23:03:18 +00:00
Tuna Aksoy
5d1d814e13 RM-3132 (Update license headers) 2016-03-11 17:28:49 +00:00
Tuna Aksoy
224b1c4116 RM-3132 (Update license headers) 2016-03-11 17:05:12 +00:00
Tuna Aksoy
2e3a1fa270 RM-3132 (Update license headers) 2016-03-11 16:50:48 +00:00
Tuna Aksoy
9ab4e9e17e RM-3132 (Update license headers) 2016-03-11 16:44:23 +00:00
Tuna Aksoy
848e5faae3 Merge branch 'feature-2.4/RM-3082_UpdateAlfrescoCommunityDependency' into 'release/V2.4' 
Feature 2.4/rm 3082 update alfresco community dependency

See merge request !69
 2016-03-11 12:03:08 +00:00
Tuna Aksoy
ab2e7ba365 Merge branch 'release/V2.4' into feature-2.4/RM-3082_UpdateAlfrescoCommunityDependency 2016-03-11 11:53:06 +00:00
Tuna Aksoy
089c302b36 RM-3132 (Update license headers) 2016-03-11 11:40:15 +00:00
Tuna Aksoy
ef61fbb280 License headers should not be added to html files 2016-03-11 10:00:35 +00:00
Tuna Aksoy
0d3fbed2bc RM-3082 (Update RM Community dependency to 5.1.e) 2016-03-11 09:57:41 +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
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
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
eea31e595f Trying to fix builds. 2016-03-03 22:00:41 +02: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