Commit Graph

6 Commits

Author SHA1 Message Date
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
Tatyana Valkevych
22d2935235 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
Tatyana Valkevych
1675fee3b5 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
101647: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      101286: Merged NESS/5.0.N-2015_03_23 (5.0.2) to 5.0.N (5.0.2)
         100798: MNT-13628 : No matching ACE found to remove" error when removing all the ACLs with removeAcl method and 1.1 Browser implementation
            - Filter inherited permissions before try to remove them
            - Added unit test for case using jetty


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@101696 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-10 21:03:26 +00:00
Alan Davis
1d16fa63ab Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
100265: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      100257: Reverse Merge 5.0.N (5.0.2)
         << Cause 4 build errors >>
         100165: Merged NESS/5.0.N-2015_03_23 (5.0.2) to 5.0.N (5.0.2)
            99977: MNT-13628 : No matching ACE found to remove" error when removing all the ACLs with removeAcl method and 1.1 Browser implementation
               - Filter inherited permissions before try to remove them
               - Added unit test for case


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@100574 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-27 23:16:14 +00:00
Alan Davis
64910942ed Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
100243: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      100165: Merged NESS/5.0.N-2015_03_23 (5.0.2) to 5.0.N (5.0.2)
         99977: MNT-13628 : No matching ACE found to remove" error when removing all the ACLs with removeAcl method and 1.1 Browser implementation
            - Filter inherited permissions before try to remove them
            - Added unit test for case


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@100566 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-27 23:14:56 +00:00