Derek Hulley aa61dae7b0 Merged V3.2 to HEAD ...

15200: Fixed ETHREEOH-2480: Cannot upload files with .doc extension owing to exception from ContentMetadataExtracter
   15203: ETHREEOH-2246: Rework patch.authorityMigration to be more performant and report progress
   15254: ETHREEOH-2339: Fixed NullPointerException when editing LDAP-synced user who doesn't have an email address
   15267: Applied patch for ETHREEOH-1448: Exception when using the move up/down button when editting a web form
   15270: Mereg (sic) - Record only 15238
   15285: Merged V3.1 to V3.2
      15281: Merged V2.2 to V3.1
         15280: Absorb all metadata exceptions at all levels
      15282: Merged V2.2 to V3.1
         15273: Merged V3.2 to V2.2
            15200: Fixed ETHREEOH-2480: Cannot upload files with .doc extension owing to exception from ContentMetadataExtracter
-------------------------
Modified: svn:mergeinfo
   Merged /alfresco/BRANCHES/V2.2:r15273,15280
   Merged /alfresco/BRANCHES/V3.1:r15281-15282
   Merged /alfresco/BRANCHES/V3.2:r15200,15203,15254,15267,15270,15285



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@16854 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

2009-10-13 10:57:47 +00:00

..

xforms

Merged V3.2 to HEAD

2009-10-13 10:57:47 +00:00

Form.java

DM Forms - fix web forms with inline URIs (eg. company press release sample)

2007-12-04 14:32:21 +00:00

FormDataFunctions.java

Merged V2.2 to HEAD

2008-10-07 09:07:27 +00:00

FormImpl.java

Merged V3.1 to HEAD

2009-03-12 12:18:25 +00:00

FormInstanceData.java

Merged 2.1 to HEAD

2008-04-15 12:50:33 +00:00

FormInstanceDataImpl.java

Merged V3.1 to HEAD

2009-06-05 17:12:00 +00:00

FormNotFoundException.java

Merged V2.1 to HEAD

2007-09-10 13:21:08 +00:00

FormProcessor.java

Merge of all UI clustering changes originally applied to 2.2

2008-02-15 14:59:11 +00:00

FormsService.java

Merged V3.0 to HEAD

2008-12-18 15:08:14 +00:00

FormsTest.java

Merged V3.1 to HEAD

2009-03-12 21:48:15 +00:00

FreeMarkerRenderingEngine.java

Merged V3.1 to HEAD

2009-06-23 14:34:50 +00:00

FreeMarkerUtil.java

Merged V2.0 to HEAD

2007-03-07 11:46:17 +00:00

RenderingEngine.java

Merged V2.0 to HEAD

2007-04-12 01:41:14 +00:00

RenderingEngineTemplate.java

checkpoint of xforms improvements

2007-04-27 22:33:37 +00:00

RenderingEngineTemplateImpl.java

Merged V3.1 to HEAD

2009-06-23 14:34:50 +00:00

Rendition.java

Merged V3.0 to HEAD (fixes ALFCOM-2311 & ALFCOM-2332)

2009-01-13 22:57:30 +00:00

RenditionImpl.java

Merged V3.1 to HEAD

2009-06-05 17:12:00 +00:00

ServletContextFormDataFunctionsAdapter.java

Updated copyright

2007-02-19 17:17:36 +00:00

XMLUtil.java

Merged V2.9 to HEAD

2008-09-01 10:29:50 +00:00

XMLUtilTest.java

Merged V2.9 to HEAD

2008-09-01 10:29:50 +00:00

XSLFORenderingEngine.java

Updated copyright

2007-02-19 17:17:36 +00:00

XSLTRenderingEngine.java

Merged V2.1 to HEAD

2007-11-12 23:52:46 +00:00