Merge pull request #707 from silexlabs/develop

New backend, Unifile v1, CloudExplorer v2, better UX, Dropbox fix

.gitignore

@@ -18,3 +18,4 @@ dist/client/libs/prodotype*
 dist/client/functional-tests/publish
 dist/client/functional-tests/editable.html
 test/selenium-server-standalone-2.37.0.jar
+.vscode

.nvmrc

@@ -0,0 +1 @@
+6.2.2

.pm2.json

@@ -5,8 +5,12 @@
     "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",
+      "ENABLE_FTP": true,
+      "ENABLE_SFTP": true
     }
   }]
 }

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"]
+

dist/client/css/editable.css

@@ -60,7 +60,7 @@ this makes the video clickable:
   height:100%;
 }
 /* style while dragging */
-.dragging-pending.silex-selected {
+body .editable-style.dragging-pending.silex-selected {
   z-index: 99999;
   opacity: .75;
   position: absolute;