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

12718: Merged V2.2 to V3.0
      12706: Merged V2.1 to V2.2
         12693: Fixed regression where summary pages of WCM related wizards do not render correctly after XSS fixes, related to ETWOTWO-987

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

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

..

actions

Merge DEV\WCM_SERVICES2 to HEAD

2008-12-23 22:54:46 +00:00

admin

Merged V3.0 to HEAD

2008-12-22 13:20:37 +00:00

ajax

Merged V3.0 to HEAD

2008-12-17 10:57:10 +00:00

categories

Merged DEV/UI-CLUSTERING2 to HEAD

2008-02-22 09:53:50 +00:00

clipboard

Merged DEV/UI-CLUSTERING2 to HEAD

2008-02-22 09:53:50 +00:00

coci

Merged V3.0 to HEAD

2008-12-22 13:20:37 +00:00

content

Merged DEV/JASONH to HEAD

2009-01-09 12:22:38 +00:00

dashboard

Merge of all UI clustering changes originally applied to 2.2

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

dialog

Merge of all UI clustering changes originally applied to 2.2

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

forums

Merged V3.0 to HEAD

2008-12-17 13:28:44 +00:00

generator

Merged V2.1-A to HEAD

2008-05-19 14:09:30 +00:00

groups

Merged V3.0 to HEAD

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

ml

Fix for ALFCOM-2306

2009-01-12 14:55:29 +00:00

preview

Moved web script classes and definitions out of web-client project and into remote-api

2008-04-29 19:41:59 +00:00

repository

Merged V3.0 to HEAD

2008-12-19 17:44:01 +00:00

rules

Merged V3.0 to HEAD

2008-12-22 13:20:37 +00:00

search

Merged 2.2 to HEAD

2008-04-15 13:28:37 +00:00

spaces

Merged V3.0 to HEAD

2008-12-22 13:20:37 +00:00

trashcan

Merged V3.0 to HEAD

2008-12-22 13:20:37 +00:00

users

Merged V3.0 to HEAD

2008-12-18 17:10:36 +00:00

wcm

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

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

wizard

Merged V3.0 to HEAD

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

workflow

Merged V3.0 to HEAD

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

AboutBean.java

Merged DEV/UI-CLUSTERING2 to HEAD

2008-02-22 09:53:50 +00:00

BaseDetailsBean.java

Moved web script classes and definitions out of web-client project and into remote-api

2008-04-29 19:41:59 +00:00

BrowseBean.java

Fix to (unreported?) issue where the details page for the wrong node would be shown after pressing Close in Multilingual Dialog.

2009-01-12 19:44:34 +00:00

CategoriesProperties.java

Merge of converted wizards and dialogs done by usethelink

2007-09-19 15:12:24 +00:00

CategoryBrowserBean.java

Merged DEV/UI-CLUSTERING2 to HEAD

2008-02-22 09:53:50 +00:00

ErrorBean.java

Merged V2.2 to HEAD

2008-03-07 12:28:36 +00:00

FileUploadBean.java

Merge of all UI clustering changes originally applied to 2.2

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

LinkPropertiesDialog.java

Fix for exception thrown when clicking Details of a file/folder Link object.

2008-10-08 12:10:30 +00:00

LoginBean.java

Merged V3.0 to HEAD

2008-12-18 17:10:36 +00:00

MultiValueEditorBean.java

Merge of all UI clustering changes originally applied to 2.2

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

NavigationBean.java

Moved web script classes and definitions out of web-client project and into remote-api

2008-04-29 19:41:59 +00:00

NodeEventListener.java

Merge of all UI clustering changes originally applied to 2.2

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

SidebarBean.java

Merge of all UI clustering changes originally applied to 2.2

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

SpaceLinkDetailsDialog.java

Merged DEV/UI-CLUSTERING2 to HEAD

2008-02-22 09:53:50 +00:00

TemplateMailHelperBean.java

Merged DEV/UI-CLUSTERING2 to HEAD

2008-02-22 09:53:50 +00:00

TemplateSupportBean.java

Merged DEV/UI-CLUSTERING2 to HEAD

2008-02-22 09:53:50 +00:00