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 |
|
Britt Park
|
cc6af1a45c
|
Merge from HEAD to WCM-DEV2.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3659 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
|
2006-09-02 18:19:00 +00:00 |
|
Britt Park
|
f6355ea108
|
Merge from HEAD into WCM-DEV2. Also fixes build breakage in
jndi-client and catalina-virtual that I introduced earlier.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3393 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
|
2006-07-24 18:27:41 +00:00 |
|
Paul Holmes-Higgin
|
737f4fa8de
|
Merged enterprise features
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2746 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
|
2006-05-03 18:34:13 +00:00 |
|
Kevin Roast
|
bad96d9a0a
|
. UI consitency improvments (with newer look and feel for status area) and fixups
. Fix to missing use of dialog framework for certain actions
. Added missing action "Manage Content Rules" to Space Details page
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2506 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
|
2006-02-28 17:26:12 +00:00 |
|
Gavin Cornwell
|
a4564a1a49
|
Next phase of forums functionality
Simple dialog framework implementation
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2056 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
|
2005-12-22 11:57:43 +00:00 |
|
Derek Hulley
|
d051d1153c
|
Moving to root below branch label
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2005 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
|
2005-12-08 07:13:07 +00:00 |
|