m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-11-27 21:00:13 +01:00
Code
2,144 Commits 2 Branches 0 Tags 265 MiB
c53932a19a
Commit Graph

2144 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dan Finlay
c53932a19a Merge branch 'dev' into conversion-api-err 2017-01-17 12:08:47 -08:00
Dan Finlay
a245fb7d22 Merge pull request #1019 from MetaMask/i1014-FixSigning 
dev - fix signing
 2017-01-17 12:08:03 -08:00
kumavis
56070cd138 Merge branch 'dev' into i1014-FixSigning 2017-01-17 00:21:32 -08:00
Dan Finlay
a208ed1d83 Version 3.0.1 2017-01-17 00:14:25 -08:00
Dan Finlay
8fcade92d3 Fix bug where signed messages were not dismissed 2017-01-17 00:13:38 -08:00
Dan Finlay
7ae2e005ed Fix removeHexPrefix to stripHexPrefix 2017-01-17 00:03:56 -08:00
Dan Finlay
54c536e72c Fix message signing UI rendering 
[A recent PR](https://github.com/MetaMask/metamask-plugin/pull/1004) removed logic that rendered pending messages for approval.

This commit fixes that.
 2017-01-16 23:59:25 -08:00
Dan Finlay
665d6c5406 Bump changelog 2017-01-16 23:58:25 -08:00
kumavis
4bc09be647 Merge pull request #1016 from MetaMask/i1014-FixSigning 
dev: fix signing
 2017-01-16 23:39:03 -08:00
kumavis
0bd38ae69a Merge branch 'dev' into i1014-FixSigning 2017-01-16 23:34:19 -08:00
Dan Finlay
d5ad84aa12 Wrote fix for eth.sign 2017-01-16 23:26:48 -08:00
Dan Finlay
7e886dff77 Wrote failing test for eth.sign 2017-01-16 23:26:37 -08:00
kumavis
3b61723064 Merge pull request #1012 from MetaMask/RemoveOldNotice 
Remove old notice
 2017-01-16 19:03:10 -08:00
Dan Finlay
fe6c84e40b Remove old notice 
This notice is not relevant to new users, should be removed.
 2017-01-16 15:41:28 -08:00
kumavis
528ceff07c Merge pull request #1011 from MetaMask/dev 
Equalize Master and Dev
 2017-01-16 15:26:16 -08:00
kumavis
575ef1afbd Merge pull request #1010 from MetaMask/master 
Equalize Master and Dev
 2017-01-16 15:22:20 -08:00
kumavis
7401e4f67f Merge pull request #1009 from MetaMask/FixManifest 
Fix manifest version
 2017-01-16 15:21:37 -08:00
kumavis
0af48b6dce Merge branch 'master' into FixManifest 2017-01-16 15:03:45 -08:00
Dan Finlay
5de6eaf35d Fix manifest version 2017-01-16 15:02:52 -08:00
kumavis
ee62a6a391 Merge pull request #1005 from MetaMask/dev 
Merge dev into master!
 2017-01-16 15:02:24 -08:00
Dan Finlay
88fabdd2de Merge pull request #1008 from MetaMask/Version-3.0.0 
Version 3.0.0
 2017-01-16 14:21:59 -08:00
Dan Finlay
9203b8c305 Version 3.0.0 2017-01-16 14:14:06 -08:00
Dan Finlay
c05b783466 Merge pull request #1007 from MetaMask/simple-keystore-fix 
keyring - simple - fix address generation
 2017-01-16 12:20:39 -08:00
kumavis
053066b57f Merge branch 'dev' into simple-keystore-fix 2017-01-16 12:10:04 -08:00
kumavis
4a09f856d1 test - keyring - simple - fix fixture data 2017-01-16 12:08:20 -08:00
kumavis
82012cbbce keyring - simple - throw error if wallet not found for address 2017-01-16 11:54:59 -08:00
kumavis
e7cf0f4bdd keyring - simple - fix address generation 2017-01-16 11:49:31 -08:00
Dan Finlay
ac6a2b4b61 Bump changelog to mention BIP44 fix 2017-01-16 10:59:01 -08:00
Dan Finlay
5dd5619e5d Merge branch 'master' into dev 2017-01-16 10:55:32 -08:00
Dan Finlay
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
Frankie
83468cbd03 add to CHANGELOG 2017-01-14 23:12:53 -08:00
Frankie
6481f9ced4 Dont render conf-tx if their are no txParams to show 2017-01-14 22:59:05 -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