Tuna Aksoy
5880454ce9
RM-3132 (Update license headers)
2016-03-14 17:04:23 +00:00
Tuna Aksoy
4b13ec18b4
RM-3132 (Update license headers)
2016-03-14 17:01:03 +00:00
Tuna Aksoy
35c87ba6f5
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
80839e161e
RM-3132 (Update license headers)
2016-03-14 16:17:53 +00:00
Tuna Aksoy
0fa4725b5b
RM-3132 (Update license headers)
2016-03-14 16:12:09 +00:00
Tuna Aksoy
8237b6df2a
RM-3132 (Update license headers)
2016-03-14 16:07:46 +00:00
Tuna Aksoy
ba3b6d337e
RM-3132 (Update license headers)
2016-03-14 16:05:44 +00:00
Tuna Aksoy
672c1c0eef
RM-3132 (Update license headers)
2016-03-14 15:26:32 +00:00
Ana Bozianu
8877224d1c
Merge release/V2.4 into master
2016-03-14 14:33:55 +02:00
Tuna Aksoy
1d98c47a5d
RM-3132 (Update license headers)
2016-03-14 11:54:37 +00:00
Tuna Aksoy
406999cdbf
RM-3132 (Update license headers)
2016-03-14 11:49:29 +00:00
Tuna Aksoy
621f50691a
RM-3132 (Update license headers)
2016-03-14 09:51:05 +00:00
Tuna Aksoy
b11ddb49e3
Reverted all license header related changes
2016-03-13 21:48:44 +00:00
Tuna Aksoy
a8a9c49618
RM-3132 (Update license headers)
2016-03-13 20:52:10 +00:00
Tuna Aksoy
61119c85d7
Merge branch 'feature-2.4/RM-3082_UpdateAlfrescoCommunityDependency' into release/V2.4
2016-03-13 20:22:42 +00:00
Tuna Aksoy
38076ece48
Reverted changes
2016-03-13 20:22:25 +00:00
Tuna Aksoy
e23c77ad91
Merge branch 'feature-2.4/RM-3132_Update_license_headers' into release/V2.4
2016-03-13 16:41:46 +00:00
Tuna Aksoy
2acd47950f
RM-3132 (Update license headers)
2016-03-11 23:03:18 +00:00
Tuna Aksoy
cf287b5d62
RM-3132 (Update license headers)
2016-03-11 17:28:49 +00:00
Tuna Aksoy
2649d94a4a
RM-3132 (Update license headers)
2016-03-11 17:05:12 +00:00
Tuna Aksoy
c68713ad5d
RM-3132 (Update license headers)
2016-03-11 16:50:48 +00:00
Tuna Aksoy
a2d696d4a5
RM-3132 (Update license headers)
2016-03-11 16:44:23 +00:00
Tuna Aksoy
863cf6dbe2
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
a527d1488a
Merge branch 'release/V2.4' into feature-2.4/RM-3082_UpdateAlfrescoCommunityDependency
2016-03-11 11:53:06 +00:00
Tuna Aksoy
421ec292b8
RM-3132 (Update license headers)
2016-03-11 11:40:15 +00:00
Tuna Aksoy
b938f45784
License headers should not be added to html files
2016-03-11 10:00:35 +00:00
Tuna Aksoy
e7be7ea22e
RM-3082 (Update RM Community dependency to 5.1.e)
2016-03-11 09:57:41 +00:00
Tuna Aksoy
943c2e3c2a
Merge branch 'master' into feature/RM-2718_ViewCaveatMarks
...
Conflicts:
README.txt
rm-community/rm-community-share/pom.xml
rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/caveat/model/CaveatModel.java
rm-enterprise/rm-enterprise-share/src/main/amp/web/js/alfresco/rm/renderers/CaveatGroup.js
2016-03-08 18:25:25 +00:00
Tuna Aksoy
2878e77651
License header should not be added to html files
2016-03-08 18:06:56 +00:00
David Webster
94c98ef92b
Add information about snapshot dependency issue to README
2016-03-08 16:51:26 +00:00
Tuna Aksoy
09ba040bb0
Merge branch 'feature/RM-3063_Creation_of_Groups_and_Marks' into 'master'
...
Feature/rm 3063 creation of groups and marks
See merge request !64
2016-03-08 14:44:37 +00:00
Tom Page
6023c9e61a
Revert "Revert "Merge branch 'feature/RM-3063_Creation_of_Groups_and_Marks' into 'master'""
...
This reverts commit 4ada2b5bf0
2016-03-08 10:26:12 +00:00
Tom Page
4ada2b5bf0
Revert "Merge branch 'feature/RM-3063_Creation_of_Groups_and_Marks' into 'master'"
...
This reverts commit ff362d5213
2016-03-08 10:17:31 +00:00
Roy Wetherall
f1ac097a2b
Add missing headers
2016-03-08 12:17:01 +11:00
Roy Wetherall
e1e630a93e
Merge remote-tracking branch 'origin/release/V2.4'
2016-03-08 11:44:25 +11:00
Neil McErlean
ff362d5213
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
8824fc342b
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
4deba195ea
updated and added headers where required.
2016-03-07 15:05:05 +11:00
Roy Wetherall
c01deb55b9
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
59bf1cf1a0
Review feedback.
2016-03-07 11:06:43 +11:00
Ana Bozianu
94f74b5fcb
Merge release/V2.4 into master
2016-03-04 17:37:03 +02:00
Ana Bozianu
76ba8de108
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
f4c69b318c
Merge remote-tracking branch 'origin/master' into feature/RM-2718_ViewCaveatMarks
2016-03-04 11:54:50 +00:00
Tom Page
fd2ad7f254
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
8d62b3919a
Revert "Trying to fix the builds."
...
This reverts commit 33c3d219ce
2016-03-04 08:27:48 +00:00
Tom Page
18b3e62255
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
bbf737db64
Revert "Trying to fix builds."
...
This reverts commit b1c18bb2bf
2016-03-04 08:20:45 +00:00
Roy Wetherall
95610f4bfc
Add missing headers
2016-03-04 10:16:19 +11:00
Roy Wetherall
509ae8e8d6
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
25a6e9a6b7
Change automation project license to Enterprise following review discusions
2016-03-04 09:04:48 +11:00
