Derek Hulley
|
31d1fa1fb1
|
Merged 1.4 to HEAD
svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4364 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4379 .
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4658 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
|
2006-12-19 14:58:16 +00:00 |
|
Derek Hulley
|
72bb79696d
|
Merged 1.4 to HEAD
svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4252 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4294 .
svn revert root\common\common.xml
svn resolved root\projects\repository\config\alfresco\script-services-context.xml
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4634 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
|
2006-12-18 13:45:11 +00:00 |
|
Kevin Roast
|
a157e79f42
|
AVM JavaScript integration refactored to use new Spring bean config pattern (as per recent HEAD merge changes)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@4313 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
|
2006-11-08 14:14:30 +00:00 |
|
Britt Park
|
b2f9df29d1
|
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
|
8031cc6574
|
Big honkin' merge from head. Sheesh!
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3617 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
|
2006-08-27 01:01:30 +00:00 |
|
Kevin Roast
|
1757cec4f8
|
Checkpoint for the Rhino Script engine integration
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2720 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
|
2006-04-27 09:39:25 +00:00 |
|