Alan Davis
84841e063f
Merged 5.2.N (5.2.1) to HEAD (5.2)
...
125788 rmunteanu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
125606 rmunteanu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
125515 slanglois: MNT-16155 Update source headers - add new Copyrights for Java and JSP source files + automatic check in the build
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127810 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 17:08:06 +00:00
Alan Davis
91eb2644ad
Merged 5.2.N (5.2.1) to HEAD (5.2)
...
125781 rmunteanu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
125603 rmunteanu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
125484 slanglois: MNT-16155 Update source headers - remove old Copyrights from Java and JSP dource files
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127808 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 16:40:56 +00:00
Tatyana Valkevych
7dd2291753
Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
...
107541: Merged 5.0.N (5.0.3) to HEAD-BUG-FIX (5.1/Cloud) (PARTIAL MERGE)
107413: Merged DEV to 5.0.N (5.0.3)
106858 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
- Cleaning of Javadoc,
107565: MNT-13545 Fix compilation after merge of Javadoc
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@107633 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-07-02 16:13:03 +00:00
Mark Rogers
afe200fbd5
Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
...
84811: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
82464: ACE-1246 "Allow the customer to change the document encryption key"
Encrypting content store
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85170 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-20 08:36:54 +00:00
Mark Rogers
3349e56606
Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
...
77152: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
73997: Test cleanup following r73957: ContentStore API cleanup
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@78010 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-23 16:03:00 +00:00
Mark Rogers
f1310c6c8d
Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
...
77148: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
73957: ContentStore API cleanup
- Removed previously-deprecated ContentStore.getWriter(ContentReader existingContentReader, String newContentUrl)
- Removed previously-deprecated getSpaceUsed()
- Removed previously-deprecated getTotalSize()
- Deprecated optional and unused getUrls() and variants
- Clean up of implementations to ignore relevant deprecations, etc
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@78004 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-23 15:57:20 +00:00
Samuel Langlois
ab4ca7177f
Merged HEAD-QA to HEAD (4.2) (including moving test classes into separate folders)
...
51903 to 54309
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@54310 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-08-20 17:17:31 +00:00
