528ceff07c
Merge pull request #1011 from MetaMask/dev
...
Equalize Master and Dev
8 years ago
575ef1afbd
Merge pull request #1010 from MetaMask/master
...
Equalize Master and Dev
8 years ago
7401e4f67f
Merge pull request #1009 from MetaMask/FixManifest
...
Fix manifest version
8 years ago
0af48b6dce
Merge branch 'master' into FixManifest
8 years ago
5de6eaf35d
Fix manifest version
8 years ago
ee62a6a391
Merge pull request #1005 from MetaMask/dev
...
Merge dev into master!
8 years ago
88fabdd2de
Merge pull request #1008 from MetaMask/Version-3.0.0
...
Version 3.0.0
8 years ago
9203b8c305
Version 3.0.0
8 years ago
c05b783466
Merge pull request #1007 from MetaMask/simple-keystore-fix
...
keyring - simple - fix address generation
8 years ago
053066b57f
Merge branch 'dev' into simple-keystore-fix
8 years ago
4a09f856d1
test - keyring - simple - fix fixture data
8 years ago
82012cbbce
keyring - simple - throw error if wallet not found for address
8 years ago
e7cf0f4bdd
keyring - simple - fix address generation
8 years ago
ac6a2b4b61
Bump changelog to mention BIP44 fix
8 years ago
5dd5619e5d
Merge branch 'master' into dev
8 years ago
15e91f823c
Merge pull request #1004 from MetaMask/doubleRenderIssue
...
Dont render conf-tx if their are no txParams to show
8 years ago
83468cbd03
add to CHANGELOG
8 years ago
6481f9ced4
Dont render conf-tx if their are no txParams to show
8 years ago
86c0eaa5a4
Merge pull request #1002 from MetaMask/bug-submitTx
...
handle tx finalization in controllers instead of provider-engine
8 years ago
85634326e8
test - clear localStorage on test start
8 years ago
91e5cc0f29
test - clear localStorage in case CI caches it (?)
8 years ago
993daebc4e
test - txManager - add network to all txs
8 years ago
3df9ce9809
tests - txManager - add getNetwork fn to fixture txManager
8 years ago
ef81bde98b
eth-store - emit update on new account add
8 years ago
f49fb149cc
background - txManager - filter txs by network
8 years ago
c3d491a37c
background - return txHash to provider-engine on done
8 years ago
fdcf03f57d
Fix the inclusion of the txFee in the meta tx object
8 years ago
87505e1742
fix for linting
8 years ago
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
8 years ago
212ef0b850
fix the maxcost not being included in txMeta
8 years ago
d06c54e0b7
Merge branch 'bug-submitTx' of github.com:MetaMask/metamask-plugin into bug-submitTx
8 years ago
d755b66e20
background - metamask controller - fix 'this' ref
8 years ago
9f162e72b4
Merge branch 'dev' into bug-submitTx
8 years ago
c1253016fc
Merge pull request #997 from MetaMask/integrateTxManagerUI
...
Integrate tx manager ui
8 years ago
1ffaab1d9b
Merge branch 'dev' into integrateTxManagerUI
8 years ago
b72987405e
remove orphaned comment
8 years ago
c1656aff19
lint
8 years ago
5ed52eed68
Clean up code
8 years ago
29e83d71a8
background - handle tx finalization in controllers instead of provider-engine
8 years ago
cc5e9aca4f
Merge pull request #998 from MetaMask/i960-port-stream-err
...
bugfix - portstream - dont wrap cb in try catch
8 years ago
65ba9fc39e
bugfix - portstream - dont wrap cb in try catch
8 years ago
34081c8cb2
Fix sorting and instances where something could be undefined
8 years ago
f9efb0817d
Merge branch 'dev' into integrateTxManagerUI
8 years ago
b23a24f61d
Merge pull request #996 from MetaMask/i981-UpdateOnAccountChange
...
Send update to UI when changing selected account
8 years ago
576e2ad64d
Fix wording and icon of failed txs
8 years ago
d87a7b2a76
Send update to UI when changing selected account
...
Fixes #981
8 years ago
79040c2e68
lint - warn on unhandled err
8 years ago
89a5eff270
currency conversion - less noisy error
8 years ago
bbd2f2738b
Add to CHANGELOG
8 years ago
0b59dafc34
Merge branch 'dev' into integrateTxManagerUI
8 years ago
kumavis
Dan Finlay
Dan Finlay
kumavis
Frankie