Commit Graph

24 Commits

Author SHA1 Message Date
Tuna Aksoy
7a7986bfcd RM-4570 (Update license headers) 2017-01-02 19:45:32 +00:00
Tom Page
c7b4f284ff Merge RM-2526 Blended disposition schedule into release/V2.4. 2016-10-18 10:54:43 +01:00
Tuna Aksoy
2db9730702 Merge branch 'feature-2.3/RM-4162_MergeToV2.3' into release/V2.3
# Conflicts:
#	rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-action-context.xml
#	rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/CopyMoveLinkFileToBaseAction.java
#	rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/IssueTestSuite.java
#	rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/record/RecordTestSuite.java
2016-10-04 22:56:45 +01:00
Tom Page
014e9662bc Let git handle line endings for us. 2016-09-21 14:55:10 +01:00
Ana Bozianu
935d6319e1 Merge release/V2.3 into release/2.4 2016-09-21 11:58:40 +03:00
Tuna Aksoy
8fcc027af0 RM-3132 (Update license headers) 2016-03-16 10:26:58 +00: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
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
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
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
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
a46ecda122 Ensure license header does not appear before import statements in JS files. 2016-03-02 11:59:19 +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
Tuna Aksoy
402fc1b831 RM-2940 (Create parent pom.xml file above rm-community and rm-enterprise) 2016-01-31 20:11:15 +00:00