Commit Graph

423 Commits

Author SHA1 Message Date
Dan 7ec77e0b45 Refactor amount input: dynamic input width with vanilla js. 2017-10-12 11:09:05 -07:00
Dan ea7926c211 Adds amount and gas field to sendV2. 2017-10-12 11:09:05 -07:00
Chi Kei Chan bd99bc2e88 Merge branch 'master' into NewUI-flat 2017-10-03 16:02:58 -07:00
Thomas Huang f12504cd09 Merge pull request #2209 from MetaMask/greenkeeper/coveralls-3.0.0
Update coveralls to the latest version 🚀
2017-10-03 12:35:25 -07:00
greenkeeper[bot] 98641f6f66 chore(package): update mocha to version 4.0.0 2017-10-03 04:33:04 +00:00
kumavis e682611301 deps - bump pe for block cache fix 2017-10-02 11:35:26 -07:00
Chi Kei Chan 67ee5b21e6 Query for gas estimates 2017-09-28 17:39:53 -07:00
greenkeeper[bot] f69cf1670f chore(package): update coveralls to version 3.0.0 2017-09-28 17:02:58 +00:00
Chi Kei Chan 5a1d50cd43 Merge branch 'master' into mmn 2017-09-27 22:32:07 -07:00
kumavis cdf41c2857 Merge pull request #2124 from MetaMask/breakout-mascara
require metamascara
2017-09-27 16:27:01 -07:00
Dan Finlay 112c223930 Merge pull request #2196 from MetaMask/express-bump
deps - bump express for security fix
2017-09-27 15:26:53 -07:00
kumavis cd0f44e2d6 deps - bump express for security fix 2017-09-27 14:59:10 -07:00
greenkeeper[bot] c0d7d44764 fix(package): update eth-keyring-controller to version 2.0.0 2017-09-27 21:54:46 +00:00
Dan Finlay e72083f6e8 Merge branch 'master' into filter-fixes-moar 2017-09-27 10:57:02 -07:00
kumavis 1877c0766c Merge branch 'master' of github.com:MetaMask/metamask-extension into BreakOutKeyringController 2017-09-26 21:42:30 -07:00
Thomas Huang d135c3c9ca Merge pull request #2174 from MetaMask/i2162-TokenPrecision
Fix token precision bug
2017-09-26 11:32:32 -07:00
Dan Finlay b46cb3ecb5 Fix token precision bug
Had fixed this before in the dependency, but hadn't merged in that version bump yet :(

Fixes #2162
2017-09-26 09:25:04 -07:00
greenkeeper[bot] e52d52b22e chore(package): update sinon to version 4.0.0 2017-09-26 08:22:48 +00:00
frankiebee 4979f5902f bump metamascara version 2017-09-22 20:04:58 -07:00
kumavis 8ad74cf93a deps - bump filter deps and add random missing deps 2017-09-22 15:16:42 -07:00
Dan Finlay 443b1a8eb7 Remove keyring controller from project 2017-09-22 14:38:40 -07:00
kumavis 15195bca75 deps - bump provider engine for block tracker 2017-09-22 14:20:44 -07:00
kumavis 2ca2df1832 deps - bump eth-block-tracker 2017-09-22 13:58:46 -07:00
Dan Finlay e9b7fd9018 Patch security update 2017-09-22 10:41:14 -07:00
Chi Kei Chan 0204aa2001 Add Add Token UI; Add Fuzzy search for tokens 2017-09-19 21:18:36 -07:00
frankiebee 418f01411e mascara: turn off background 2017-09-19 16:48:42 -07:00
frankiebee daeb7f6ad3 update metamascara 2017-09-19 12:58:51 -07:00
kumavis 77e02d264a Merge branch 'master' of github.com:MetaMask/metamask-plugin into json-rpc-engine-bump 2017-09-19 11:27:49 -07:00
kumavis b979c6a2f3 deps - bump json-rpc-middleware-stream 2017-09-19 11:22:55 -07:00
kumavis d2ded61cc9 deps - bump json-rpc-engine 2017-09-19 10:54:41 -07:00
frankiebee 90482934f1 Merge branch 'master' into breakout-mascara 2017-09-19 10:45:51 -07:00
frankiebee 29dd81d029 require metamascara 2017-09-18 19:08:02 -07:00
Chi Kei Chan a67d3ecd46 Merge branch 'master' into NewUI-flat 2017-09-18 18:13:15 -07:00
Frankie 6204afb156 Merge pull request #2119 from MetaMask/mascara-tests2
tests - integration - re-add mascara to normal run
2017-09-18 14:33:40 -07:00
kumavis eaa85f283d tests - integration - re-add mascara to normal run 2017-09-18 13:17:08 -07:00
Frankie bbae8d975e Merge pull request #2098 from MetaMask/mascara-tests
Integration test suite improvements
2017-09-18 12:54:39 -07:00
kumavis 784510f89f tests - integration - remove failing mascara integration tests from normal run until fixed 2017-09-18 12:31:44 -07:00
Chi Kei Chan 6c5865d564 Merge branch 'master' into nm 2017-09-18 11:28:10 -07:00
kumavis d2d6f6a858 tests - integration - add mascara to integration test run 2017-09-15 12:20:43 -07:00
Chi Kei Chan d722c1045f Update yarn.lock; Fix tx-list-item overflow; Fix gas exchange rate 2017-09-13 19:57:33 -07:00
kumavis 610f09262d tests - refactor and rename npm scripts 2017-09-13 17:17:09 -07:00
kumavis cbff5fd450 tests - mascara - move temp build files into dist/mascara 2017-09-13 16:52:38 -07:00
kumavis 56db3999ad tests - start migrating mascara tests to karma 2017-09-13 16:45:31 -07:00
kumavis dd90e8e364 tests - break out coveralls npm script 2017-09-13 16:04:48 -07:00
kumavis 245c0f0c27 metamask controller - move middleware into seperate files 2017-09-13 15:17:26 -07:00
Dan 6fa1cd6225 Reapply conversion utility changes and fix calls to utility in pending-tx. 2017-09-13 14:22:30 -07:00
Chi Kei Chan 8b5f2a95df Improve styling in Confirmation Screen; Show decoded send token data 2017-09-12 23:04:01 -07:00
Chi Kei Chan b64471833f Revert "Overhaul currency conversion utility and update calls to utility in pending-tx."
This reverts commit 080890a46e.
2017-09-12 23:04:01 -07:00
Dan 080890a46e Overhaul currency conversion utility and update calls to utility in pending-tx. 2017-09-12 16:05:59 -07:00
kumavis 114dae5f80 Merge branch 'master' of github.com:MetaMask/metamask-extension into filter-leak-fix3 2017-09-12 11:51:22 -07:00