Jan Vonka 923af7affd Merged V3.1 to HEAD ...

17133: Merged V2.2 to V3.1
        17132: Fix ETWOONE-394, ETWOTWO-1016 - using regenerate renditions (3rd option) causes locks to remain
    also fix to use getAvmLockingService() 


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

2009-10-23 15:10:36 +00:00

..

actions

Merged V3.1 to HEAD

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

admin

Merged V3.2 to HEAD

2009-10-15 10:38:44 +00:00

ajax

Merged V3.2 to HEAD

2009-10-14 10:50:14 +00:00

categories

Merged V3.2 to HEAD

2009-10-13 20:33:02 +00:00

clipboard

Merged V3.2 to HEAD

2009-10-13 20:08:41 +00:00

coci

Merged V3.2 to HEAD

2009-10-22 10:17:12 +00:00

content

Merged V3.2 to HEAD

2009-10-14 11:08:21 +00:00

dashboard

Merged V3.1 to HEAD

2009-03-11 14:45:20 +00:00

dialog

Fixed MOB-426: Refactor CopyService: Apply new pattern to existing policy handlers

2009-04-09 14:48:02 +00:00

forums

Merged V3.2 to HEAD

2009-10-15 10:38:44 +00:00

generator

Merged DEV-TEMPORARY to HEAD

2009-10-23 09:43:24 +00:00

groups

Merged V3.2 to HEAD

2009-10-14 10:05:53 +00:00

jmx

Merged DAVEW_V3.2 to HEAD

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

ml

Merged V3.2 to HEAD

2009-10-15 08:11:27 +00:00

preview

Merged V3.2 to HEAD

2009-10-13 20:33:02 +00:00

repository

Merged V3.2 to HEAD

2009-10-19 15:30:46 +00:00

rules

Merged V3.2 to HEAD

2009-10-13 20:33:02 +00:00

search

Lucene upgrade to 2.4.1: MOB-587: First round of fixes for the query parser

2009-03-16 12:08:04 +00:00

spaces

Merged V3.2 to HEAD

2009-10-13 20:33:02 +00:00

trashcan

Merged V3.2 to HEAD

2009-10-14 09:55:04 +00:00

users

Merged V3.2 to HEAD

2009-10-15 10:38:44 +00:00

wcm

Merged V3.1 to HEAD

2009-10-23 15:10:36 +00:00

wizard

Merged V3.2 to HEAD

2009-10-14 09:30:27 +00:00

workflow

Merged V3.2 to HEAD

2009-10-15 08:11:27 +00:00

AboutBean.java

Merged DEV/UI-CLUSTERING2 to HEAD

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

BaseDetailsBean.java

Merged V3.1 to HEAD

2009-03-13 01:52:39 +00:00

BrowseBean.java

Merged V3.2 to HEAD

2009-10-15 08:11:27 +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

Merged V3.1 to HEAD

2009-03-13 01:52:39 +00:00

LoginBean.java

Merged V3.2 to HEAD

2009-10-14 09:24:13 +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 V3.2 to HEAD

2009-10-15 08:11:27 +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 V3.2 to HEAD

2009-10-13 20:33:02 +00:00

TemplateMailHelperBean.java

Merged V3.2 to HEAD

2009-08-18 18:02:23 +00:00

TemplateSupportBean.java

Merged V3.2 to HEAD

2009-10-13 20:33:02 +00:00