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
|
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 |
|
Britt Park
|
f7d9d83036
|
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 |
|
Roy Wetherall
|
5ba9ae0028
|
- Added getCopies method to CopyService
- Copy and transform actions will now (by default) overwrite an exiting copy. A parameter can be set on both actions to revert to the previous, always copy, behaviour.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2755 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
|
2006-05-04 11:15:38 +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 |
|
Roy Wetherall
|
542775a3cd
|
- Prevent the ownable and author aspect from being created.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2350 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
|
2006-02-11 21:18:04 +00:00 |
|
Roy Wetherall
|
48118785b2
|
- Addition of copyToNew flag to onCopyComplete policy for Gav
- Implementation and unit tests for admin web service
- Implementation and unit tests for access control web service
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2222 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
|
2006-01-26 16:55:10 +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 |
|