Commit Graph

7 Commits

Author SHA1 Message Date
Raluca Munteanu
27333f1d39 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
9a889c69ea 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
Raluca Munteanu
8fbfc61c54 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
124493 aleahu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
      124467 amorarasu:       Reverse merged 5.0.N (5.0.4)
               124430 aleahu: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
                  124322 adragoi: Merged V4.2.6 (4.2.6) to V4.2-BUG-FIX (4.2.7)
                     124254 amorarasu: MNT-15848: The PublishingRestApiTest.testPublishingQueuePost intermittently fails on SQL Server
                        - scheduled post publishing after 1500 milliseconds, to have time to test the SCHEDULED status.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@124521 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-28 08:02:25 +00:00
Raluca Munteanu
cbad8bc789 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
124488 aleahu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
      124430 aleahu:       124430 aleahu: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
               124322 adragoi: Merged V4.2.6 (4.2.6) to V4.2-BUG-FIX (4.2.7)
                  124254 amorarasu: MNT-15848: The PublishingRestApiTest.testPublishingQueuePost intermittently fails on SQL Server
                     - scheduled post publishing after 1500 milliseconds, to have time to test the SCHEDULED status.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@124516 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-28 08:00:08 +00:00
Alan Davis
05ad9c59e4 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
96863: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      96770: Merged 5.0.1 (5.0.1) to 5.0.N (5.0.2)
         96760: Merged DEV to 5.0.1 (5.0.1)
            96635: MNT-13310 : Failing test: PublishingRestApiTest testPublishingQueuePost
               - IN_PROGRESS and COMPLETED statuses are added to expected list to take into account slow environments


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@96886 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-02-12 09:59:36 +00:00
Alan Davis
663a50d6f9 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
64839: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (4.3/Cloud)
      64771: MNT-10059: Resurrect PublishingRestApiTest and PublishWebContentJbpmTest.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@66200 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-04-02 20:06:48 +00:00
Samuel Langlois
788d3c9c89 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