Merge branch 'v2.0'

diff --git a/skyquake/plugins/composer/src/src/components/filemanager/FileManager.jsx b/skyquake/plugins/composer/src/src/components/filemanager/FileManager.jsx
index 8702957..031c996 100644 (file)
--- a/skyquake/plugins/composer/src/src/components/filemanager/FileManager.jsx
+++ b/skyquake/plugins/composer/src/src/components/filemanager/FileManager.jsx
@@ -51,7 +51,7 @@ const ASSET_TYPE = {
         { id: 'SCRIPTS', folder: 'scripts', title: "scripts", allowFolders: true },
         { id: 'IMAGES', folder: 'images', title: "images", allowFolders: false },
         { id: 'CLOUD_INIT', folder: 'cloud_init', title: "cloud_init", allowFolders: false },
-        { id: 'README', folder: '.', title: ".", allowFolders: false }
+        { id: 'README', folder: '.', title: "readme", allowFolders: false }
     ]
 }
 

diff --git a/skyquake/plugins/launchpad/routes.js b/skyquake/plugins/launchpad/routes.js
index f9d6ce7..06ee5da 100644 (file)
--- a/skyquake/plugins/launchpad/routes.js
+++ b/skyquake/plugins/launchpad/routes.js
@@ -1,5 +1,5 @@
 /*
- * 
+ *
  *   Copyright 2016 RIFT.IO Inc
  *
  *   Licensed under the Apache License, Version 2.0 (the "License");
@@ -41,7 +41,7 @@ app.get('/api/nsr', cors(), function(req, res) {
         launchpadAPI['nsr'].delete(req).then(function(response) {
             utils.sendSuccessResponse(response, res);
         }, function(error) {
-            sendErrorResponse(error, res);
+            utils.sendErrorResponse(error, res);
         });
     });
     app.post('/api/nsr', cors(), function(req, res) {