Merge branch 'master' of https://github.com/transloadit/uppy into master

website/src/examples/dashboard/app.es6

@@ -8,7 +8,7 @@ const Instagram = require('@uppy/instagram')
 const Facebook = require('@uppy/facebook')
 const OneDrive = require('@uppy/onedrive')
 const Zoom = require('@uppy/zoom')
-const Box = require('@uppy/box')
+// const Box = require('@uppy/box')
 const ImageEditor = require('@uppy/image-editor')
 const Url = require('@uppy/url')
 const Webcam = require('@uppy/webcam')
@@ -150,13 +150,13 @@ function uppySetOptions () {
     window.uppy.removePlugin(zoomInstance)
   }
 
-//   const boxInstance = window.uppy.getPlugin('Box')
-//   if (opts.Box && !boxInstance) {
-//     window.uppy.use(Box, { target: Dashboard, companionUrl: COMPANION })
-//   }
-//   if (!opts.Box && boxInstance) {
-//     window.uppy.removePlugin(boxInstance)
-//   }
+  //   const boxInstance = window.uppy.getPlugin('Box')
+  //   if (opts.Box && !boxInstance) {
+  //     window.uppy.use(Box, { target: Dashboard, companionUrl: COMPANION })
+  //   }
+  //   if (!opts.Box && boxInstance) {
+  //     window.uppy.removePlugin(boxInstance)
+  //   }
 
   const webcamInstance = window.uppy.getPlugin('Webcam')
   if (opts.Webcam && !webcamInstance) {

website/src/examples/dashboard/app.html

@@ -47,7 +47,7 @@
     ScreenCapture: document.querySelector('#opts-ScreenCapture'),
     GoogleDrive: document.querySelector('#opts-GoogleDrive'),
     Dropbox: document.querySelector('#opts-Dropbox'),
-    Box: document.querySelector('#opts-Box'),
+    // Box: document.querySelector('#opts-Box'),
     Instagram: document.querySelector('#opts-Instagram'),
     Facebook: document.querySelector('#opts-Facebook'),
     OneDrive: document.querySelector('#opts-OneDrive'),
@@ -69,7 +69,7 @@
     GoogleDrive: true,
     Instagram: true,
     Dropbox: true,
-    Box: true,
+    // Box: true,
     OneDrive: true,
     Facebook: false,
     Url: true,