Commit Graph

8258 Commits

Author SHA1 Message Date
Victor Baranov f3e92139b8 Merge remote-tracking branch 'origin/develop' into copy-button 2018-09-10 21:20:11 +03:00
Victor Baranov bdbf01704d remove textarea-caret npm package 2018-09-10 21:14:32 +03:00
Victor Baranov 749e2eac0b Merge remote-tracking branch 'origin/develop' into remove-animation 2018-09-10 21:03:20 +03:00
Victor Baranov 95220d9449
Merge pull request #121 from poanetwork/ff-truncated-text
(Fix) FF truncated text in input
2018-09-10 21:00:27 +03:00
dennistikhomirov 6124283c0f e2e: tests icon copy 2018-09-10 10:44:07 -07:00
Victor Baranov 8f04ea31ec Merge remote-tracking branch 'origin/develop' into remove-animation 2018-09-10 20:41:13 +03:00
Victor Baranov cf58650843 merge with develop 2018-09-10 20:34:29 +03:00
Victor Baranov c7e18cab7e
Merge pull request #120 from poanetwork/tokens-account-switch-fix
(Feature) Update token's balance on account switch
2018-09-10 20:30:55 +03:00
Victor Baranov 36ec8cfd3b merge with develop 2018-09-10 20:15:33 +03:00
Victor Baranov 30ae2ed8dc
Merge pull request #119 from poanetwork/shapeshift-logo
(Fix) Shapeshift logo from local storage
2018-09-10 20:12:44 +03:00
Victor Baranov f791e8f255 Update e2e test of token addition 2018-09-10 19:58:01 +03:00
Victor Baranov 675ebb0b4e Merge remote-tracking branch 'origin/develop' into remove-animation 2018-09-10 19:44:17 +03:00
Victor Baranov 9ae4cbd26d Merge branch 'shapeshift-logo' of github.com:poanetwork/metamask-extension into shapeshift-logo 2018-09-10 19:42:32 +03:00
Victor Baranov a157b9837f merge with develop branch 2018-09-10 19:42:05 +03:00
Victor Baranov 471aef46a2
Merge branch 'develop' into copy-button 2018-09-10 19:21:29 +03:00
Victor Baranov b815a58723
Merge branch 'develop' into ff-truncated-text 2018-09-10 19:19:23 +03:00
Victor Baranov 1311baa25f
Merge branch 'develop' into tokens-account-switch-fix 2018-09-10 19:18:26 +03:00
Victor Baranov c75d99b7bf
Merge branch 'develop' into shapeshift-logo 2018-09-10 19:16:50 +03:00
Victor Baranov b294f920a9
Merge pull request #99 from poanetwork/validate-rpc
(Fix) Validate custom RPC
2018-09-10 19:13:15 +03:00
Victor Baranov 4ecb1a1635 remove top/bottom padding for large input, unify style for token addition inputs 2018-09-10 18:00:00 +03:00
Victor Baranov 351d4ede1a e2e test fix: clear decimals input before before inserting a number 2018-09-10 17:37:44 +03:00
Victor Baranov 5e0f43f2e0 Clear warning in config screen 2018-09-10 17:14:54 +03:00
Victor Baranov bab2156af5 FF truncated text in input 2018-09-10 15:45:27 +03:00
Victor Baranov 3a447a8f8b Update token's balance on account switch 2018-09-10 15:22:43 +03:00
Victor Baranov a5b07c72b3 Shapeshift logo from local storage 2018-09-10 13:59:29 +03:00
Victor Baranov c9865886b4
Merge pull request #116 from poanetwork/scrolls-fixes
(Fix) Firefox scrolls
2018-09-10 13:24:28 +03:00
Victor Baranov 22fa5a7c2e Typo 2018-09-10 13:23:46 +03:00
Victor Baranov d739af8d67 Display copy icon in FF 2018-09-10 13:16:50 +03:00
Victor Baranov b56a9f7d6f White icon for copy button 2018-09-10 13:02:25 +03:00
Victor Baranov a1825f8166 Merge remote-tracking branch 'origin/develop' into copy-button 2018-09-10 12:24:23 +03:00
Victor Baranov 673f6634e9 Firefox scrolls fixes 2018-09-10 12:14:04 +03:00
Victor Baranov 292d602e23 clear warning alert at successful RPC endpoint addition 2018-09-07 19:59:40 +03:00
Victor Baranov ba64b957ca
Merge branch 'develop' into validate-rpc 2018-09-07 19:19:50 +03:00
Victor Baranov 946bb78d8a
Merge pull request #98 from poanetwork/increase-amount-of-custom-rpc
(Feature) Unlimited amount of custom RPC endpoints
2018-09-07 19:17:16 +03:00
Victor Baranov 6a2be5698e Merge branch 'increase-amount-of-custom-rpc' of github.com:poanetwork/metamask-extension into increase-amount-of-custom-rpc 2018-09-07 19:00:14 +03:00
Victor Baranov 76ff9fb7de fix merging conflict 2018-09-07 18:59:34 +03:00
Victor Baranov 8951f16e0d
Merge branch 'develop' into increase-amount-of-custom-rpc 2018-09-07 18:44:46 +03:00
Victor Baranov bdb6a7cd66 The list of custom RPCs to the bottom of the list 2018-09-07 18:43:50 +03:00
Victor Baranov 07aa88be03
Merge pull request #108 from poanetwork/remove-icon-fix
(Fix) token remove icon displaying for Firefox
2018-09-07 15:36:52 +03:00
Victor Baranov 7e4b5f0b2d
Merge pull request #109 from dennis00010011b/e2e
fix e2e for firefox
2018-09-07 15:36:37 +03:00
dennistikhomirov 6154bd5f13 restore original circle config 2018-09-07 04:03:44 -07:00
dennistikhomirov e0b814f2e4 fix indendation 2018-09-07 04:02:14 -07:00
dennistikhomirov 20cae953ec unskip balance test 2018-09-07 03:40:07 -07:00
Victor Baranov bf24bed17c token remove icon fix for Firefox 2018-09-07 13:38:58 +03:00
dennistikhomirov 7fd4da12a9 lint fix 2018-09-07 03:20:58 -07:00
dennistikhomirov 71ed15714a update e2e 2018-09-07 02:12:49 -07:00
Victor Baranov af7919f39a merge with develop branch 2018-09-06 19:14:23 +03:00
Victor Baranov a3e049dd74
Merge pull request #104 from poanetwork/firefox-e2e-tests
(Feature) Support of Firefox
2018-09-06 18:54:51 +03:00
Victor Baranov 6517ea419d remove Import account test from Firefox: it doesn't work in Circle CI 2018-09-05 18:30:53 +03:00
Victor Baranov 6389f8f408 Remove changePassword e2e tests for Firefox: it doesn't work with the latest selenium-webdriver 2018-09-05 18:16:09 +03:00