Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)

75134: Merged BRANCHES/DEV/KEVINR3 to BRANCHES/DEV/HEAD-BUG-FIX
      71905: Merged BRANCHES/DEV/KEVINR2 to BRANCHES/DEV/KEVINR3
         71779: Activities prototype - PDF Previewer link to original PDF correction
         71776: Activities prototype - Slingshot download urls for Image Preview dashlet and PDF Previewer components.
         71752: Activities prototype - Added activity feed items for Preview and Download actions
      71913: Activities prototype - styling and UX
      72000: Activities prototype - improved CSS
      73462: Activities prototype - CSS tweaks
      75128: Activities prototype - CSS tweaks


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77438 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Mark Rogers
2014-07-22 12:15:29 +00:00
parent 5f57f29e93
commit c166849c87
5 changed files with 131 additions and 0 deletions

View File

@@ -2060,4 +2060,10 @@
</property>
</bean>
<!-- Share Content Download - post of an Activity before performing a Site download action -->
<bean id="webscript.org.alfresco.slingshot.download.get" class="org.alfresco.slingshot.web.scripts.SlingshotContentGet" parent="webscript.org.alfresco.cmis.content.get">
<property name="siteService" ref="SiteService" />
<property name="activityService" ref="activityService" />
</bean>
</beans>