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
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
Alan Davis
fd77ceb85f Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
58489: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      58379: MNT-9888: WorkflowModelBuilderTest is susceptible to timezone issues
       - Fix unit tests, because they fails in build 75.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61989 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 23:36:11 +00:00
Alan Davis
57f7266e48 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
57478: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      57288: Merged V4.1-BUG-FIX (4.1.7) to V4.2-BUG-FIX (4.2.1)
         57264: ALF-14221: Creation and Modification Date Tests Fail in Timezones Other than BST
            - Set default time zone to Europe/London in AbstractMetadataExtracterTest
         MNT-9566: Intermittent test failure OpenDocumentMetadataExtracterTest.testSupportedMimetypes
            - Changed OpenDocumentMetadataExtracterTest to run against date objects rather than strings


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61820 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 20:45:06 +00:00
Derek Hulley
0b7bceb769 Add a bit more 'wiggle room' to the timeout test, which missed the cutoff by 8ms, and fixed formatting
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@56009 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-09-26 03:30:36 +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