m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-11-24 02:58:09 +01:00
Code
2,104 Commits 2 Branches 0 Tags 265 MiB
460cbb985f
Commit Graph

2104 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Frankie
460cbb985f Fix the dissplay for submitted transactions and the listner wating to hear when tx's were included in a block 2017-01-18 11:24:53 -08:00
Frankie
86c0eaa5a4 Merge pull request #1002 from MetaMask/bug-submitTx 
handle tx finalization in controllers instead of provider-engine
 2017-01-14 22:51:13 -08:00
kumavis
85634326e8 test - clear localStorage on test start 2017-01-14 22:35:26 -08:00
kumavis
91e5cc0f29 test - clear localStorage in case CI caches it (?) 2017-01-14 22:30:12 -08:00
kumavis
993daebc4e test - txManager - add network to all txs 2017-01-14 22:09:19 -08:00
kumavis
3df9ce9809 tests - txManager - add getNetwork fn to fixture txManager 2017-01-14 21:52:09 -08:00
kumavis
ef81bde98b eth-store - emit update on new account add 2017-01-14 21:46:40 -08:00
kumavis
f49fb149cc background - txManager - filter txs by network 2017-01-14 21:29:46 -08:00
kumavis
c3d491a37c background - return txHash to provider-engine on done 2017-01-14 20:51:29 -08:00
Frankie
fdcf03f57d Fix the inclusion of the txFee in the meta tx object 2017-01-14 13:32:35 -08:00
Frankie
87505e1742 fix for linting 2017-01-13 18:01:50 -08:00
Frankie
580d93188c Satisfy review needs: 
removed unnecessary this.query = opts.query from constructor
Created a tx error state for errors in approveTransaction
validateTxParams has been moved to tx-utils
removed "value" arg from _setTxStatus
 2017-01-13 17:47:20 -08:00
Frankie
212ef0b850 fix the maxcost not being included in txMeta 2017-01-13 16:53:10 -08:00
kumavis
d06c54e0b7 Merge branch 'bug-submitTx' of github.com:MetaMask/metamask-plugin into bug-submitTx 2017-01-13 15:51:36 -08:00
kumavis
d755b66e20 background - metamask controller - fix 'this' ref 2017-01-13 15:51:08 -08:00
kumavis
9f162e72b4 Merge branch 'dev' into bug-submitTx 2017-01-13 13:26:57 -08:00
kumavis
c1253016fc Merge pull request #997 from MetaMask/integrateTxManagerUI 
Integrate tx manager ui
 2017-01-13 11:39:32 -08:00
Frankie
1ffaab1d9b Merge branch 'dev' into integrateTxManagerUI 2017-01-13 11:31:51 -08:00
Frankie
b72987405e remove orphaned comment 2017-01-13 11:30:58 -08:00
Frankie
c1656aff19 lint 2017-01-13 10:53:16 -08:00
Frankie
5ed52eed68 Clean up code 2017-01-13 10:44:22 -08:00
kumavis
29e83d71a8 background - handle tx finalization in controllers instead of provider-engine 2017-01-13 02:00:11 -08:00
kumavis
cc5e9aca4f Merge pull request #998 from MetaMask/i960-port-stream-err 
bugfix - portstream - dont wrap cb in try catch
 2017-01-11 19:29:15 -08:00
kumavis
65ba9fc39e bugfix - portstream - dont wrap cb in try catch 2017-01-11 19:09:49 -08:00
Frankie
34081c8cb2 Fix sorting and instances where something could be undefined 2017-01-11 17:02:57 -08:00
Frankie
f9efb0817d Merge branch 'dev' into integrateTxManagerUI 2017-01-11 16:07:03 -08:00
kumavis
b23a24f61d Merge pull request #996 from MetaMask/i981-UpdateOnAccountChange 
Send update to UI when changing selected account
 2017-01-11 15:47:00 -08:00
Frankie
576e2ad64d Fix wording and icon of failed txs 2017-01-11 15:44:21 -08:00
Dan Finlay
d87a7b2a76 Send update to UI when changing selected account 
Fixes #981
 2017-01-11 15:15:37 -08:00
Frankie
bbd2f2738b Add to CHANGELOG 2017-01-11 12:23:00 -08:00
Frankie
0b59dafc34 Merge branch 'dev' into integrateTxManagerUI 2017-01-11 12:17:17 -08:00
Frankie
0fae263a9a Take some of the tx Logic out of the UI and create a visble state for pending and unaproved transactions 2017-01-11 12:16:37 -08:00
Dan Finlay
479da07897 Merge pull request #990 from MetaMask/sync-accounts 
rpc - fix sync account cache setting
 2017-01-11 10:00:53 -08:00
kumavis
26e4ff40e1 rpc - fix sync account cache setting 2017-01-11 02:33:57 -08:00
kumavis
84445b01c4 Merge pull request #988 from MetaMask/eth_syncing 
web3 provider - override eth_syncing and web3_clientVersion
 2017-01-11 00:54:09 -08:00
kumavis
a9bdc76e40 changelog - add note on rpc overrides 2017-01-11 00:48:06 -08:00
kumavis
61637c738b web3 provider - override eth_syncing and web3_clientVersion 2017-01-11 00:46:44 -08:00
kumavis
766c2f5127 Merge pull request #987 from MetaMask/kumavis-patch-1 
deps - bump provider engine
 2017-01-10 23:55:05 -08:00
kumavis
f6900422d1 deps - bump provider engine 
addresses caching memory leak that can cause slow downs
 2017-01-10 23:35:24 -08:00
kumavis
d52c046288 Merge pull request #985 from MetaMask/gulp1 
Gulp - clean and add "disc" analysis task
 2017-01-10 15:55:22 -08:00
Dan Finlay
ff6e633e94 Merge branch 'dev' into gulp1 2017-01-10 15:38:07 -08:00
kumavis
2efcbd9674 gulp - fix brfs instrumentation 2017-01-10 15:33:00 -08:00
kumavis
0197d54bfc Merge pull request #986 from MetaMask/i947-BrowserSolidityError 
Fix browser solidity error
 2017-01-10 14:25:59 -08:00
Dan Finlay
55a55754d0 Bump changelog 2017-01-10 14:20:51 -08:00
Dan Finlay
21e2e4efd8 Remove erroneous OOG estimation logic. 2017-01-10 14:20:46 -08:00
kumavis
074e3f4ab4 gulp - cleanup comments 2017-01-10 13:56:31 -08:00
kumavis
8e3661555d gulp - add disc bundle analysis task 2017-01-10 13:46:15 -08:00
kumavis
464b7d5814 gulp - clean and simplify 2017-01-10 13:08:13 -08:00
Kevin Serrano
2dc87b4bd4 Merge pull request #983 from MetaMask/slim1 
deps - replace promise-request with fetch
 2017-01-10 12:46:06 -08:00
kumavis
bd382f4705 tests - add fetch polyfill 2017-01-10 12:39:01 -08:00