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 |
|
Roy Wetherall
|
0f6eb410ed
|
- Added update rule type
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2739 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
|
2006-05-03 11:26:29 +00:00 |
|
Roy Wetherall
|
731733d59f
|
- Auditable aspect now modifies properties in batch using setProperties
- Inbound rule type now only fires on content creation (not on content update)
- Update rule type added, but commented out sue to issues with over enthusiastic policies.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2541 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
|
2006-03-13 14:42:00 +00:00 |
|
Roy Wetherall
|
2bdace676d
|
- Added update and inboundAndUpdate as example rule types that can be commented in.
- Added parameter to content update policy to indicate whether it is new content being updated
- Added triigers to support update rule type
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2275 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
|
2006-02-01 14:26:17 +00:00 |
|
Derek Hulley
|
874d213e1a
|
More Spring fallout. Abstract base beans have to be marked as such
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2141 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
|
2006-01-18 17:48:55 +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 |
|