2427 Commits (57fec36a7d999e4fdfc06e0b1f8649ec39d7eed4)

 

All Branches   

Search

Author	SHA1	Message	Date
kumavis	41bc9c221e	Merge pull request #1056 from MetaMask/i#1006 ... Fix ui overlap	8 years ago
kumavis	2b34cb4564	Merge pull request #1057 from MetaMask/kumavis-refactor1 ... background - various refactor, cleanups, and fixes	8 years ago
kumavis	dc86ddebb7	background - graceful publicConfigStore connection teardown	8 years ago
kumavis	a14a25c423	config-manager - default to USD for currentFiat	8 years ago
kumavis	af115aa4c1	background - organize metamask instantiation	8 years ago
Frankie	583dc100ab	Fix ui overlap	8 years ago
kumavis	d30612a216	Merge pull request #999 from MetaMask/obs-store2 ... background - introduce ObservableStore (mark II)	8 years ago
kumavis	0f33acb80c	mock-dev - cleanup missing polyfill	8 years ago
kumavis	76ce348a04	obs-store - use published module	8 years ago
kumavis	a06ee45404	migrations - rename 005 to stubbed _multi-keyring	8 years ago
kumavis	bb1ee8e649	Merge branch 'dev' of github.com:MetaMask/metamask-plugin into obs-store2	8 years ago
Frankie	4f39e8192c	Merge pull request #1054 from MetaMask/i#1048 ... Background - Extracts primary account code from keyring controller	8 years ago
kumavis	70b8e640f0	Merge branch 'dev' into i#1048	8 years ago
kumavis	463a56ff54	background controller - extract KeyringC.placeSeedWords to MetamaskC	8 years ago
kumavis	23c2b0b9a5	Merge pull request #1050 from MetaMask/fixConfTxBalanceLogic ... Fix conf tx balance logic	8 years ago
Frankie	8ed657d5d5	fix base	8 years ago
kumavis	bef4b78196	merge master hotfix into dev	8 years ago
kumavis	ffe588365c	Merge pull request #1053 from MetaMask/3.1.2 ... Release 3.1.2	8 years ago
kumavis	e2b2e6d5e1	3.1.2	8 years ago
kumavis	44d0fcf0af	Merge pull request #1052 from MetaMask/hotfix1048 ... hotfix - dont assume hd keyring position	8 years ago
Frankie	5811f2ab14	Merge pull request #1051 from MetaMask/hotfix1048 ... hotfix - addNewAccount - dont assume hd keyring position	8 years ago
kumavis	745fff0c80	hotfix - dont assume hd keyring position	8 years ago
kumavis	01c88bb0bd	keyring-controller - cleanup	8 years ago
kumavis	8049c1fc07	keyring-controller - cleanup	8 years ago
Frankie	42bb90341d	add to CHANGELOG	8 years ago
Frankie	b2623510ae	Fix issue where ConfTx view lets you approve txs when the account has insufficient balance	8 years ago
Frankie	de88a49243	add to CHANGELOG	8 years ago
Frankie	48ffea0142	Move the assumption of their only being one hd keyring when requesting seed words to metamaskController	8 years ago
Frankie	8642ced310	Fix issue where generating a new account would put it in loose keys	8 years ago
kumavis	74dc20bdf1	Merge branch 'dev' into obs-store2	8 years ago
kumavis	247f7aad5e	Merge pull request #1042 from MetaMask/upToDate ... keep dev Up to date	8 years ago
Frankie	c587d0f7db	Merge branch 'master' into upToDate	8 years ago
kumavis	85b34e3f2b	Merge pull request #1040 from MetaMask/3.1.1 ... 3.1.1	8 years ago
kumavis	389a104f0d	3.1.1	8 years ago
kumavis	03c58343a3	Merge pull request #1039 from MetaMask/upToDate ... Keep dev up to date with master	8 years ago
Frankie	56d400b0f8	Merge branch 'master' into upToDate	8 years ago
Frankie	03b3e2f880	Merge pull request #1037 from MetaMask/i1034-seed-export ... keyring controller - placeSeedWords should use first hdKeyring	8 years ago
kumavis	9c6cf90538	keyring controller - placeSeedWords should use first hdKeyring	8 years ago
Kevin Serrano	a09332f937	Merge pull request #1029 from MetaMask/i715-AddJsonImport ... Add JSON file account import	8 years ago
Dan Finlay	b478ce5b77	Bump changelog	8 years ago
Dan Finlay	9f1884145a	Merge branch 'dev' into i715-AddJsonImport	8 years ago
kumavis	29cbfd1ea2	Merge pull request #1030 from MetaMask/master ... Merge master into dev	8 years ago
Dan Finlay	5d8a3dd99b	Add ability to import v3 JSON wallets ... There is now a menu item labeled "JSON File" for importing, and it can digest either: - v1 MyEtherWallet JSON files - v3 Account files (used by Geth, Mist, and MyEtherWallet). Fixes #715	8 years ago
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