Gavin Cornwell 78d40348eb Merged 2.1 to HEAD ...

8639: Fixed WCM-1138 (Need a way to remove AVM locks through the UI)
   8749: Fixed AR-2177, WCM-1059, WCM-1137 and improved fix for WCM-1089, all to do with locking issues on the create and edit web content wizards.

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

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

..

actions

Blog Integration module moved into core

2008-02-20 09:36:44 +00:00

admin

Merged V2.2 to HEAD

2008-03-07 01:50:03 +00:00

ajax

Merged V2.2 to HEAD

2008-03-10 13:35:04 +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

Offline edit fixes

2008-03-27 09:58:39 +00:00

content

Merged V2.2 to HEAD

2008-03-10 13:35:04 +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 V2.2 to HEAD

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

generator

Merged V2.2 to HEAD

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

groups

Merged V2.2 to HEAD

2008-03-11 14:55:29 +00:00

ml

Merged V2.2 to HEAD

2008-03-07 10:32:22 +00:00

preview

Merge of all UI clustering changes originally applied to 2.2

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

projects

Merged DEV/UI-CLUSTERING2 to HEAD

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

repository

Fixed NPE problem with category editing found by Mike

2008-03-20 12:04:23 +00:00

rules

Merged V2.2 to HEAD 7461: Reapply rules to children and other rule related fixes

2008-02-26 16:35:04 +00:00

search

Merged V2.2 to HEAD

2008-03-11 14:55:29 +00:00

spaces

Merged V2.2 to HEAD

2008-03-11 10:37:36 +00:00

trashcan

Merged DEV/UI-CLUSTERING2 to HEAD

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

users

Merge Offline Edit dev branch to HEAD

2008-03-13 13:43:38 +00:00

wcm

Merged 2.1 to HEAD

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

wizard

Merged V2.2 to HEAD

2008-03-11 14:55:29 +00:00

workflow

Merged V2.2 to HEAD

2008-03-10 15:14:40 +00:00

AboutBean.java

Merged DEV/UI-CLUSTERING2 to HEAD

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

BaseDetailsBean.java

Fixed NPE problem with category editing found by Mike

2008-03-20 12:04:23 +00:00

BrowseBean.java

Applied patch provided by UTL to fix download action

2008-04-10 19:22:15 +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

Merge of all UI clustering changes originally applied to 2.2

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

LoginBean.java

Merged V2.2 to HEAD

2008-03-10 15:22:43 +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

Merged V2.2 to HEAD

2008-03-11 10:43:37 +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