Просмотр исходного кода

Merge remote-tracking branch 'upstream/master' into tweak-dashed-border

Alexander Zaytsev 6 лет назад
Родитель
Сommit
b0bc744ca9

+ 5 - 0
examples/react-native-expo/package-lock.json

@@ -918,6 +918,11 @@
         "preact": "^8.2.9"
         "preact": "^8.2.9"
       }
       }
     },
     },
+    "@uppy/react-native": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/@uppy/react-native/-/react-native-0.0.2.tgz",
+      "integrity": "sha512-TBjhJXUqtsnse9m0HrDm4rbhwuf9PE/vSzYJlAF+2zmQSnHj0UeNLQbd8ZcNvidF3Y8BYOjaMy9aq6VsR8eCyg=="
+    },
     "@uppy/status-bar": {
     "@uppy/status-bar": {
       "version": "0.30.4",
       "version": "0.30.4",
       "resolved": "https://registry.npmjs.org/@uppy/status-bar/-/status-bar-0.30.4.tgz",
       "resolved": "https://registry.npmjs.org/@uppy/status-bar/-/status-bar-0.30.4.tgz",

+ 1 - 0
examples/react-native-expo/package.json

@@ -10,6 +10,7 @@
     "@uppy/core": "^0.30.4",
     "@uppy/core": "^0.30.4",
     "@uppy/dashboard": "^0.30.4",
     "@uppy/dashboard": "^0.30.4",
     "@uppy/instagram": "^0.30.4",
     "@uppy/instagram": "^0.30.4",
+    "@uppy/react-native": "0.0.2",
     "@uppy/tus": "^0.30.4",
     "@uppy/tus": "^0.30.4",
     "@uppy/url": "^0.30.4",
     "@uppy/url": "^0.30.4",
     "@uppy/xhr-upload": "^0.30.4",
     "@uppy/xhr-upload": "^0.30.4",

+ 1 - 1
packages/@uppy/locales/package.json

@@ -1,6 +1,6 @@
 {
 {
   "name": "@uppy/locales",
   "name": "@uppy/locales",
-  "description": "",
+  "description": "Uppy language packs",
   "version": "0.30.4",
   "version": "0.30.4",
   "license": "MIT",
   "license": "MIT",
   "keywords": [
   "keywords": [

+ 1 - 0
packages/@uppy/locales/src/en_US.js

@@ -27,6 +27,7 @@ en_US.strings = {
   dataUploadedOfTotal: '%{complete} of %{total}',
   dataUploadedOfTotal: '%{complete} of %{total}',
   done: 'Done',
   done: 'Done',
   dropHereOr: 'Drop files here or %{browse}',
   dropHereOr: 'Drop files here or %{browse}',
+  dropHint: 'Drop your files here',
   dropPaste: 'Drop files here, paste or %{browse}',
   dropPaste: 'Drop files here, paste or %{browse}',
   dropPasteImport: 'Drop files here, paste, %{browse} or import from',
   dropPasteImport: 'Drop files here, paste, %{browse} or import from',
   edit: 'Edit',
   edit: 'Edit',