Kevin Roast cca1350bd1 fix for merge horror ...

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

2006-12-18 16:24:25 +00:00

..

actions

Merge from HEAD to WCM-DEV2.

2006-09-02 18:19:00 +00:00

ajax

- Incorporated new sidebar which contains the shelf and navigator (tree) components

2006-12-06 23:26:27 +00:00

clipboard

. Big and juicy application/WCM model refactoring

2006-11-27 15:03:12 +00:00

content

. Big and juicy application/WCM model refactoring

2006-11-27 15:03:12 +00:00

dashboard

. Fix up for several merge issues in UI classes

2006-10-25 16:12:27 +00:00

dialog

. Create Web Content from Form hooked into Available Content Forms panel in the User Sandboxes component

2006-11-16 13:17:41 +00:00

forums

- Incorporated new sidebar which contains the shelf and navigator (tree) components

2006-12-06 23:26:27 +00:00

generator

Heinous merge from HEAD. Seems to basically work. Be on guard however.

2006-10-18 02:24:36 +00:00

preview

. Invite Users screens for Manage Content Users and Manage Space Users now support email templates

2006-03-09 17:14:21 +00:00

repository

Merged 1.4 to HEAD

2006-12-18 13:18:44 +00:00

rules

- Incorporated new sidebar which contains the shelf and navigator (tree) components

2006-12-06 23:26:27 +00:00

spaces

Merged 1.4 to HEAD

2006-12-18 13:18:44 +00:00

users

- Incorporated new sidebar which contains the shelf and navigator (tree) components

2006-12-06 23:26:27 +00:00

wcm

. WCM UI is now sensitive to the 'wcmwf:submitted' aspect marking an item as currently part of a live workflow process

2006-12-18 15:57:49 +00:00

wizard

Merged 1.4 to HEAD

2006-12-18 14:33:46 +00:00

workflow

Merged 1.4 to HEAD

2006-12-18 13:18:44 +00:00

AboutBean.java

Big honkin' merge from head. Sheesh!

2006-08-27 01:01:30 +00:00

AdminNodeBrowseBean.java

Merge from HEAD into WCM-DEV2. Also fixes build breakage in

2006-07-24 18:27:41 +00:00

AdvancedSearchBean.java

Heinous merge from HEAD. Seems to basically work. Be on guard however.

2006-10-18 02:24:36 +00:00

BaseDetailsBean.java

. Big and juicy application/WCM model refactoring

2006-11-27 15:03:12 +00:00

BrowseBean.java

- Incorporated new sidebar which contains the shelf and navigator (tree) components

2006-12-06 23:26:27 +00:00

CategoriesBean.java

- Incorporated new sidebar which contains the shelf and navigator (tree) components

2006-12-06 23:26:27 +00:00

CheckinCheckoutBean.java

Merged 1.4 to HEAD

2006-12-18 14:24:16 +00:00

DocumentDetailsBean.java

. Big and juicy application/WCM model refactoring

2006-11-27 15:03:12 +00:00

DocumentPropertiesBean.java

Big honkin' merge from head. Sheesh!

2006-08-27 01:01:30 +00:00

ErrorBean.java

Heinous merge from HEAD. Seems to basically work. Be on guard however.

2006-10-18 02:24:36 +00:00

ExportBean.java

Merge from HEAD into WCM-DEV2. Also fixes build breakage in

2006-07-24 18:27:41 +00:00

FileUploadBean.java

checkpoint of templating as used in the virgin money demo.

2006-08-09 23:09:35 +00:00

GroupsBean.java

- Incorporated new sidebar which contains the shelf and navigator (tree) components

2006-12-06 23:26:27 +00:00

ImportBean.java

. Added Repository and Patch system properties to System Info admin page in the web-client

2006-02-17 11:41:23 +00:00

LinkPropertiesBean.java

Merge from HEAD into WCM-DEV2. Also fixes build breakage in

2006-07-24 18:27:41 +00:00

LoginBean.java

- Incorporated new sidebar which contains the shelf and navigator (tree) components

2006-12-06 23:26:27 +00:00

MultiValueEditorBean.java

Introduced multi-value support in the client

2006-04-11 22:15:43 +00:00

NavigationBean.java

- Incorporated new sidebar which contains the shelf and navigator (tree) components

2006-12-06 23:26:27 +00:00

NodeEventListener.java

. Added notion of NodeEventListeners to BrowseBean.

2006-02-15 15:32:40 +00:00

RecentSpacesBean.java

- Incorporated new sidebar which contains the shelf and navigator (tree) components

2006-12-06 23:26:27 +00:00

SearchContext.java

fix for merge horror

2006-12-18 16:24:25 +00:00

SidebarBean.java

- Incorporated new sidebar which contains the shelf and navigator (tree) components

2006-12-06 23:26:27 +00:00

SpaceDetailsBean.java

. Big and juicy application/WCM model refactoring

2006-11-27 15:03:12 +00:00

TemplateMailHelperBean.java

Big honkin' merge from head. Sheesh!

2006-08-27 01:01:30 +00:00

TemplateSupportBean.java

Big honkin' merge from head. Sheesh!

2006-08-27 01:01:30 +00:00

TrashcanBean.java

- Incorporated new sidebar which contains the shelf and navigator (tree) components

2006-12-06 23:26:27 +00:00

UserPreferencesBean.java

Merge from HEAD to WCM-DEV2.

2006-09-02 18:19:00 +00:00

UserShortcutsBean.java

Merge from HEAD into WCM-DEV2. Also fixes build breakage in

2006-07-24 18:27:41 +00:00