Commit Graph

360 Commits

Author SHA1 Message Date
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
Chi Kei Chan 7eb6dae418 Added signTokenTx; Adding token confirmation screen 2017-09-12 02:22:23 -07:00
Chi Kei Chan 062e67bff8 Add buttons; handle back; add yarn.lock 2017-09-11 22:14:09 -07:00
Dan 5452a26b36 Fixes lint errors and adds stylelint-config-standard to package.json 2017-08-31 04:16:07 -07:00
sdtsui dbc539ac55 Merge remote-tracking branch 'mm/master' into NewUI-flat 2017-08-14 11:06:14 +02:00
sdtsui b8aa529d29 [WIP] Add packages and tasks for linting scss 2017-08-14 10:03:16 +02:00
kumavis fa6370c68a deps - bump ethjs-query 2017-08-09 16:18:38 -07:00
kumavis 0188e7b94d Merge branch 'master' into NewUI-flat 2017-08-08 23:30:58 -07:00
kumavis 6767430aa2 deps - bump watchify 2017-08-08 17:46:09 -07:00
kumavis 922ecb9149 Merge branch 'master' into greenkeeper/initial 2017-08-08 16:23:14 -07:00
frankiebee 88b84e3895 add json-rpc-engine && eth-json-rpc-middleware to devDependencies 2017-08-08 18:34:59 -04:00
sdtsui da51f56df9 Add dependencies and JSX support (reactify), for global modal implementation 2017-08-08 13:36:54 -07:00
frankiebee f3b42f1e33 Merge branch 'master' into transactionControllerRefractor 2017-08-07 16:24:58 -04:00
kumavis 78aa957e5a Merge branch 'master' of github.com:MetaMask/metamask-extension into greenkeeper/initial 2017-08-07 10:52:08 -07:00
sdtsui 5c7adc911d Merge branch 'NewUI' into feat/mm-ui-5-merged 2017-08-06 20:24:04 -07:00
sdtsui 02c2106c3b Merge branch 'master' into feat/mm-ui-5 2017-08-06 19:55:34 -07:00
sdtsui 3f222854e4 Migrate from css to scss + autoprefixer 2017-08-06 12:09:17 -07:00
kumavis a456baea8b Merge branch 'master' into NewUI 2017-08-05 00:29:10 -07:00
kumavis c62dad7248 blacklist - bump phishing detector 2017-08-04 14:11:40 -07:00
kumavis 1be8053cca blacklist - update phishing on boot and speed up polling to 4 min 2017-08-04 13:51:48 -07:00
sdtsui 4d967ebea9 Bring menu-droppo component into project, remove as a dependency 2017-08-04 11:47:36 -07:00
frankiebee 89a4fef1e4 Merge branch 'master' into transactionControllerRefractor 2017-08-04 14:45:22 -04:00
frankiebee cddff73703 bring your own BN 2017-08-04 14:42:13 -04:00
kumavis 5a9257208c Merge branch 'master' into NewUI 2017-08-03 21:02:01 -07:00
kumavis 55f0187df7 deps - update 2017-08-03 16:38:44 -07:00
kumavis 026f8592d8 deps - bump eth-detect-phishing 2017-08-03 15:59:01 -07:00
kumavis bb8a09375d Merge branch 'master' of github.com:MetaMask/metamask-extension into greenkeeper/initial 2017-08-03 15:12:24 -07:00
kumavis da16f39626 Merge branch 'master' of github.com:MetaMask/metamask-extension into greenkeeper/initial 2017-08-03 15:05:32 -07:00
kumavis d4877cb4e2 blacklist - use module eth-phishing-detect 2017-08-03 14:25:02 -07:00
Kevin Serrano 81982d01c0
Merge branch 'NewUI' of github.com:MetaMask/metamask-plugin into NewUI 2017-08-03 13:10:46 -07:00
kumavis 8a9d0073b1 Merge pull request #1848 from MetaMask/transactionControllerRefractor
Transaction controller refractor part 1: promises for everyone and more tests!
2017-08-02 19:57:16 -07:00
sdtsui 8a39ef03c2 Hook up css animation 2017-08-02 17:49:04 -07:00
kumavis ecaa235b5e phishing detection - move phishing detection into contentscript and metamask controller 2017-08-02 14:26:10 -07:00
sdtsui 96d3b2f35f Add dependejncy: react-burger-menu 2017-08-02 13:03:30 -07:00
frankiebee 25cffd21f8 Merge branch 'master' into transactionControllerRefractor 2017-08-02 11:41:29 -04:00
frankiebee 432f516ab0 make addUnapprovedTransaction async function and use promise based ethQuery 2017-08-02 10:26:25 -04:00
Dan Finlay f8cadbcb32 Merge branch 'master' into NewUI 2017-07-27 15:10:02 -07:00
Dan Finlay 33432afb0c Bump menu-droppo to 2.0.1 2017-07-27 09:14:52 -07:00
Kevin Serrano 66f6d5a4e0
Add levenshtein logic to blacklister. 2017-07-26 15:25:30 -07:00
sdtsui 4573753233 Bump version of menu-droppo, no longer needs css transitions 2017-07-26 12:29:56 -07:00
Dan Finlay 0ea6749dbc Lots of flex rearrangement on account detail view
Includes removal of ReactCssTransitionGroup for a simpler UI refactor.
2017-07-25 18:25:56 -07:00
kumavis a8525d4b17 Merge pull request #1816 from MetaMask/test-coverage
Test coverage
2017-07-25 17:46:23 -07:00
Thomas Huang eb15663497 One script runs for Ci build 2017-07-25 16:33:52 -07:00
kumavis 77d91ec36f prov-eng - bump to ignore json parse errors 2017-07-25 11:57:03 -07:00
Thomas Huang a1fab06490 Simplify the test-coverage script 2017-07-24 13:46:02 -07:00
Thomas Huang 24ffb40ec7 Add coveralls to script 2017-07-24 09:06:40 -07:00
Thomas Huang d571f5ee70 Add Test Coverage with nyc package and coveralls for github badge 2017-07-23 21:32:49 -07:00
Dan Finlay a41e5788cf Merge branch 'master' into NewUI 2017-07-20 12:39:06 -07:00
Dan Finlay dcf025782b Version 3.9.1 2017-07-19 12:24:32 -07:00