inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-06-09 17:45:10 +00:00
Code Issues Packages Projects Releases Wiki Activity
635 Commits 324 Branches 2,116 Tags
Commit Graph

12 Commits

Author SHA1 Message Date
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
Derek Hulley
776314da72 svn merge -r 2570:2595 svn://www.alfresco.org/alfresco/BRANCHES/V1.2.0/root HEAD/root 
svn merge -r 2597:2649 svn://www.alfresco.org/alfresco/BRANCHES/V1.2.0/root HEAD/root


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2650 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2006-04-12 14:58:21 +00:00
Derek Hulley
d4d33c1e34 Merge V1.2.0 BRANCH to HEAD 
svn merge -r 2566:2569 svn://www.alfresco.org/alfresco/BRANCHES/V1.2.0/root HEAD/root


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2570 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2006-03-22 16:21:14 +00:00
Derek Hulley
506e408ca7 Merge V1.2.0 BRANCH to HEAD 
svn merge -r 2519:2565 svn://www.alfresco.org/alfresco/BRANCHES/V1.2.0/root HEAD/root


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2566 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2006-03-22 12:23:43 +00:00
Derek Hulley
68b06886ce Build fix 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2489 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2006-02-23 19:24:35 +00:00
Derek Hulley
d7a8ab1065 Fixed AR-451: Display both current version of repo and installed version of repo 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2485 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2006-02-23 16:40:53 +00:00
David Caruana
6cb16abef4 Fix AR-431, AR-432. 
Modified the Repository bootstrap mechanism so it's performed after all other initialisation and the order of bootstrap is explicit.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2414 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2006-02-16 15:11:53 +00:00
Derek Hulley
02dc9ced9b Patch checkpoint. 
Service descriptor changes including introduction of schema number.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2161 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2006-01-20 14:45:16 +00:00
Derek Hulley
572f151402 Fallout from Spring upgrade 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2138 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2006-01-18 16:30:33 +00:00
David Caruana
85042b1cf4 Startup message to display VM version and size. Also display warnings if not version 1.5 or max. heap size less than (approx) 500MB. 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2072 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2006-01-04 12:53:23 +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