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 |
|
Derek Hulley
|
89072b8dbd
|
Fixed failing test
- Abstract base class required injection of more generally-used services
Fixed 'property not set' error message to display the correct property name
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2654 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
|
2006-04-13 03:00:01 +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
|
c544223cd5
|
Fixed AR-525:
basePatch bean has the following beans injected and held as protected fields
transactionService
namespaceService
searchService
nodeService
authenticationComponent
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2643 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
|
2006-04-11 10:34:06 +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
|
dc6bc0d726
|
Patch service I18N. Added permission data patch for AR-344. Bumped up schema version to 3.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2206 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
|
2006-01-25 19:07:06 +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
|
1fadfb3952
|
Fixes for patch mechanisms; Javadocs; Some field renaming
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2130 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
|
2006-01-18 01:53:57 +00:00 |
|
Derek Hulley
|
47449b1555
|
Checkpoint checkin of patch code.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2119 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
|
2006-01-16 19:49:34 +00:00 |
|