Merge branch 'master' into 82-chart-improvements

2018-08-16 14:46:08 +02:00
parent 28a5944a09 2883aaa879
commit af8c2c1401
16 changed files with 603 additions and 65 deletions
@@ -16,7 +16,9 @@
  },
  "dependencies": {
    "assert": "^1.4.1",
+    "csvtojson": "^2.0.8",
    "date-range": "0.0.2",
+    "isobject": "^3.0.1",
    "js-base64": "^2.4.8",
    "js-joda": "^1.8.2",
    "moment": "^2.22.1",
@@ -24,6 +26,8 @@
    "react": "16.4.1",
    "react-native": "^0.56.0",
    "react-native-calendars": "^1.19.3",
+    "react-native-document-picker": "^2.1.0",
+    "react-native-fs": "^2.10.14",
    "react-native-modal-datetime-picker-nevo": "^4.11.0",
    "react-native-share": "^1.1.0",
    "react-native-simple-radio-button": "^2.7.1",