Skip to content

Commit 4fafc5d

Browse files
committed
Merge branch 'new_landing_design' into 'master'
new_landing_design See merge request open-platform/api!212
2 parents 08de820 + b8ab7ee commit 4fafc5d

24 files changed

Lines changed: 868 additions & 19983 deletions

frontend/package-lock.json

Lines changed: 0 additions & 13325 deletions
This file was deleted.

frontend/package.json

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,21 +16,22 @@
1616
"ethjs-unit": "^0.1.6",
1717
"ethjs-util": "^0.1.6",
1818
"moment": "^2.22.2",
19+
"node-gyp": "^4.0.0",
1920
"react": "^16.4.1",
2021
"react-copy-to-clipboard": "^5.0.1",
2122
"react-dates": "^17.0.0",
2223
"react-dom": "^16.4.1",
2324
"react-redux": "^5.0.5",
2425
"react-router-dom": "^4.1.1",
25-
"react-scripts": "^1.1.4",
26+
"react-scripts": "^3.0.1",
2627
"react-semantic-redux-form": "^1.2.6",
2728
"react-table": "^6.8.6",
2829
"redux": "^3.7.1",
2930
"redux-form": "^7.0.1",
3031
"redux-thunk": "^2.2.0",
3132
"semantic-ui-react": "^0.81.3",
3233
"styled-components": "^3.3.3",
33-
"web3": "^1.0.0-beta.34",
34+
"web3": "^1.0.0-beta.55",
3435
"websocket": "^1.0.26"
3536
},
3637
"scripts": {
@@ -40,6 +41,18 @@
4041
"eject": "react-scripts eject"
4142
},
4243
"devDependencies": {
43-
"lodash": "^4.17.10"
44+
"lodash": "^4.17.11"
45+
},
46+
"browserslist": {
47+
"production": [
48+
">0.2%",
49+
"not dead",
50+
"not op_mini all"
51+
],
52+
"development": [
53+
"last 1 chrome version",
54+
"last 1 firefox version",
55+
"last 1 safari version"
56+
]
4457
}
4558
}
788 Bytes
Loading
985 Bytes
Loading
932 Bytes
Loading
97.6 KB
Loading
178 KB
Loading
Lines changed: 3 additions & 0 deletions
Loading
40.8 KB
Loading
Lines changed: 15 additions & 0 deletions
Loading

0 commit comments

Comments
 (0)