Merge branch 'ce2' into 'develop'

update cloud explorer to v2 (ce2) See merge request silexlabs/Silex!9
BalloonChamp · Oct 3, 2017 · 1b37277 · 1b37277
2 parents fef75e5 + 232fce4
commit 1b37277
Show file tree

Hide file tree

Showing 95 changed files with 2,569 additions and 9,896 deletions.
diff --git a/.gitmodules b/.gitmodules
diff --git a/.nvmrc b/.nvmrc
@@ -0,0 +1 @@
+6.2.2
diff --git a/.pm2.json b/.pm2.json
@@ -5,8 +5,10 @@
     "watch"       : "dist/server/",
     "env": {
       "NODE_ENV": "production",
-      "GITHUB_CLIENT_ID": "a173a2e4af98211d94c9",
-      "GITHUB_CLIENT_SECRET": "1fce6f8127611c44bafaa19c3843d890cbd479df"
+      "DROPBOX_CLIENT_ID": "ckixgyo62obeo05",
+      "DROPBOX_CLIENT_SECRET": "ptg6u5iw7gs6r6o",
+      "GITHUB_CLIENT_ID": "f124e4148bf9d633d58b",
+      "GITHUB_CLIENT_SECRET": "1a8fcb93d5d0786eb0a16d81e8c118ce03eefece"
     }
   }]
 }
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,9 @@
-FROM node:0.12
+FROM node:6.5.0
+
+# use test apps for localhost only
+# these can be overriden using the `-e` option in docker run
+ENV DROPBOX_CLIENT_ID=ckixgyo62obeo05 DROPBOX_CLIENT_SECRET=ptg6u5iw7gs6r6o GITHUB_CLIENT_ID=f124e4148bf9d633d58b GITHUB_CLIENT_SECRET=1a8fcb93d5d0786eb0a16d81e8c118ce03eefece
+# ENV ENABLE_FTP=true ENABLE_SFTP=true ENABLE_WEBDAV=true
 
 COPY . /silex
 WORKDIR /silex
@@ -10,3 +15,4 @@ RUN apt-get update \
 
 EXPOSE 6805
 CMD ["node", "dist/server/server.js"]
+
diff --git a/dist/client/libs/cloud-explorer/cloud-explorer.html b/dist/client/libs/cloud-explorer/cloud-explorer.html