Merge pull request #185 from Cryptonomic/develop

Rollup merge
Cryptonomic · May 10, 2019 · 35c9db6 · 35c9db6
2 parents 5842f60 + ac06721
commit 35c9db6
Show file tree

Hide file tree

Showing 42 changed files with 2,108 additions and 1,811 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -46,13 +46,18 @@
   "dependencies": {
     "@material-ui/core": "^3.8.3",
     "@material-ui/icons": "^3.0.1",
-    "conseiljs": "^0.2.1",
+    "conseiljs": "git+https://github.com/Cryptonomic/ConseilJS.git#a39441ce0fbb7a3458e4271f75557ffb94892a2d",
     "moment": "^2.23.0",
+    "moment-timezone": "^0.5.25",
+    "rc-tooltip": "^3.7.3",
     "react": "^16.8.5",
+    "react-clipboard.js": "^2.0.7",
     "react-dom": "^16.8.5",
+    "react-moment": "^0.9.2",
     "react-redux": "^5.0.7",
     "react-router-dom": "^4.2.2",
     "react-router-redux": "^4.0.8",
+    "react-swipeable-views": "^0.13.1",
     "redux": "^4.0.0",
     "redux-devtools-extension": "^2.13.7",
     "redux-thunk": "^2.3.0",

diff --git a/resources/fonts/ArronaxIcons/arronax.eot b/resources/fonts/ArronaxIcons/arronax.eot
diff --git a/resources/fonts/ArronaxIcons/arronax.svg b/resources/fonts/ArronaxIcons/arronax.svg
diff --git a/resources/fonts/ArronaxIcons/arronax.ttf b/resources/fonts/ArronaxIcons/arronax.ttf
diff --git a/resources/fonts/ArronaxIcons/arronax.woff b/resources/fonts/ArronaxIcons/arronax.woff
diff --git a/resources/fonts/TezosIcons/Tezos-icons.eot b/resources/fonts/TezosIcons/Tezos-icons.eot