Britt Park 99486032e1 Humongous merge. It is incomplete, however; faces-config-navigation.xml and ClientConfigElement ...

were both beyond me, and are just the raw conflict merge data.  If Kev can't figure out how they should
go together by tomorrow AM (for me) I'll dig back in.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@4306 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

2006-11-08 05:17:40 +00:00

..

start-workflow-wizard

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

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

cancel-workflow-dialog.jsp

Big honkin' merge from head. Sheesh!

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

manage-task-dialog.jsp

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

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

manage-workitem-dialog.jsp

Big honkin' merge from head. Sheesh!

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

reassign-task-dialog.jsp

Yet another merge from head to WCM-DEV2.

2006-09-12 18:55:07 +00:00

reassign-workitem-dialog.jsp

Big honkin' merge from head. Sheesh!

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

tasks-completed-dashlet.jsp

Humongous merge. It is incomplete, however; faces-config-navigation.xml and ClientConfigElement

2006-11-08 05:17:40 +00:00

tasks-todo-dashlet.jsp

Humongous merge. It is incomplete, however; faces-config-navigation.xml and ClientConfigElement

2006-11-08 05:17:40 +00:00

view-completed-task-dialog.jsp

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

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

workitems-completed-dashlet.jsp

Big honkin' merge from head. Sheesh!

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

workitems-todo-dashlet.jsp

Big honkin' merge from head. Sheesh!

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