1
0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00
Commit Graph

385 Commits

Author SHA1 Message Date
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
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
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
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
kumavis
d2d6f6a858 tests - integration - add mascara to integration test run 2017-09-15 12:20:43 -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
kumavis
114dae5f80 Merge branch 'master' of github.com:MetaMask/metamask-extension into filter-leak-fix3 2017-09-12 11:51:22 -07:00
kumavis
cafebb6417 Merge pull request #2073 from MetaMask/greenkeeper/babel-eslint-8.0.0
Update babel-eslint to the latest version 🚀
2017-09-12 11:50:47 -07:00
greenkeeper[bot]
985fb7b07c chore(package): update babel-eslint to version 8.0.0 2017-09-12 14:10:26 +00:00
kumavis
0e70366e9c test - integration - drop testem for karma 2017-09-11 22:29:40 -07:00
kumavis
e9daf0eb28 test - integration - remove redundant testem scripts 2017-09-11 22:26:47 -07:00
kumavis
ca035743c2 ci - dont attempt to submit coveralls if not configured 2017-09-11 22:25:46 -07:00
kumavis
671dafea9e Merge branch 'master' of github.com:MetaMask/metamask-extension into filter-leak-fix 2017-09-07 22:37:44 -07:00
kumavis
f5d0a0b07a deps - bump jsonrpc filters for log filter formate fix 2017-09-07 22:25:08 -07:00
kumavis
57e4805c62 streams - use pump and published obj-multiplex 2017-09-07 21:17:49 -07:00
kumavis
440a42bbc3 inpage - add idRemapMiddleware 2017-09-07 10:08:07 -07:00
Thomas Huang
33dfed15a6 Merge pull request #1897 from MetaMask/greenkeeper/sinon-3.2.0
Update sinon to the latest version 🚀
2017-09-01 12:05:08 -07:00
kumavis
cc56d0d2f6 inpage - use json-rpc-engine for inpage-provider 2017-08-24 15:44:40 -07:00
Dan Finlay
e0c35179c2 Merge pull request #1914 from MetaMask/history-diff
Move Tx State History to diff-based format
2017-08-18 13:14:17 -07:00
Dan Finlay
d7a34514b0 Fix token balance precision rendering
Fixes a bug where balances under 1 token could be mis-rendered by fixing it [here](https://github.com/MetaMask/eth-token-tracker/pull/9) then updating us to `eth-token-tracker@1.1.3`.

Fixes #1912
2017-08-17 14:53:08 -07:00
kumavis
fdffb6fedc introduce tx-state-history-helper and diff-based history 2017-08-14 18:46:04 -07:00
greenkeeper[bot]
a15599108e chore(package): update sinon to version 3.2.0 2017-08-10 14:35:53 +00:00
kumavis
fa6370c68a deps - bump ethjs-query 2017-08-09 16:18:38 -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
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
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