528ceff07c
Merge pull request #1011 from MetaMask/dev
...
Equalize Master and Dev
2017-01-16 15:26:16 -08:00
575ef1afbd
Merge pull request #1010 from MetaMask/master
...
Equalize Master and Dev
2017-01-16 15:22:20 -08:00
7401e4f67f
Merge pull request #1009 from MetaMask/FixManifest
...
Fix manifest version
2017-01-16 15:21:37 -08:00
0af48b6dce
Merge branch 'master' into FixManifest
2017-01-16 15:03:45 -08:00
5de6eaf35d
Fix manifest version
2017-01-16 15:02:52 -08:00
ee62a6a391
Merge pull request #1005 from MetaMask/dev
...
Merge dev into master!
2017-01-16 15:02:24 -08:00
88fabdd2de
Merge pull request #1008 from MetaMask/Version-3.0.0
...
Version 3.0.0
2017-01-16 14:21:59 -08:00
9203b8c305
Version 3.0.0
2017-01-16 14:14:06 -08:00
c05b783466
Merge pull request #1007 from MetaMask/simple-keystore-fix
...
keyring - simple - fix address generation
2017-01-16 12:20:39 -08:00
053066b57f
Merge branch 'dev' into simple-keystore-fix
2017-01-16 12:10:04 -08:00
4a09f856d1
test - keyring - simple - fix fixture data
2017-01-16 12:08:20 -08:00
82012cbbce
keyring - simple - throw error if wallet not found for address
2017-01-16 11:54:59 -08:00
e7cf0f4bdd
keyring - simple - fix address generation
2017-01-16 11:49:31 -08:00
ac6a2b4b61
Bump changelog to mention BIP44 fix
2017-01-16 10:59:01 -08:00
5dd5619e5d
Merge branch 'master' into dev
2017-01-16 10:55:32 -08:00
15e91f823c
Merge pull request #1004 from MetaMask/doubleRenderIssue
...
Dont render conf-tx if their are no txParams to show
2017-01-16 10:12:49 -08:00
83468cbd03
add to CHANGELOG
2017-01-14 23:12:53 -08:00
6481f9ced4
Dont render conf-tx if their are no txParams to show
2017-01-14 22:59:05 -08:00
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
85634326e8
test - clear localStorage on test start
2017-01-14 22:35:26 -08:00
91e5cc0f29
test - clear localStorage in case CI caches it (?)
2017-01-14 22:30:12 -08:00
993daebc4e
test - txManager - add network to all txs
2017-01-14 22:09:19 -08:00
3df9ce9809
tests - txManager - add getNetwork fn to fixture txManager
2017-01-14 21:52:09 -08:00
ef81bde98b
eth-store - emit update on new account add
2017-01-14 21:46:40 -08:00
f49fb149cc
background - txManager - filter txs by network
2017-01-14 21:29:46 -08:00
c3d491a37c
background - return txHash to provider-engine on done
2017-01-14 20:51:29 -08:00
fdcf03f57d
Fix the inclusion of the txFee in the meta tx object
2017-01-14 13:32:35 -08:00
87505e1742
fix for linting
2017-01-13 18:01:50 -08:00
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
212ef0b850
fix the maxcost not being included in txMeta
2017-01-13 16:53:10 -08:00
d06c54e0b7
Merge branch 'bug-submitTx' of github.com:MetaMask/metamask-plugin into bug-submitTx
2017-01-13 15:51:36 -08:00
d755b66e20
background - metamask controller - fix 'this' ref
2017-01-13 15:51:08 -08:00
9f162e72b4
Merge branch 'dev' into bug-submitTx
2017-01-13 13:26:57 -08:00
c1253016fc
Merge pull request #997 from MetaMask/integrateTxManagerUI
...
Integrate tx manager ui
2017-01-13 11:39:32 -08:00
1ffaab1d9b
Merge branch 'dev' into integrateTxManagerUI
2017-01-13 11:31:51 -08:00
b72987405e
remove orphaned comment
2017-01-13 11:30:58 -08:00
c1656aff19
lint
2017-01-13 10:53:16 -08:00
5ed52eed68
Clean up code
2017-01-13 10:44:22 -08:00
29e83d71a8
background - handle tx finalization in controllers instead of provider-engine
2017-01-13 02:00:11 -08:00
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
65ba9fc39e
bugfix - portstream - dont wrap cb in try catch
2017-01-11 19:09:49 -08:00
34081c8cb2
Fix sorting and instances where something could be undefined
2017-01-11 17:02:57 -08:00
f9efb0817d
Merge branch 'dev' into integrateTxManagerUI
2017-01-11 16:07:03 -08:00
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
576e2ad64d
Fix wording and icon of failed txs
2017-01-11 15:44:21 -08:00
d87a7b2a76
Send update to UI when changing selected account
...
Fixes #981
2017-01-11 15:15:37 -08:00
79040c2e68
lint - warn on unhandled err
2017-01-11 14:41:31 -08:00
89a5eff270
currency conversion - less noisy error
2017-01-11 14:40:35 -08:00
bbd2f2738b
Add to CHANGELOG
2017-01-11 12:23:00 -08:00
0b59dafc34
Merge branch 'dev' into integrateTxManagerUI
2017-01-11 12:17:17 -08:00
kumavis
Dan Finlay
Dan Finlay
kumavis
Frankie