Merge branch 'master' into conditional-cookie

transloadit · Feb 12, 2020 · d7b92cc · d7b92cc
2 parents c0c5b3e + 68639c2
commit d7b92cc
Show file tree

Hide file tree

Showing 75 changed files with 5,637 additions and 2,454 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,8 @@
+os: linux
+dist: bionic
 language: node_js
 
-# Addons configuration that can be referenced by each matrix entry,
+# Addons configuration that can be referenced by each `jobs` matrix entry,
 # this way we can easily enable Sauce Connect for end-to-end tests only.
 .apt: &APT
   sources:
@@ -16,7 +18,7 @@ language: node_js
     secure: OY3oWwiJghfty9wSPVvlhirvFGxPHDdIRuVkzAv6j7C/hj2BWYAP/UHrwdQ9XiYisHi/B5mGeyRVlrAf0MNGrG84rTDUbTWZbmktfuxl7A+Y6c0czk+s4SdhOiANG5b3tFl5wKq8h7uhrWH5/jWoKQ2Fz1VDCqxTvvZQbo41jSBhi7TBia626hxEePzdaiuw6HhGFZtfaoVs/FX30ylz8WDNrBjwCynjxsT52BaQrVvgEhuyzlOpI69YkZBPOq4fc3KiZ2YR43gLTx8K+sYCE9yJxdg1xT/UAawEhmedU83nyBZVo4rr7+03AixIxtI28MUCfBMlcsGwBxcKEKY/IWcp9UkPCq6+zALQoncV478tP21eYvlmxSFhYCrv+WEQlN+BcNjr4OJlmmFDbCVaF7r9qLeQPImU0+9iJU3OjrW7lpfLxORpGDEr2Nx6awKkIJCxNyK9weefeNo6Fz3V1kkyZ/7yWFeniJnRUCbahrB2XgzxIE+W307s1Qs4fm6JK7hVLTtG4fBzjChmAyGIzu744ws9WqmjvkC9D7OfnuXqanv/VcBFqPiudInerv7NL8FketUC+fxe/7XJfcxdaDGBjk8Kq7zXDohGRGymUXEoMDNJsKkMMlaKzdf7tgqdhsRJoH9NCVqrDXuG5al0UtrDP5RS7qfoxUunJmNFhlg=
   no_ssl_bump_domains: companion.test
 
-matrix:
+jobs:
   include:
     # Run e2e tests on branch builds, not PRs
     # Start this first because it takes a while, so it doesn't only start running after
@@ -120,12 +122,12 @@ notifications:
 # https://docs.travis-ci.com/user/deployment/#Conditional-Releases-with-on
 deploy:
 - provider: script
-  skip_cleanup: true
+  cleanup: false
   script: bin/travis-deploy
   on:
     branch: master
 - provider: script
-  skip_cleanup: true
+  cleanup: false
   script: bin/travis-deploy-companion
   on:
     branch: master
diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/README.md b/README.md
diff --git a/examples/cdn-example/index.html b/examples/cdn-example/index.html
@@ -4,11 +4,11 @@
     <title></title>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <link href="https://transloadit.edgly.net/releases/uppy/v1.8.0/uppy.min.css" rel="stylesheet">
+    <link href="https://transloadit.edgly.net/releases/uppy/v1.9.1/uppy.min.css" rel="stylesheet">
   </head>
   <body>
     <button id="uppyModalOpener">Open Modal</button>
-    <script src="https://transloadit.edgly.net/releases/uppy/v1.8.0/uppy.min.js"></script>
+    <script src="https://transloadit.edgly.net/releases/uppy/v1.9.1/uppy.min.js"></script>
     <script>
       const uppy = Uppy.Core({debug: true, autoProceed: false})
         .use(Uppy.Dashboard, { trigger: '#uppyModalOpener' })

diff --git a/examples/transloadit-textarea/index.html b/examples/transloadit-textarea/index.html
@@ -2,7 +2,7 @@
 <html>
   <head>
     <meta charset="utf-8">
-    <link rel="stylesheet" href="https://transloadit.edgly.net/releases/uppy/robodog/v1.4.2/robodog.css">
+    <link rel="stylesheet" href="https://transloadit.edgly.net/releases/uppy/robodog/v1.5.1/robodog.css">
     <style>
       body {
         font-family: Roboto, Open Sans;

diff --git a/examples/uppy-with-companion/client/index.html b/examples/uppy-with-companion/client/index.html
@@ -4,11 +4,11 @@
     <title></title>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <link href="https://transloadit.edgly.net/releases/uppy/v1.8.0/uppy.min.css" rel="stylesheet">
+    <link href="https://transloadit.edgly.net/releases/uppy/v1.9.1/uppy.min.css" rel="stylesheet">
   </head>
   <body>
     <button id="uppyModalOpener">Open Modal</button>
-    <script src="https://transloadit.edgly.net/releases/uppy/v1.8.0/uppy.min.js"></script>
+    <script src="https://transloadit.edgly.net/releases/uppy/v1.9.1/uppy.min.js"></script>
     <script>
       const uppy = Uppy.Core({debug: true, autoProceed: false})
         .use(Uppy.Dashboard, { trigger: '#uppyModalOpener' })