Derek Hulley 3a37812a85 Merged V3.1 to HEAD ...

13857: Merged V2.2 to V3.1
      7028-13041: (Record only) New merge path
      13343: (Record onlY) Merged V3.1 to V2.2:
         13330: Fix ETHREEOH-1408: Incorrect button name at "Manage Task: Submitted" page
         13337: Fix for ETHREEOH-1409 and further fix for ETHREEOH-1408
      13363: Fix ETWOTWO-1022 (Virtual website not found - Bad host name)
      13386: Fix ETWOTWO-1145: WCM Form web script include is not handling ${} token format
      13387: (Record only) Removed dev from version label
      13621: (Record only) Merged V3.1 to V2.2
         13497: Fixed ETHREEOH-1431: Authentication case sensitivity switch doesn't work
                Fixes ETWOTWO-1012
      13828: ETWOTWO-1171 - checkpoint (alternative patch: resetWCMToGroupBasedPermissions)
      13845: ETWOTWO-1171 - alternative patch: resetWCMToGroupBasedPermissions (part 2 of 2 - set layered/shared acls)
      13855: Fixed line endings
      13856: ETWOTWO-1171 - minor fix: wcmPostPermissionSnapshot patch target schema should be 95
   ___________________________________________________________________
   Modified: svn:mergeinfo
      Merged /alfresco/BRANCHES/V2.2:r7028-12305,12307-12310,12312-12319,12321,...
      Merged /alfresco/BRANCHES/V3.1:r13857


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

2009-06-17 12:44:32 +00:00

..

xforms

Merged V3.1 to HEAD

2009-06-17 12:44:32 +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

Point checkin.

2007-05-08 02:33:18 +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

MOB-690 - WCM PreviewURIService - checkpoint

2009-06-10 17:04:09 +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