Commit Graph

2513 Commits (edbd1c6a680da5dc3ad1ed12adaa29987f7fd94b)
 

Author SHA1 Message Date
kumavis 23c2b0b9a5 Merge pull request #1050 from MetaMask/fixConfTxBalanceLogic 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 8 years ago
kumavis e2b2e6d5e1 3.1.2 8 years ago
kumavis 44d0fcf0af Merge pull request #1052 from MetaMask/hotfix1048 8 years ago
Frankie 5811f2ab14 Merge pull request #1051 from MetaMask/hotfix1048 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 8 years ago
Frankie c587d0f7db Merge branch 'master' into upToDate 8 years ago
kumavis 85b34e3f2b Merge pull request #1040 from MetaMask/3.1.1 8 years ago
kumavis 389a104f0d 3.1.1 8 years ago
kumavis 03c58343a3 Merge pull request #1039 from MetaMask/upToDate 8 years ago
Frankie 56d400b0f8 Merge branch 'master' into upToDate 8 years ago
Frankie 03b3e2f880 Merge pull request #1037 from MetaMask/i1034-seed-export 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 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 8 years ago
Dan Finlay 5d8a3dd99b Add ability to import v3 JSON wallets 8 years ago
Dan Finlay 9126652f2e Implement naieve JSON file importing 8 years ago
Dan Finlay b52346388b Added new modular private key import system 8 years ago
Dan Finlay 25e5793992 Merge pull request #1027 from MetaMask/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 8 years ago
kumavis 28212d167c Merge pull request #1022 from MetaMask/i715-AddImportMenu 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 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 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 8 years ago