inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
6,124 Commits 330 Branches 2,178 Tags
4b7bbd7fbdedb51d5453d5eb5909bbe446563eb1
Commit Graph

37 Commits

Author SHA1 Message Date
Sara Aspery
1f7a81fd45 Merge branch 'release/V2.6' into release/V2.7 
# Conflicts:
#	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/model/AbstractSecureItem.java
 2020-01-02 14:19:01 +00:00
Sara Aspery
8ae4ef6290 Update license headers 2020-01-02 13:57:59 +00:00
Ross Gale
cc52137795 RM-7051 resolving conflict 2019-11-25 08:31:09 +00:00
Ross Gale
5d3efcc4c4 Merge branch 'hotfix-2.5/RM-7051_Disposition' into 'release/V2.5.3.x' 
Resolve RM-7051 "Hotfix 2.5/ disposition"

See merge request records-management/records-management!1303

Adds web script to ensure all records have correct disposition instructions
 2019-11-22 18:15:24 +00:00
Ross Gale
0d9f375d7b RM-6702 updating headers to 2019 2019-01-04 10:11:45 +00:00
Ross Gale
c98274f77f RM-6702 updating headers to 2019 2019-01-03 14:30:44 +00:00
Ross Gale
cab68e87de RM-6302 adding the java work to edit disposition schedule 2018-05-02 21:52:08 +01:00
Tom Page
98765ca22c Updating license header to 2018 2018-01-16 12:31:06 +00:00
Ana Manolache
4a145de54e update headers to 2018 2018-01-03 12:01:00 +02:00
Tom Page
eae9ffcec6 Merge release/V2.5 into release/V2.6. 2017-12-11 15:27:28 +00:00
dbilligmaier
3dddbb7188 ALL LANG: Updated localized files as per Revision 2017-01-26 2017-01-27 13:53:30 +00:00
Tuna Aksoy
058e3803fe RM-4570 (Update license headers) 2017-01-02 19:21:21 +00:00
Mihai Cozma
38fa3baab7 MNT-16971 Unable to set read only using property server.allowWrite=false 
-fix transactions permission 
-fix document library view
 2016-12-19 15:52:26 +02:00
Mihai Cozma
375c7e1b13 Merge branch 'feature/RM-4329_Alfreco_Search_in_colaboration_site_doesn't_work' into 'master' 
Feature/rm 4329 alfreco search in colaboration site doesn't work

See merge request !616
 2016-11-11 09:50:21 +02:00
Tuna Aksoy
cba239d488 Merged V2.4 to V2.5 2016-10-07 14:42:43 +01:00
Tuna Aksoy
0614914beb Merge branch 'release/V2.4' into merge-2.5/MergeV24ToV25 
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/DestroyAction.java
 2016-10-05 15:20:19 +01:00
Tom Page
b3b2585e99 Let git handle line endings for us. 2016-09-23 10:34:36 +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