Merged 1.4 to HEAD

svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4150 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4151 .
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4155 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4157 .
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4188 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4190 .
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4201 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4204 .
   Included:
      Complete moving around of Records Management code and config: 4151, 4156, 4157, 4189, 4190
      1.3RC2 upgrade path support:                                  4204


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4205 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2006-10-24 12:06:26 +00:00
parent 492aabbbcc
commit 4645415989
14 changed files with 152 additions and 1548 deletions

View File

@@ -126,20 +126,6 @@
</view:properties>
<view:associations></view:associations>
</cm:content>
<cm:content xmlns:alf="http://www.alfresco.org" xmlns:d="http://www.alfresco.org/model/dictionary/1.0" xmlns:view="http://www.alfresco.org/view/repository/1.0" xmlns:sys="http://www.alfresco.org/model/system/1.0" xmlns:act="http://www.alfresco.org/model/action/1.0" xmlns:rule="http://www.alfresco.org/model/rule/1.0" xmlns:fm="http://www.alfresco.org/model/forum/1.0" xmlns:app="http://www.alfresco.org/model/application/1.0" xmlns:usr="http://www.alfresco.org/model/user/1.0" xmlns:ver="http://www.alfresco.org/model/versionstore/1.0" xmlns:cm="http://www.alfresco.org/model/content/1.0" xmlns="" view:childName="cm:records_report.ftl">
<view:aspects>
<cm:titled></cm:titled>
<app:inlineeditable></app:inlineeditable>
</view:aspects>
<view:properties>
<app:editInline>true</app:editInline>
<cm:description>Displays the current state of records in a file plan space or a space containing a file plan.</cm:description>
<cm:content>contentUrl=classpath:alfresco/templates/content/examples/records_report.ftl|mimetype=text/plain|size=6134|encoding=UTF-8</cm:content>
<cm:title>records_report.ftl</cm:title>
<cm:name>records_report.ftl</cm:name>
</view:properties>
<view:associations></view:associations>
</cm:content>
<cm:content xmlns:alf="http://www.alfresco.org" xmlns:d="http://www.alfresco.org/model/dictionary/1.0" xmlns:view="http://www.alfresco.org/view/repository/1.0" xmlns:sys="http://www.alfresco.org/model/system/1.0" xmlns:act="http://www.alfresco.org/model/action/1.0" xmlns:rule="http://www.alfresco.org/model/rule/1.0" xmlns:fm="http://www.alfresco.org/model/forum/1.0" xmlns:app="http://www.alfresco.org/model/application/1.0" xmlns:usr="http://www.alfresco.org/model/user/1.0" xmlns:ver="http://www.alfresco.org/model/versionstore/1.0" xmlns:cm="http://www.alfresco.org/model/content/1.0" xmlns="" view:childName="cm:show_audit.ftl">
<view:aspects>
<cm:titled></cm:titled>