inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,578 Commits 330 Branches 2,178 Tags
4fef0c0ef45cbb69a2652379005c2b538272fc8e
Commit Graph

8 Commits

Author SHA1 Message Date
Alan Davis
4fef0c0ef4 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
4818f7ccf5 Merged 5.2.N (5.2.1) to HEAD (5.2) 
125781 rmunteanu: 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/HEAD/root@127808 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-06-03 16:40:56 +00:00
Alan Davis
64b99bc21d Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud) 
57568: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      57531: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)
         57425: Merged V4.1.7 (4.1.7) to V4.1-BUG-FIX (4.1.8)
            57422: MNT-9767: Merged DEV to PATCHES/V4.1.7
            57268: MNT-9767 : Navigation arrows of the document details view do not work when a search result is displayed
            Was added the check for currentSortColumn when it is null in SpaceDetailsDialog.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61844 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2014-02-11 21:05:04 +00:00
Samuel Langlois
e60d57ea42 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
Paul Holmes-Higgin
60c08702d5 Updated files to LGPL 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18963 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2010-03-02 21:36:59 +00:00
Derek Hulley
f03cabea25 Merged V3.2 to HEAD 
15908: Merged V3.1 to V3.2 (record only)
      15907: Merged V3.2 to V3.1
         15683: Fixed potential concurrency issues in HeartBeat and LicenseComponent
   15972: Merged V3.1 to V3.2
      15429: **Record only** I18N message IDs for JSF dashlets
      15947: ETHREEOH-2565: The content size shown in the preview popup is incorrect
      15952: Part of fix for ETHREEOH-2493 - missing html encoding on webscript 404 html status page.
      15953: Fix for ETHREEOH-2364 - LDAP sync missing last name displayed as null.
      15956: Fix for ETHREEOH-2714 - html encoding in Create New User summary page.
      15957: Merged DEV-TEMPORARY to V3.1
         15865: Fix for ETHREEOH-2673
      15958: Merged DEV-TEMPORARY to V3.1
         15885: ETHREEOH-2615: Localization Issue - Japanese UI
      15959: Merged DEV-TEMPORARY to V3.1
         15882: ETHREEOH-2644: Sending Email using Template throws exception
      15962: Fix for ETHREEOH-2390
      15963: Fix ETHREEOH-1962: Hibernate flush ordering incorrect for alf_qname
      15965: Merged DEV/BELARUS/V3.1
         15949: ETHREEOH-2689: When upgrading from 2.1.7e to 3.1.0e/3.1.1e user roles are mapped incorrectly
      15966: Merged V2.2 to V3.1
         15948: (RECORD ONLY) Backport of the fix provided for ETHREEOH-1719.
      15969: Prep for ETHREEOH-2295 fixes and associated merges.
      15970: Merged DEV-TEMPORARY to V3.1
         14360: ETHREEOH-1571, ETHREEOH-1656, ETHREEOH-1404, ETHREEOH-953, ALFCOM-2650, ETHREEOH-1572, ETHREEOH-1574
         15331: ETHREEOH-2295 - LayeredFile: Layer file/folder is present when original file/folder is removed
         15824: ETHREEOH-2295 - higlight stale object
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /alfresco/BRANCHES/DEV/BELARUS/V3.1:r15865,15882,15885,15949
   Merged /alfresco/BRANCHES/DEV/3.1SP2:r14360,15331,15824
   Merged /alfresco/BRANCHES/V2.2:r15948
   Merged /alfresco/BRANCHES/V3.1:r15907,15947-15962,15964-15970
   Merged /alfresco/BRANCHES/V3.2:r15908,15972


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@16887 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2009-10-13 20:33:02 +00:00
Gavin Cornwell
a450598ecb Merge of all UI clustering changes originally applied to 2.2 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8292 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2008-02-15 14:59:11 +00:00
Kevin Roast
eae981f72e Final set of UI dialog conversion changes from usethelink. A few associated minor fixes. Improvements and optimisations to automagic file upload JSF trickery 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@7976 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2008-01-10 14:31:58 +00:00