Merge branch 'development' into css

This commit is contained in:
XhmikosR
2020-02-01 16:46:57 +02:00
committed by GitHub
2 changed files with 977 additions and 926 deletions
+972 -921
View File
File diff suppressed because it is too large Load Diff
+5 -5
View File
@@ -8,10 +8,10 @@
"@types/enzyme": "^3.10.4",
"@types/enzyme-adapter-react-16": "^1.0.5",
"@types/fetch-mock": "^7.3.2",
"@types/jest": "^25.1.0",
"@types/jest": "^25.1.1",
"@types/lodash.debounce": "^4.0.6",
"@types/lodash.isequal": "^4.5.5",
"@types/node": "^13.5.0",
"@types/node": "^13.7.0",
"@types/react": "^16.9.19",
"@types/react-bootstrap-daterangepicker": "0.0.26",
"@types/react-bootstrap-typeahead": "^3.4.5",
@@ -21,7 +21,7 @@
"@types/react-table": "^6.8.5",
"@types/reactstrap": "^8.4.1",
"@types/sha.js": "^2.4.0",
"codecov": "^3.6.2",
"codecov": "^3.6.4",
"enzyme": "^3.11.0",
"enzyme-adapter-react-16": "^1.15.2",
"faker": "^4.1.0",
@@ -33,7 +33,7 @@
"node-fetch": "^2.6.0",
"node-sass": "^4.13.1",
"prettier": "^1.19.1",
"react-scripts": "^3.3.0",
"react-scripts": "^3.3.1",
"redux-saga-test-plan": "^4.0.0-rc.3",
"typescript": "^3.7.5"
},
@@ -52,7 +52,7 @@
"moment": "^2.24.0",
"prop-types": "^15.7.2",
"react": "^16.12.0",
"react-app-polyfill": "^1.0.5",
"react-app-polyfill": "^1.0.6",
"react-bootstrap-daterangepicker": "^4.1.0",
"react-bootstrap-typeahead": "^3.4.7",
"react-chartjs-2": "^2.9.0",