Commit Graph

16 Commits

Author SHA1 Message Date
Raluca Munteanu
f80a9afbe9 Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
114756 rmunteanu: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
      114711 amorarasu: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
         114593 gbroadbent: SIMP CHINESE: Updated file based on EN-rev114472. Fix for MNT-14984 MNT-13871


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@114835 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-10-21 08:13:46 +00:00
Alan Davis
2bf2d43661 MNT-13871: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1) (PARTIAL MERGE)
113932 adavis: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
      113922 adavis: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
         113911 gbroadbent: SIMPLIFIED Chinese: Updated bundle based on EN-rev112938


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@113944 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-10-08 09:53:39 +00:00
Ancuta Morarasu
4bafae07fd Merged HEAD (5.1) to 5.1.N (5.1.1)
113744 gbroadbent: SIMPLIFIED Chinese: Updated bundle based on EN rev113358


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@113755 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-10-06 09:33:30 +00:00
Gloria Broadbent
d076fff262 SIMPLIFIED CHINESE: Updated bundle based on EN rev111175
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@111817 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-09-10 08:30:43 +00:00
Gloria Broadbent
f071f135c7 SIMP CHINESE: Updated files based on EN rev107935
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@107945 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-07-09 10:41:47 +00:00
Alan Davis
f5b7d8dc3e Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
106416: SIMPLIFIED CHINESE: Repo UI files updated as per EN-rev105466


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@106617 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-06-20 12:22:37 +00:00
Alan Davis
a58061ab1a Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
94150: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      94126: SIMPLIFIED CHINESE: Updated files based on EN-rev93671


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@95050 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 15:33:41 +00:00
Alan Davis
1b9e432553 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
93656: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      93635: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.1)
         93606: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.5)
            93399: GERMAN: File updated for 4.1.10 based on EN rev-93357
            93400: SPANISH: File updated for 4.1.10 based on EN rev-93357
            93401: ITALIAN: File updated for 4.1.10 based on EN rev-93357
            93403: NORWEGIAN: File updated for 4.1.10 based on EN rev-93357
            93404: DUTCH: File updated for 4.1.10 based on EN rev-93357
            93406: RUSSIAN: File updated for 4.1.10 based on EN rev-93357
            93408: SIMPLIFIED CHINESE: File updated for 4.1.10 based on EN rev-93357
            93410: FRENCH: File updated for 4.1.10 based on EN rev-93357
            93415: ALL LANG: Removed redundant files for 4.1.10 based on EN rev-93357
            JAPANESE: updated one file for 4.1.10 based on EN rev-93357
         93631: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.5)
            93402: JAPANESE: Files updated for 4.1.10 based on EN rev-93357
            93612: JAPANESE: Encoding fixed for footer and added missing quote for 4.1.10 based on EN rev-93357


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94990 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 12:31:04 +00:00
Alan Davis
f3b20655c4 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
90868: Merged V4.2-BUG-FIX (4.2.5) to HEAD-BUG-FIX (5.0/Cloud)
      90823: Merged V4.2.4 (4.2.4) to V4.2-BUG-FIX (4.2.5)
         90811: SIMP CHINESE: Simplified Chinese UI updated files for 4.2.4 based on EN rev90618


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94734 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 11:05:22 +00:00
Gloria Broadbent
64b202f703 SIMP CHINESE: Simplified Chinese updated files based on EN rev-87995
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@88020 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-10-14 11:15:01 +00:00
Alan Davis
73e63e3fda Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
59546: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      59421: SIMP CHINESE: Simplified Chinese file updated based on EN rev59408


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62157 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 01:49:55 +00:00
Gloria Broadbent
c03263d5ff SIMP CHINESE: Updates to 4.2 Simplified Chinese files based on EN rev55273
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@55680 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-09-19 15:16:30 +00:00
Samuel Langlois
eab5cddc79 Merged HEAD-QA to HEAD (4.2) - final one
r54310-54386


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@54387 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-08-22 08:25:02 +00:00
Samuel Langlois
ab4ca7177f 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
Alan Davis
d933341888 Merged V4.1-BUG-FIX (4.1.1) to HEAD
38219: ALF-14674: DOS voodoo to make start_deployment.bat work, as installed by Bitrock
   38214: ALF-14340 CLONE: Alfresco crashes when viewing doclib / previewing - PDF with CMap
      - Proper fix for build start up issue. The transformer.PdfToImage bean was still being used by
        transformer.complex.AdobeIllustrator.Image in 4.1.1 (not in 3.4.11) but had been removed in 3.4.11
        so when the merge tock place to 4.1.1 the bean could not be found.
        - Similar approach taken for application/illustrator as was done for application/pdf in 3.4.11
          so that the transformer.PdfToImage (which used PDFRenderer and PDFBox) was no longer needed.
   38209: Tweaks to code merged over recently from 3.4 relating to doclib filters query simplification.
   38197: Temporary fix to get Alfresco start up working again
   38196: Merged V3.4-BUG-FIX to V4.1-BUG-FIX
      38172: ALF-12081: Ensure that docs edited online via VTI can be cancelled
      38194: Mergd V3.4 to V3.4-BUG-FIX
         38174: ALF-13578: Merged V4.0-BUG-FIX to V3.4
            35169: ALF-13401, ALF-12393: Added exception translation to AbstractReindexComponent retrying transactions, following change in r35162
   
   38185: Improvements to Lucene query used by Image Summary dashlet after large load testing on 4.0 - from 15sec down to 0.1sec
   38181: Chinese translation updates from Gloria, based on EN r37907.
   38178: ALF-14720: Get rid of big, unused class
   38164: Merged V3.4-BUG-FIX to V4.1-BUG-FIX
      38162: Merged V3.4 to V3.4-BUG-FIX
         38145: ALF-13578: Merged V4.0-BUG-FIX to V3.4
            35162: Removed attempt to force a concurrency exception for getNodePair after a node had actually been deleted. Code would retry 40 times before failing.
            35169: ALF-13401, ALF-12393: Added exception translation to AbstractReindexComponent retrying transactions, following change in r35162

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@38222 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2012-06-22 18:13:17 +00:00
Dave Ward
efea3399ee Merged V4.0-BUG-FIX to HEAD
37749: Fix for ALF-14582 SOLR tracking allows incompatible model changed to the current index to be made
   - part 1
   37810: Merge V3.4-BUG-FIX (3.4.11) to V4.0-BUG-FIX
      37809: Merge V3.4 (3.4.10) to V3.4-BUG-FIX (3.4.11)
         37808: ALF-14603: Merge V4.0 (4.0.2) to V3.4 (3.4.10)
            << The original 001-Cover_Cover.pdf file from ALF-9417 also now previews in 3.4.10 >>
            37800: ALF-14145 Flash preview quality is poor
               - Reverting change r30483 V3.4-BUG-FIX Sept 13 2011 for ALF-9417
                     swf.encoder.params=-s zoom=72 -s ppmsubpixels=1 -s poly2bitmap=1 -s bitmapfonts=1
                 being changed back to:
                     swf.encoder.params=-s poly2bitmap,subpixels=72
                 The original 001-Cover_Cover.pdf file from ALF-9417 does now preview in 4.0.2
      37796: Fix for ALF-12609 - refactored Site Finder to no longer an async call to retrieve memberships before the search operation
      37788: Second part of fix from Alex Mukha for ALF-11714
   37811: Merged V4.0 (4.0.2) to V4.0-BUG-FIX
      37766: Fix for ALF-14529 Share Solr admin console page shows "Unavailable: 05120041...
      - fixed admin and JMX console generation to match SOLR SUMMARY report changes
   37863: Fix for ALF-14631 Extraneous Backslash in Solr Configuration File
   37884: First full commit of Chinese (zh_CN) translation bundles
   37885: Spanish and French translation updates (based on EN r37081) - fixes a minor bug related to German strings in the wrong files.
   37896: Fix for ALF-14582 SOLR tracking allows incompatible model changed to the current index to be made
   - reject model changes that will break query support
   37899: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/DEV/V4.0-BUG-FIX
      37889: Added additional debugging output for JavaScript Search helper
      37897: Fix from Alex Malinovsky for ALF-13529 - Performing a 'Copy to' from document details results in error. [applied to doclib v2 also for 4.0.X]
   37901: Added support for xpath root node resolution to Repository search - previously only NodeRef based root node was working correctly.
   37904: Fix to ensure the root node is only applied to a search for a Repository search (ALF-13778)
   37913: Set version to 4.1.1
   37917: ALF-14652: Installation: Friendly message about busy Tomcat SSL port should be more exact
   - Updated installer strings for SSL port and JMX port
   - Needs localizing
   37920: ALF-13816: Permission Denied on web-client browsing if parent does not inherit permissions
      - FileFolderService getNamePath() now performs toFileInfo() as SystemUser.
   37969: Fixes for:
   ALF-12772 'Path not found' error in Share if user has no permissions to parent folders in breadcrumb
   ALF-14527 Share - Error to display documents if user has no access to the parent folder
   - Share now correctly supports accessing documents and folders (and details page actions) where the user does not have Read permissions on the parent node.
   37972: Fix for ALF-13343 - Unfriendly popup error messages displayed in Share when a user clicks on a direct folder-details or document-details URL that they don't have the permissions to access. Fixed due to changes in rev 37969 plus an improved error message.
   37992: Fix for ALF-14211 - Topics isn't found if search by content (full text)
   38008: Fix for ALF-14042 Customisable Alfresco contextPath in Alfresco AbstractHttpClient (used e.g. by Solr CoreTracker)
   38010: Fix for ALF-14686 https://localhost:8443/solr/admin/cores?action=CHECK - checks the index - it should check the cache
   38027: Update version to 4.0.3 - although this version should never exist - to differenciate it from 4.1


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@38130 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2012-06-21 16:41:53 +00:00