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
This commit is contained in:
Britt Park
2006-08-27 01:01:30 +00:00
parent e2c66899cc
commit 8031cc6574
322 changed files with 20776 additions and 6550 deletions

View File

@@ -45,6 +45,19 @@
<cm:title>${spaces.templates.email.name}</cm:title>
<cm:description>${spaces.templates.email.description}</cm:description>
</cm:folder>
<cm:folder view:childName="${spaces.templates.rss.childname}">
<view:acl>
<view:ace view:access="ALLOWED">
<view:authority>guest</view:authority>
<view:permission>Consumer</view:permission>
</view:ace>
</view:acl>
<app:uifacets />
<cm:name>${spaces.templates.rss.name}</cm:name>
<app:icon>space-icon-default</app:icon>
<cm:title>${spaces.templates.rss.name}</cm:title>
<cm:description>${spaces.templates.rss.description}</cm:description>
</cm:folder>
<cm:folder view:childName="${spaces.savedsearches.childname}">
<view:acl view:inherit="false">
<view:ace view:access="ALLOWED">