Commit Graph

2 Commits

Author SHA1 Message Date
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
f1ebfb963f Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
93992: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      93945: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.1)
         93895: MNT-12873: Merged V4.2.3 (4.2.3.16) to V4.2-BUG-FIX(4.2.5)
            93552 :Merged DEV to V4.2.3 (4.2.3.16)
               93524: MNT-13156: CLONE - Introduction of SiteRole in 4.2.x breaks sites API when there is a custom role defined
                  - Implement site role as String instead of enumeration to allow custom roles. Add CustomRoleTest Unit Test. In SitesImpl convert UnknownAuthorityException into InvalidArgumentException.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@95030 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 15:29:20 +00:00