Skip to content

Commit 544ab3a

Browse files
Merge pull request #348 from Adamant-im/stage
Stage
2 parents be43620 + 87f3f93 commit 544ab3a

File tree

177 files changed

+5360
-4036
lines changed

Some content is hidden

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

177 files changed

+5360
-4036
lines changed

.eslintignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
tests/
2+
__tests__/

package.json

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "adamant-im",
3-
"version": "2.0.0-alpha",
3+
"version": "2.0.1",
44
"private": true,
55
"scripts": {
66
"serve": "vue-cli-service serve",
@@ -17,26 +17,28 @@
1717
"dependencies": {
1818
"@mdi/font": "^2.6.95",
1919
"@stablelib/utf8": "^0.10.1",
20+
"@zxing/library": "^0.12.3",
2021
"abi-decoder": "^1.2.0",
2122
"axios": "^0.18.0",
2223
"b64-to-blob": "^1.2.19",
2324
"bignumber.js": "^8.0.1",
25+
"bip39": "^3.0.1",
2426
"bitcoinjs-lib": "^4.0.2",
25-
"bitcore-mnemonic": "^1.2.5",
2627
"bytebuffer": "^5.0.1",
2728
"coininfo": "^4.3.0",
29+
"core-js": "^3.0.1",
30+
"dayjs": "^1.8.11",
2831
"deepmerge": "^2.1.1",
2932
"ed2curve": "^0.2.1",
3033
"ethereumjs-tx": "^1.3.7",
3134
"ethereumjs-util": "^5.2.0",
3235
"file-saver": "^1.3.8",
3336
"hdkey": "^0.8.0",
3437
"idb": "^3.0.2",
35-
"instascan": "git+https://github.com/schmich/instascan.git#master",
3638
"js-base64": "^2.5.0",
3739
"js-md5": "^0.7.3",
3840
"lodash": "^4.17.11",
39-
"moment": "^2.22.2",
41+
"marked": "^0.6.1",
4042
"notifyjs": "^3.0.0",
4143
"promise-queue": "^2.2.3",
4244
"qrcode": "^1.3.2",
@@ -51,11 +53,9 @@
5153
"visibilityjs": "^2.0.2",
5254
"vue": "^2.5.17",
5355
"vue-i18n": "^8.0.0",
54-
"vue-material": "^0.8.1",
55-
"vue-qrcode-reader": "^1.3.3",
5656
"vue-router": "^3.0.1",
5757
"vue-scrollto": "^2.11.0",
58-
"vuetify": "1.4.1",
58+
"vuetify": "^1.5.16",
5959
"vuex": "^3.0.1",
6060
"vuex-persist": "^2.0.0",
6161
"web3": "0.20.6"
@@ -76,7 +76,6 @@
7676
"cross-env": "^5.2.0",
7777
"electron": "^3.0.0",
7878
"lorem-ipsum": "^1.0.6",
79-
"moment-timezone": "^0.5.23",
8079
"sinon": "^7.2.2",
8180
"stylus": "^0.54.5",
8281
"stylus-loader": "^3.0.2",
@@ -86,7 +85,7 @@
8685
"vue-cli-plugin-vuetify": "^0.4.5",
8786
"vue-cli-plugin-webpack-bundle-analyzer": "^1.2.0",
8887
"vue-template-compiler": "^2.5.17",
89-
"vuetify-loader": "^1.1.1"
88+
"vuetify-loader": "^1.2.2"
9089
},
9190
"eslintConfig": {
9291
"root": true,

public/fonts/Roboto.css

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

public/fonts/Roboto_300_normal.ttf

-20.6 KB
Binary file not shown.
-19.4 KB
Binary file not shown.

public/fonts/Roboto_400_italic.ttf

-22.1 KB
Binary file not shown.
-21 KB
Binary file not shown.

0 commit comments

Comments
 (0)