Commit Graph

5 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
Alan Davis
095b910fd1 Merged 5.2.N (5.2.1) to HEAD (5.2)
125686: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      125578 adavis: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
         125558 ltuca: MNT-16163 : Custom Type - ... in Description
   124858: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      124799 adavis: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
         124794 adavis: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
            124785 adavis: Merged V4.1-BUG-FIX (4.1.11) to V4.2-BUG-FIX (4.2.7)
               124784 adavis: Merged V4.1.10 (4.1.10.10) to V4.1-BUG-FIX (4.1.11)
                  124775 cturlica: MNT-15921: CLONE - 4.1.10: invite and other emails
   124817: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      124814 adavis: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
         << Similar change required in nb, pt_BR, ru, zh_CN files that don't exist in 5.0.N >> 
         124691 amukha: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
            124688 amukha: Merged V4.1-BUG-FIX (4.1.11) to V4.2-BUG-FIX (4.2.7)
               124686 amukha: Merged 5.0.2-CLOUD42 (Cloud ) to V4.1-BUG-FIX (4.1.11)
                  124681 cturlica: MNT-15919: into invite and other emails
                     - on premise email template changes part III,
   124697: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      124693 amukha: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
         124691 amukha: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
            124688 amukha: Merged V4.1-BUG-FIX (4.1.11) to V4.2-BUG-FIX (4.2.7)
               124686 amukha: Merged 5.0.2-CLOUD42 (Cloud ) to V4.1-BUG-FIX (4.1.11)
                  124681 cturlica: MNT-15919: into invite and other emails
                     - on premise email template changes part III,
   124634: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      124625 amukha: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
         124619 amukha: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
            124611 amukha: Merged V4.1-BUG-FIX (4.1.11) to V4.2-BUG-FIX (4.2.7)
               124609 amukha: Merged V4.1.10 (4.1.10.10) to V4.1-BUG-FIX (4.1.11)
                  124606 amukha: MNT-15921: Merged 5.0.2-CLOUD42 (Cloud ) to V4.1.10 (4.1.10.10)
                     124594 cturlica: MNT-15919: into invite and other emails
                        - on premise email template changes part II,
   124633: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      124624 amukha: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
         124618 amukha: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
            124610 amukha: Merged V4.1-BUG-FIX (4.1.11) to V4.2-BUG-FIX (4.2.7)
               124608 amukha: Merged V4.1.10 (4.1.10.10) to V4.1-BUG-FIX (4.1.11)
                  124605 amukha: MNT-15921: Merged 5.0.2-CLOUD42 (Cloud ) to V4.1.10 (4.1.10.10)
                     124567 cturlica: MNT-15919: into invite and other emails
                        - on premise email template changes,
   124367: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      124349 adavis: Merged 5.1.0-CLOUD43 (Cloud ) to 5.1.N (5.1.2)
         123596 skopf: ACE-2540
   - commits without changes: 123860,123908,124221,124223,124227,124279,124366,
     124368,124479,124522,124531,124700,124855,124857,124859,124873,124957,
     124961-124962,125057,125154,125234,125236,125325,125348,125389,125519-125520,
     125590,125685,125687-125688


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@125701 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-22 13:45:13 +00:00
Steven Glover
1d85a91e92 ALF-20169 "cmis:secondary type properties are not visible " : fix + build tests (though I'm going to do a bit more testing), removal of unused imports, slight refactoring of some tests
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@56189 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-10-01 09:48:22 +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