Merge branch 'master' into feature/tl-preset

test/endtoend/url-plugin/test.js

@@ -17,7 +17,7 @@ describe('File upload with URL plugin', () => {
     browser.click('button.uppy-Url-importButton')
 
     // do the upload
-    browser.waitForVisible('.uppy-u-reset.uppy-c-btn.uppy-c-btn-primary.uppy-StatusBar-actionBtn--upload')
+    browser.waitForVisible('.uppy-u-reset.uppy-c-btn.uppy-c-btn-primary.uppy-StatusBar-actionBtn--upload', 10000)
     browser.click('.uppy-u-reset.uppy-c-btn.uppy-c-btn-primary.uppy-StatusBar-actionBtn--upload')
     browser.waitForExist('.uppy-StatusBar.is-complete', 20000)
   })

test/endtoend/wdio.base.conf.js

@@ -22,7 +22,8 @@ exports.config = {
 
   // Patterns to exclude.
   exclude: [
-    // 'path/to/excluded/files'
+    // 'test/endtoend/url-plugin/*',
+    'test/endtoend/transloadit/*'
   ],
 
   // Suites allows you to do `wdio config.js --suite $name` to run a subset of tests.

website/src/docs/index.md

@@ -6,7 +6,7 @@ alias: api/
 order: 0
 ---
 
-Uppy is a sleek and modular file uploader. It fetches files from local disk, Google Drive,Instagram, remote urls, cameras etc, and then uploads them to the final destination. It’s fast, easy to use and lets you worry about more important problems than building a file uploader.
+Uppy is a sleek and modular file uploader. It fetches files from local disk, Google Drive, Instagram, remote urls, cameras etc, and then uploads them to the final destination. It’s fast, easy to use and lets you worry about more important problems than building a file uploader.
 
 Uppy consists of a core module and [various plugins](/docs/plugins/) for selecting, manipulating and uploading files.