Tuna Aksoy
ba6dee1cd6
RM-3132 (Update license headers)
2016-03-14 15:26:32 +00:00
Ana Bozianu
c075f6820f
Merge release/V2.4 into master
2016-03-14 14:33:55 +02: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
Tuna Aksoy
185d905803
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
da50a75894
License header should not be added to html files
2016-03-08 18:06:56 +00:00
David Webster
a082aa35a5
Add information about snapshot dependency issue to README
2016-03-08 16:51:26 +00:00
Tuna Aksoy
515da0d8e9
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
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
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
