Commit Graph

7 Commits

Author SHA1 Message Date
Alan Davis
ce5a675361 Merged 5.2.N (5.2.1) to HEAD (5.2)
126004 aleahu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      125892 adragoi: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
         125842 rmunteanu: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4) (PARTIAL MERGE)
            125700 adavis: Merged V4.2.5 (4.2.5.7) to V4.2-BUG-FIX (4.2.7)
               125698: Merged DEV to V4.2.5 (4.2.5.7)
                  125677 arebegea: MNT-15219 : Excel (.xlsx) containing xmls (shapes/drawings) with multi byte characters may cause OutOfMemory in Tika
                     - Should not have updated version.properties as the original commit needs to be merged forwards.,
               125696: Merged DEV to V4.2.5 (4.2.5.7)
                  125677 arebegea: MNT-15219 : Excel (.xlsx) containing xmls (shapes/drawings) with multi byte characters may cause OutOfMemory in Tika
                     - Modified tika parser and tika core jars to allow some configuration parameters to be sent from Alfresco side using the metadata map parameter
                     - Excluded by default the parsing of drawings/shapes xmls because there was little valuable data that could be extracted from those xmls


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127835 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-06 08:34:29 +00:00
Alan Davis
84841e063f 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
91eb2644ad 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
c8aa156dda Merged 5.2.N (5.2.1) to HEAD (5.2)
124364 adragoi: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      124313 adragoi: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
         124244 abalmus: MNT-15497 : Keyword tags generated from metadata extraction are formed into a single string rather than split on delimiter
            - Fixed tag separation on delimiter
            - Enhanced existing test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127752 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 16:03:24 +00:00
Alan Davis
9552852b91 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
104496: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      104336: Merged NESS/5.0.N-2015_03_23 (5.0.2) to 5.0.N (5.0.2)
         103763: MNT-13920 - rewrite the image dimension properties if there is any exif dimensions information available
         104332: MNT-13920 - code changes based on review, improved javadoc and slight modifications on the extract size method


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@104607 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-05-20 09:54:36 +00:00
Alan Davis
f70dc05311 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
100990: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      100834: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         100784: Merged DEV to V4.2-BUG-FIX (4.2.5)
            100732: MNT-13655 : Just first keyword of the IPTC keywords list is extracted as metadata and put into description field of an image
               - Added special way for handling multi-valued meta-data properties retrieved from parser.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@101005 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-01 01:27:45 +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