Commit Graph

7 Commits

Author SHA1 Message Date
Raluca Munteanu
94228f57a2 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/BRANCHES/DEV/5.1.N/root@125606 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-20 10:55:49 +00:00
Raluca Munteanu
e76a93cf89 Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
125498 slanglois: MNT-16155 Update source headers - remove svn:eol-style property on Java and JSP source files


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@125605 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-20 10:30:21 +00:00
Alan Davis
666a4bd587 Tidy up after merge from 5.1.N to HEAD
- This batch are to do with Mark's commits and reverts
     The 5.1.N 119393 record only merge should have had some changes from HEAD 118791

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@123732 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-12 00:05:06 +00:00
Ancuta Morarasu
fe9b8480a8 Merged HEAD (5.1) to 5.1.N (5.1.1)
118826 mrogers: Rolled back CIFSComparator stuff incorrectly checked in


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@119362 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-02 10:11:24 +00:00
Alan Davis
dfe03d979b Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
112968 mrogers: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
      112583: MNT-14817 - Alfresco keeps file handlers on deleted temporary files created by CIFSContentComparator


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@113042 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-09-24 20:03:57 +00:00
Mark Rogers
85f1e5b819 Merged DEV to HEAD : 54690, 54691 : ACE-2783 - Opening and closing a *.xls and *.ppt files with the CIFS interface(without saving) creates a new version
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85530 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-23 16:08:15 +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