Commit Graph

6 Commits

Author SHA1 Message Date
Raluca Munteanu
6afb44e712 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/BRANCHES/DEV/5.2.N/root@125788 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-26 13:45:01 +00:00
Raluca Munteanu
8674e2bfc8 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/BRANCHES/DEV/5.2.N/root@125781 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-26 12:48:49 +00:00
Alan Davis
367182a9fb Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
104814: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      104747: MNT-10914: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         104737: Merged DEV to V4.2-BUG-FIX (4.2.5)
            104724: MNT-10914: Alfresco 4.2.d categories corrupting in share
               - Ignore rule execution for the nodes of cm:failedThumbnail type. Add patch that removes cm:generalclassifiable aspect, associated properties for the nodes of cm:failedThumbnail type and triggers reindex. Add unit test.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@104872 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-05-26 21:53:29 +00:00
Alan Davis
995821ee71 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
58876: BDE-195 Fix tests in Maven
     Put FTPServerTest back into OwnJVM until MNT-10160 is fixed
     Put ThumbnailServiceImplTest back into OwnJVM too, as it is failing and seems to bring everything down
     Bring back RepositoryStartStopTest: this one is fine!


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62053 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 00:26:34 +00:00
Alan Davis
03b22967cc Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
58467: Categorized some spring tests so they run in the same vm successfully


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61988 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 23:35:21 +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