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
|
39a18df7f2
|
Yet another merge from head to WCM-DEV2.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3774 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
|
2006-09-12 18:55:07 +00:00 |
|
Britt Park
|
820da6ecab
|
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
|
bfd0d2a337
|
Afternoon merge.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@2915 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
|
2006-05-17 22:42:03 +00:00 |
|
Derek Hulley
|
7edcb18bc0
|
Schema changes and ID-based node storage
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2727 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
|
2006-04-28 12:54:29 +00:00 |
|
Derek Hulley
|
2cf407613a
|
EHCache upgrade.
- some minor API changes
- Spring and Hibernate share same CacheManagerFactory now. This allows overridable config
- Moved EHCache config files down into config/alfresco
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2521 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
|
2006-03-07 15:34:17 +00:00 |
|
Derek Hulley
|
6fa5688f5f
|
Fixed permissions patch. Split hibernate and cache configuration property files
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2261 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
|
2006-01-31 13:26:54 +00:00 |
|
Derek Hulley
|
e1e6508fec
|
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 |
|