inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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 4d1141c27f
commit 0b2efd4d2c
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/java/org/alfresco/repo/jscript/app/JSONConversionComponent.java
View File

@@ -64,7 +64,7 @@ import org.springframework.extensions.surf.util.URLEncoder;
public class JSONConversionComponent public class JSONConversionComponent
{ {
/** Content download API URL template */ /** Content download API URL template */
private final static String CONTENT_DOWNLOAD_API_URL = "/api/node/content/{0}/{1}/{2}/{3}"; private final static String CONTENT_DOWNLOAD_API_URL = "/slingshot/node/content/{0}/{1}/{2}/{3}";
/** Logger */ /** Logger */
private static Log logger = LogFactory.getLog(JSONConversionComponent.class); private static Log logger = LogFactory.getLog(JSONConversionComponent.class);