2333 Commits (de6455151e3861a36134ab7f92180f571d55f7dc)

 

All Branches   

Search

Author	SHA1	Message	Date
Dan Finlay	9126652f2e	Implement naieve JSON file importing ... Doesn't work on any JSON file I have, it's a very naieve strategy provided by ethereumjs-wallet. Will need to raise its sophistication before deploying to production.	8 years ago
Dan Finlay	b52346388b	Added new modular private key import system ... Now any strategy for importing a private key that can be described as a pure function can be very easily turned into a MetaMask import strategy. I've created a generic and reusable UI action called `importNewAccount(strategy, args)`. The `strategy` is a unique identifier defined in `app/scripts/account-import-strategies`, and the `args` will be passed to the member of the `strategies` array whose key matches the strategy string. Strategies return private key hex strings, and are used by the metamask-controller to create a new keyring, and select that new account, before calling back. This also implements @frankiebee's idea of showing the imported account when it's been imported (my oversight!). This commit only moves us to this architecture, keeping feature parity for private key import, but has some untested code for importing geth-style JSON files as well!	8 years ago
Dan Finlay	25e5793992	Merge pull request #1027 from MetaMask/Version-3.1.0 ... Version 3.1.0	8 years ago
Dan Finlay	0e01abdf71	Merge branch 'master' into Version-3.1.0	8 years ago
Dan Finlay	99ce68b4f6	Version 3.1.0	8 years ago
Dan Finlay	9ab7ce370b	Merge pull request #1024 from MetaMask/fixSignedVsSubmitted ... Fix the dissplay for submitted transactions...	8 years ago
kumavis	28212d167c	Merge pull request #1022 from MetaMask/i715-AddImportMenu ... Add ability to import private keys	8 years ago
kumavis	3273f507f7	Merge branch 'dev' into i715-AddImportMenu	8 years ago
Frankie	9e58505942	Add to CHANGELOG	8 years ago
Dan Finlay	4a0f330a06	Merge pull request #1026 from MetaMask/i1023-badTxHash ... Bump changelog	8 years ago
kumavis	b2c52f6b83	Merge branch 'dev' into i715-AddImportMenu	8 years ago
Dan Finlay	81a16fb107	Bump changelog	8 years ago
Dan Finlay	e29ed3b70b	Merge pull request #1025 from MetaMask/i1023-badTxHash ... tx-manager - use rpc-specified txHash	8 years ago
kumavis	3b7301488f	tx-manager - use rpc-specified txHash	8 years ago
Frankie	e3650b336a	Merge branch 'master' into fixSignedVsSubmitted	8 years ago
Frankie	460cbb985f	Fix the dissplay for submitted transactions and the listner wating to hear when tx's were included in a block	8 years ago
Dan Finlay	3572708fda	Fix test to log out despite number of menu items	8 years ago
Dan Finlay	8055113e68	Bump changelog	8 years ago
Dan Finlay	693aa50e7f	Remove outdated reference	8 years ago
Dan Finlay	9ed6381c5d	Remove unused UI files	8 years ago
Dan Finlay	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`.	8 years ago
Dan Finlay	958cbfbde4	Merge branch 'i328-MultiVault-v1' into i715-AddImportMenu	8 years ago
Dan Finlay	77bd010543	Add "import account" menu item + template view	8 years ago
Dan Finlay	1f2840a7be	Merge pull request #1017 from MetaMask/conversion-api-err ... Conversion api err	8 years ago
Dan Finlay	c53932a19a	Merge branch 'dev' into conversion-api-err	8 years ago
Dan Finlay	a245fb7d22	Merge pull request #1019 from MetaMask/i1014-FixSigning ... dev - fix signing	8 years ago
kumavis	56070cd138	Merge branch 'dev' into i1014-FixSigning	8 years ago
Dan Finlay	a208ed1d83	Version 3.0.1	8 years ago
Dan Finlay	8fcade92d3	Fix bug where signed messages were not dismissed	8 years ago
Dan Finlay	7ae2e005ed	Fix removeHexPrefix to stripHexPrefix	8 years ago
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.	8 years ago
Dan Finlay	665d6c5406	Bump changelog	8 years ago
kumavis	4bc09be647	Merge pull request #1016 from MetaMask/i1014-FixSigning ... dev: fix signing	8 years ago
kumavis	0bd38ae69a	Merge branch 'dev' into i1014-FixSigning	8 years ago
Dan Finlay	d5ad84aa12	Wrote fix for eth.sign	8 years ago
Dan Finlay	7e886dff77	Wrote failing test for eth.sign	8 years ago
kumavis	3b61723064	Merge pull request #1012 from MetaMask/RemoveOldNotice ... Remove old notice	8 years ago
Dan Finlay	fe6c84e40b	Remove old notice ... This notice is not relevant to new users, should be removed.	8 years ago
kumavis	528ceff07c	Merge pull request #1011 from MetaMask/dev ... Equalize Master and Dev	8 years ago
kumavis	575ef1afbd	Merge pull request #1010 from MetaMask/master ... Equalize Master and Dev	8 years ago
kumavis	7401e4f67f	Merge pull request #1009 from MetaMask/FixManifest ... Fix manifest version	8 years ago
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 ... Merge dev into master!	8 years ago
Dan Finlay	88fabdd2de	Merge pull request #1008 from MetaMask/Version-3.0.0 ... 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 ... keyring - simple - fix address generation	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