Commit Graph

2242 Commits (e9cdbf4f89085cc6c31991416eaac7ca91f9c1d4)
 

Author SHA1 Message Date
kumavis 0af48b6dce Merge branch 'master' into FixManifest 8 years ago
Dan Finlay 5de6eaf35d Fix manifest version 8 years ago
kumavis ee62a6a391 Merge pull request #1005 from MetaMask/dev 8 years ago
Dan Finlay 88fabdd2de Merge pull request #1008 from MetaMask/Version-3.0.0 8 years ago
Dan Finlay 9203b8c305 Version 3.0.0 8 years ago
Dan Finlay c05b783466 Merge pull request #1007 from MetaMask/simple-keystore-fix 8 years ago
kumavis 053066b57f Merge branch 'dev' into simple-keystore-fix 8 years ago
kumavis 4a09f856d1 test - keyring - simple - fix fixture data 8 years ago
kumavis 82012cbbce keyring - simple - throw error if wallet not found for address 8 years ago
kumavis e7cf0f4bdd keyring - simple - fix address generation 8 years ago
Dan Finlay ac6a2b4b61 Bump changelog to mention BIP44 fix 8 years ago
Dan Finlay 5dd5619e5d Merge branch 'master' into dev 8 years ago
Dan Finlay 15e91f823c Merge pull request #1004 from MetaMask/doubleRenderIssue 8 years ago
Frankie 83468cbd03 add to CHANGELOG 8 years ago
Frankie 6481f9ced4 Dont render conf-tx if their are no txParams to show 8 years ago
Frankie 86c0eaa5a4 Merge pull request #1002 from MetaMask/bug-submitTx 8 years ago
kumavis 85634326e8 test - clear localStorage on test start 8 years ago
kumavis 91e5cc0f29 test - clear localStorage in case CI caches it (?) 8 years ago
kumavis 993daebc4e test - txManager - add network to all txs 8 years ago
kumavis 3df9ce9809 tests - txManager - add getNetwork fn to fixture txManager 8 years ago
kumavis ef81bde98b eth-store - emit update on new account add 8 years ago
kumavis f49fb149cc background - txManager - filter txs by network 8 years ago
kumavis c3d491a37c background - return txHash to provider-engine on done 8 years ago
Frankie fdcf03f57d Fix the inclusion of the txFee in the meta tx object 8 years ago
Frankie 87505e1742 fix for linting 8 years ago
Frankie 580d93188c Satisfy review needs: 8 years ago
Frankie 212ef0b850 fix the maxcost not being included in txMeta 8 years ago
kumavis d06c54e0b7 Merge branch 'bug-submitTx' of github.com:MetaMask/metamask-plugin into bug-submitTx 8 years ago
kumavis d755b66e20 background - metamask controller - fix 'this' ref 8 years ago
kumavis 9f162e72b4 Merge branch 'dev' into bug-submitTx 8 years ago
kumavis c1253016fc Merge pull request #997 from MetaMask/integrateTxManagerUI 8 years ago
Frankie 1ffaab1d9b Merge branch 'dev' into integrateTxManagerUI 8 years ago
Frankie b72987405e remove orphaned comment 8 years ago
Frankie c1656aff19 lint 8 years ago
Frankie 5ed52eed68 Clean up code 8 years ago
kumavis 29e83d71a8 background - handle tx finalization in controllers instead of provider-engine 8 years ago
kumavis bc1615f032 background - fix metamaskController store -> diskStore persistence 8 years ago
kumavis 80514d73b5 migrations - wip - 005 multivault migration 8 years ago
kumavis b33c51c0a6 migrations - introduce promise-based migrator 8 years ago
kumavis 3bc996878b background - move pojo migrator to outside of metamask controller 8 years ago
kumavis 2019c02fc0 test - fix tests from obs-store 8 years ago
kumavis 8012ede126 background - introduce ObservableStore 8 years ago
kumavis cc5e9aca4f Merge pull request #998 from MetaMask/i960-port-stream-err 8 years ago
kumavis 65ba9fc39e bugfix - portstream - dont wrap cb in try catch 8 years ago
Frankie 34081c8cb2 Fix sorting and instances where something could be undefined 8 years ago
Frankie f9efb0817d Merge branch 'dev' into integrateTxManagerUI 8 years ago
kumavis b23a24f61d Merge pull request #996 from MetaMask/i981-UpdateOnAccountChange 8 years ago
Frankie 576e2ad64d Fix wording and icon of failed txs 8 years ago
Dan Finlay d87a7b2a76 Send update to UI when changing selected account 8 years ago
kumavis 79040c2e68 lint - warn on unhandled err 8 years ago