29cbfd1ea2
Merge pull request #1030 from MetaMask/master
...
Merge master into dev
2017-01-18 17:23:41 -08:00
25e5793992
Merge pull request #1027 from MetaMask/Version-3.1.0
...
Version 3.1.0
2017-01-18 13:14:27 -08:00
0e01abdf71
Merge branch 'master' into Version-3.1.0
2017-01-18 12:25:35 -08:00
99ce68b4f6
Version 3.1.0
2017-01-18 12:23:48 -08:00
9ab7ce370b
Merge pull request #1024 from MetaMask/fixSignedVsSubmitted
...
Fix the dissplay for submitted transactions...
2017-01-18 12:17:29 -08:00
28212d167c
Merge pull request #1022 from MetaMask/i715-AddImportMenu
...
Add ability to import private keys
2017-01-18 12:15:58 -08:00
3273f507f7
Merge branch 'dev' into i715-AddImportMenu
2017-01-18 12:15:43 -08:00
9e58505942
Add to CHANGELOG
2017-01-18 12:10:49 -08:00
4a0f330a06
Merge pull request #1026 from MetaMask/i1023-badTxHash
...
Bump changelog
2017-01-18 12:06:34 -08:00
b2c52f6b83
Merge branch 'dev' into i715-AddImportMenu
2017-01-18 11:49:15 -08:00
81a16fb107
Bump changelog
2017-01-18 11:48:34 -08:00
e29ed3b70b
Merge pull request #1025 from MetaMask/i1023-badTxHash
...
tx-manager - use rpc-specified txHash
2017-01-18 11:42:21 -08:00
3b7301488f
tx-manager - use rpc-specified txHash
2017-01-18 11:33:37 -08:00
e3650b336a
Merge branch 'master' into fixSignedVsSubmitted
2017-01-18 11:30:41 -08:00
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
3572708fda
Fix test to log out despite number of menu items
2017-01-17 16:49:08 -08:00
8055113e68
Bump changelog
2017-01-17 16:35:57 -08:00
693aa50e7f
Remove outdated reference
2017-01-17 16:35:11 -08:00
9ed6381c5d
Remove unused UI files
2017-01-17 16:31:12 -08:00
1ff4894b67
Allow importing of private key strings
...
Fixes #1021
A top-right menu item now allows `Account Import`. It has a menu (with one item for now) that allows importing a private key string.
Errors are displayed, and a success navigates the user to their account list, where the imported account is labeled `LOOSE`.
2017-01-17 16:24:45 -08:00
958cbfbde4
Merge branch 'i328-MultiVault-v1' into i715-AddImportMenu
2017-01-17 13:58:54 -08:00
77bd010543
Add "import account" menu item + template view
2017-01-17 13:47:30 -08:00
1f2840a7be
Merge pull request #1017 from MetaMask/conversion-api-err
...
Conversion api err
2017-01-17 12:14:27 -08:00
c53932a19a
Merge branch 'dev' into conversion-api-err
2017-01-17 12:08:47 -08:00
a245fb7d22
Merge pull request #1019 from MetaMask/i1014-FixSigning
...
dev - fix signing
2017-01-17 12:08:03 -08:00
56070cd138
Merge branch 'dev' into i1014-FixSigning
2017-01-17 00:21:32 -08:00
a208ed1d83
Version 3.0.1
2017-01-17 00:14:25 -08:00
8fcade92d3
Fix bug where signed messages were not dismissed
2017-01-17 00:13:38 -08:00
7ae2e005ed
Fix removeHexPrefix to stripHexPrefix
2017-01-17 00:03:56 -08:00
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
665d6c5406
Bump changelog
2017-01-16 23:58:25 -08:00
4bc09be647
Merge pull request #1016 from MetaMask/i1014-FixSigning
...
dev: fix signing
2017-01-16 23:39:03 -08:00
0bd38ae69a
Merge branch 'dev' into i1014-FixSigning
2017-01-16 23:34:19 -08:00
d5ad84aa12
Wrote fix for eth.sign
2017-01-16 23:26:48 -08:00
7e886dff77
Wrote failing test for eth.sign
2017-01-16 23:26:37 -08:00
3b61723064
Merge pull request #1012 from MetaMask/RemoveOldNotice
...
Remove old notice
2017-01-16 19:03:10 -08:00
fe6c84e40b
Remove old notice
...
This notice is not relevant to new users, should be removed.
2017-01-16 15:41:28 -08:00
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
kumavis
Dan Finlay
Dan Finlay
Frankie
kumavis