Skip to content
This repository was archived by the owner on Mar 16, 2019. It is now read-only.

Commit 9658ea1

Browse files
committed
Merge branch 'master' into 0.10.0
2 parents 27c8d8d + 9bec045 commit 9658ea1

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+1112
-812
lines changed

.github/PULL_REQUEST_TEMPLATE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Thank you for making a pull request ! Just a gentle reminder :)
22

33
1. If the PR is offering a feature please make the request to our "Feature Branch" 0.10.0
4-
2. Bug fix request to "Bug Fix Branch" 0.9.2
4+
2. Bug fix request to "Bug Fix Branch" 0.9.4
55
3. Correct README.md can directly to master

CONTRIBUTORS.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,18 @@
1+
12
Dmitry Petukhov <[email protected]>
3+
24
Erik Smartt <[email protected]>
5+
36
Evgeniy Baraniuk <[email protected]>
7+
48
Juan B. Rodriguez <[email protected]>
9+
510
11+
612
Nguyen Cao Nhat Linh <[email protected]>
7-
Tim Suchanek <[email protected]>
13+
814
15+
916
francisco-sanchez-molina <[email protected]>
17+
1018

README.md

Lines changed: 69 additions & 88 deletions
Large diffs are not rendered by default.

img/ios-1.png

203 KB
Loading

img/ios-2.png

256 KB
Loading

img/ios-3.png

160 KB
Loading

img/ios-4.png

83.4 KB
Loading

img/ios-5.png

148 KB
Loading

scripts/test.sh

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,7 @@ cd "${TEST_APP_PATH}"
4141
npm install --save react-native-fetch-blob
4242
# libs that requires web API polyfills
4343
npm install --save firebase
44-
# libs that requires Node polyfills
45-
npm install --save oboe
46-
47-
rnpm link
44+
react-native link
4845

4946
# copy android assets
5047
cd ${CWD}

src/android.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ const RNFetchBlob:RNFetchBlobNative = NativeModules.RNFetchBlob
1818
* @param {string} mime MIME type string
1919
* @return {Promise}
2020
*/
21-
function actionViewIntent(path:string, mime = 'text/plain':string) {
21+
function actionViewIntent(path:string, mime:string = 'text/plain') {
2222
if(Platform.OS === 'android')
2323
return RNFetchBlob.actionViewIntent(path, mime)
2424
else

0 commit comments

Comments
 (0)