Merged V2.2 to HEAD

7575: Permission changes for AVM.
   7577: Incorporated most of the feedback provided by Kevin C earlier today
   7578: Removed directory not removed by patch
   7579: EmailServer bug fixes
         AR-1902:  Double posts when emailing to a document
         AR-1904:  Attachments via email should be allowed on forum posts
         AR-1903:  (Partial Fix) Text attachments should be treated the same way as other attachments 
   7583: Fixed WCM-961 & WCM-962: Added confirm dialog for 'Delete All Deployment Reports' and 'Release Server' actions


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8434 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2008-03-06 14:43:55 +00:00
parent a9fac10b45
commit a49bfd311d
89 changed files with 21301 additions and 11139 deletions

View File

@@ -232,7 +232,6 @@
</property>
</bean>
<bean id="userUsageTrackingComponent" class="org.alfresco.repo.usage.UserUsageTrackingComponent">
<property name="nodeDaoService">
<ref bean="nodeDaoService"/>
@@ -326,4 +325,9 @@
</bean>
<!-- There is a job available to purge old deploymentattempt nodes -->
<!-- from the repository. The maximum age of the node can be configured. -->
<!-- See the wiki (http://wiki.alfresco.com/wikiDeployment) for details -->
<!-- and the deployment-attempt-cleaner-context.xml.sample file. -->
</beans>