Commit Graph

8607 Commits

Author SHA1 Message Date
Victor Baranov 9c0b5661e2 upstream from MM 4.11.0 2018-10-19 18:18:48 +03:00
Victor Baranov f986286917 Merge remote-tracking branch 'origin/develop' into mm-4.9.3 2018-10-19 16:22:58 +03:00
Victor Baranov c1631f84dc some DeepScan suggestions 2018-10-19 16:22:05 +03:00
Victor Baranov 0984bdf22e NW@4.8.6 release 2018-10-18 18:59:12 +03:00
Victor Baranov 348e9d3f46 Updare POA network NFTs metadata 2018-10-18 18:40:12 +03:00
Victor Baranov c108c77c26 update tokens metadata repos 2018-10-18 18:05:18 +03:00
Victor Baranov ed9c2b662d upstream from develop branch 2018-10-18 17:26:28 +03:00
Victor Baranov c39ae3bf1f update changelog 2018-10-18 17:21:17 +03:00
Victor Baranov 81d885992c eslint fixes 2018-10-18 16:41:45 +03:00
Victor Baranov 6acc23371a main account page margin fix 2018-10-18 16:38:23 +03:00
Victor Baranov c8371dc442 update e2e tests 2018-10-18 16:30:25 +03:00
Victor Baranov 48f457f3ae upstream from mm 4.9.3 2018-10-18 15:52:58 +03:00
Victor Baranov 5f2d1d45d7 upgrade eth-sig-util 2018-10-18 13:10:43 +03:00
Victor Baranov 8af8ca0171 Upgrade dependencies 2018-10-18 13:03:03 +03:00
Victor Baranov f8197e05ea
Merge pull request #153 from poanetwork/dai-chain
(Feature) DAI chain support
2018-10-17 22:14:33 +03:00
Victor Baranov 8b5a4fa7b9 Merge remote-tracking branch 'origin/develop' into dai-chain 2018-10-17 12:07:35 +03:00
Victor Baranov 85e426e13d
Merge pull request #158 from dennis00010011b/e2e-dai-fix
e2e dai fix merging conflict
2018-10-17 11:48:48 +03:00
dennistikhomirov b94ef72831 lint fix 2018-10-16 20:13:19 -07:00
dennistikhomirov c662ab5713 e2e: dai-chain fix merging conflict 2018-10-16 20:09:36 -07:00
Victor Baranov 27dd7a4708
Merge pull request #149 from poanetwork/add-tokens-validation
(Fix) Add custom tokens validation
2018-10-16 18:32:41 +03:00
Victor Baranov 53b3802396 Merge remote-tracking branch 'origin/develop' into add-tokens-validation 2018-10-16 18:06:02 +03:00
Victor Baranov 37f84d27e0
Merge pull request #154 from dennis00010011b/e2e-dai
e2e-dai-chain
2018-10-12 21:24:10 +03:00
Victor Baranov 0072d82a83 update ticker 2018-10-12 20:35:18 +03:00
Victor Baranov accaaefe4e xDai chain 2018-10-12 20:18:07 +03:00
dennistikhomirov fe6095ca19 e2e:lint fix 2018-10-11 16:45:01 -07:00
dennistikhomirov e1794ab862 e2e:remove add custom token tests for avoid merging conflict after merge#149 2018-10-11 16:26:18 -07:00
dennistikhomirov 60e7432ea8 e2e:add dai network 2018-10-11 16:17:34 -07:00
Victor Baranov 05d57edcb0 Merge branch 'add-tokens-validation' of github.com:poanetwork/metamask-extension into add-tokens-validation 2018-10-11 23:06:29 +03:00
Victor Baranov 4c413dfd68 DeepScan suggestions were implemented 2018-10-11 23:06:03 +03:00
dennistikhomirov b947cc5f90 e2e: add dai chain tests 2018-10-11 13:04:17 -07:00
Victor Baranov 51ac2a0437 DAI chain support 2018-10-11 20:54:28 +03:00
Victor Baranov 7b73963fe5
Merge pull request #151 from dennis00010011b/e2e-add-token-validation
resolve merge conflict
2018-10-10 23:09:35 +03:00
dennistikhomirov de658ea073 resolve merge conflict 2018-10-03 07:46:21 -07:00
Victor Baranov 220b3579b8
Merge pull request #145 from poanetwork/tokens-send
(Feature) Transfer tokens
2018-10-03 15:01:28 +03:00
Victor Baranov 9e461d2cc4 merge with develop 2018-10-02 19:42:09 +03:00
Victor Baranov aece08a973 Merge remote-tracking branch 'origin/develop' into tokens-send 2018-10-02 19:39:38 +03:00
Victor Baranov 487a82399c
Merge pull request #142 from poanetwork/token-menu
(Feature) Token menu: view in explorer/copy/remove
2018-10-02 19:38:32 +03:00
Victor Baranov 6cf2b148c0 account menu position fix 2018-10-02 18:50:55 +03:00
Victor Baranov b1de13a2f9 Merge branch 'add-tokens-validation' of github.com:poanetwork/metamask-extension into add-tokens-validation 2018-10-02 18:02:17 +03:00
Victor Baranov 38554a7aa3 Merge remote-tracking branch 'origin/develop' into add-tokens-validation 2018-10-02 18:01:00 +03:00
Victor Baranov 65f9809f9b Merge remote-tracking branch 'origin/develop' into tokens-send 2018-10-02 18:00:11 +03:00
Victor Baranov c9efcd45b0 Merge remote-tracking branch 'origin/develop' into token-menu 2018-10-02 17:59:33 +03:00
Victor Baranov d4adec4d8c
Merge pull request #140 from poanetwork/search-POA-tokens
(Feature) Search tokens in POA network
2018-10-02 17:57:07 +03:00
Victor Baranov ad6cccbef1
Merge pull request #150 from dennis00010011b/e2e-add-token-validation
e2e add token validation
2018-10-01 15:15:18 +03:00
dennistikhomirov 113f9be143 e2e: can not add inexisted token to localhost 2018-10-01 03:45:14 -07:00
dennistikhomirov 6e35f6defa integration tests: fix first time add delay 2018-10-01 03:21:54 -07:00
dennistikhomirov ddbb606cde e2e: lint fix 2018-10-01 03:09:49 -07:00
dennistikhomirov d25badaf40 integration test: update add-token.js 2018-10-01 03:03:21 -07:00
dennistikhomirov 7b68fa50c5 e2e:custom token validation 2018-10-01 01:18:12 -07:00
Victor Baranov f837af2bac Merge branch 'tokens-send' of github.com:poanetwork/metamask-extension into tokens-send 2018-09-28 18:18:56 +03:00