Commit Graph

6 Commits

Author SHA1 Message Date
Alexandru Epure
9cba5fc5b5 Merged 5.2.N (5.2.1) to HEAD (5.2)
129183 mmuller: Merged RETURN-OF-THE-API (5.2.0) to 5.2.N (5.2.1)
      128662 jvonka: V1 REST API test improvements - allow tests to be run individually (as well as within a suite)
      REPO-896


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@129357 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-08-09 14:15:02 +00:00
Alan Davis
3e1e1edbaa 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
19fcf2c411 Merged 5.2.N (5.2.1) to HEAD (5.2)
125783 rmunteanu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      125605 rmunteanu: 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/HEAD/root@127809 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 16:45:04 +00:00
Alan Davis
a035271251 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
64788: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (4.3/Cloud)
      64683: MNT-10915: Public API Activities : activityType org.alfresco.site.user-joined doesn't contain siteId
       - Modify unit test to use SiteService for inviting user


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@66191 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-04-02 19:56:46 +00:00
Alan Davis
e288cc2112 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
63080: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      62921: Merged DEV to V4.2-BUG-FIX (4.2.2)
         62833: ALF-20448: Public API Activities : activityType org.alfresco.site.user-joined doesn't contain siteId
          - Modify ActivitiesImpl.getSiteId() method to handle situation when default tenant domain is used. 
          - Add unit test.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@64263 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-03-14 15:45:02 +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