| Commit message (Expand) | Author | Age | Files | Lines |
* | Add ability to add tokens to token list | Dan Finlay | 2017-06-16 | 1 | -0/+14 |
* | Create add token button and template view | Dan Finlay | 2017-06-15 | 1 | -1/+10 |
* | Persist selected account tab | Dan Finlay | 2017-06-15 | 1 | -4/+21 |
* | ui - remove web3, use eth-query | kumavis | 2017-05-09 | 1 | -1/+1 |
* | Fix linting warnings | Thomas Huang | 2017-04-27 | 1 | -3/+3 |
* | remove updateCoinBaseAmount action | Jared Pereira | 2017-04-24 | 1 | -9/+0 |
* | remove updateBuyAddress action | Jared Pereira | 2017-04-24 | 1 | -9/+0 |
* | add platforms to mascara + move buyEther window open to ui | kumavis | 2017-04-05 | 1 | -3/+5 |
* | Merge pull request #1273 from MetaMask/i1267-seedfix | Dan Finlay | 2017-03-29 | 1 | -1/+3 |
|\ |
|
| * | Assure that seed words are placed into state tree upon request. | Kevin Serrano | 2017-03-28 | 1 | -1/+3 |
* | | Improve UI gas calculation logic | Dan Finlay | 2017-03-29 | 1 | -0/+1 |
|/ |
|
* | Remove goHome action causing erratic UI behavior. | Kevin Serrano | 2017-03-25 | 1 | -1/+0 |
* | Merge branch 'master' into i1033-spinnerfix | kumavis | 2017-03-23 | 1 | -8/+16 |
|\ |
|
| * | Adjust private key confirmation style and logic. | Kevin Serrano | 2017-03-21 | 1 | -9/+17 |
* | | Add one more loading indication. | Kevin Serrano | 2017-03-23 | 1 | -0/+1 |
* | | Uncomment lines relating to showing indicator. | Kevin Serrano | 2017-03-22 | 1 | -2/+2 |
* | | Remove redundant removal of loading indicator. Integrate loading indicator di... | Kevin Serrano | 2017-03-22 | 1 | -5/+2 |
* | | Add action to hide loading indication on an incorrect pw. | Kevin Serrano | 2017-03-21 | 1 | -2/+5 |
|/ |
|
* | Merge branch 'master' into i1165-predictive | Kevin Serrano | 2017-03-15 | 1 | -4/+4 |
|\ |
|
| * | Rename variables to proper currency state variables. | Kevin Serrano | 2017-03-15 | 1 | -4/+4 |
* | | Add comments. | Kevin Serrano | 2017-03-11 | 1 | -0/+1 |
* | | Allow for adding recently used addresses to address book. | Kevin Serrano | 2017-03-10 | 1 | -0/+14 |
|/ |
|
* | Fix typo, switch to log.error | Kevin Serrano | 2017-03-09 | 1 | -3/+3 |
* | Remove unneeded setrpc method. | Kevin Serrano | 2017-03-09 | 1 | -20/+8 |
* | Nodeify and promisify calls to background. | Kevin Serrano | 2017-03-09 | 1 | -9/+25 |
* | Refactor of code into separate reducers and actions. | Kevin Serrano | 2017-03-08 | 1 | -21/+9 |
* | Break out rpc update and rpclist into two reducers. | Kevin Serrano | 2017-03-08 | 1 | -6/+24 |
* | More conflict resolution. | Kevin Serrano | 2017-03-02 | 1 | -1/+1 |
|\ |
|
| * | Merge branch 'master' into i1144-moarrpc | Dan Finlay | 2017-02-28 | 1 | -31/+64 |
| |\ |
|
* | \ | Fix merge conflicts. | Kevin Serrano | 2017-03-02 | 1 | -38/+82 |
|\ \ \
| |/ /
|/| | |
|
| * | | Use correct action to update and submit tx | Dan Finlay | 2017-03-01 | 1 | -2/+2 |
| * | | Remove gasMultiplier txMeta param | Dan Finlay | 2017-03-01 | 1 | -9/+5 |
| * | | Add action for updating and approving a tx in one action | Dan Finlay | 2017-02-28 | 1 | -0/+15 |
| |/ |
|
| * | Fix cancel msg signing behavior. | Dan Finlay | 2017-02-24 | 1 | -4/+4 |
| * | Got personal_sign working | Dan Finlay | 2017-02-24 | 1 | -33/+44 |
| * | Add personal sign actions and template | Dan Finlay | 2017-02-23 | 1 | -0/+22 |
* | | Tested against code to play nice with unit tests. | Kevin Serrano | 2017-02-24 | 1 | -6/+12 |
* | | Implemented functionality for displaying recent custom RPCs | Kevin Serrano | 2017-02-23 | 1 | -2/+3 |
* | | Connect to actions. | Kevin Serrano | 2017-02-22 | 1 | -0/+1 |
|/ |
|
* | Delete all code related to disclaimers. | Kevin Serrano | 2017-02-10 | 1 | -19/+0 |
* | Remove egregious alert | Dan Finlay | 2017-02-07 | 1 | -1/+0 |
* | Mostly got shapeshift tx management into its own controller | Dan Finlay | 2017-02-04 | 1 | -1/+2 |
* | migration #9 - break out CurrencyController substate | kumavis | 2017-02-03 | 1 | -2/+6 |
* | migration 7 - break off TransactionManager substate | kumavis | 2017-02-03 | 1 | -0/+30 |
* | actions - dont expect background to provide newState, manually update | kumavis | 2017-02-03 | 1 | -12/+27 |
* | rename selectedAccount to selectedAddress | kumavis | 2017-01-31 | 1 | -10/+3 |
* | metamask controller - cleanup remote api | kumavis | 2017-01-27 | 1 | -2/+1 |
* | Merge branch 'dev' into i#1048 | kumavis | 2017-01-25 | 1 | -1/+18 |
|\ |
|
| * | Merge pull request #1051 from MetaMask/hotfix1048 | Frankie | 2017-01-25 | 1 | -2/+2 |
| |\ |
|
| | * | hotfix - dont assume hd keyring position | kumavis | 2017-01-25 | 1 | -2/+2 |
| * | | Add ability to import v3 JSON wallets | Dan Finlay | 2017-01-19 | 1 | -2/+3 |
| * | | Added new modular private key import system | Dan Finlay | 2017-01-19 | 1 | -0/+16 |
| |/ |
|
* | | background controller - extract KeyringC.placeSeedWords to MetamaskC | kumavis | 2017-01-25 | 1 | -1/+15 |
* | | Fix issue where generating a new account would put it in loose keys | Frankie | 2017-01-25 | 1 | -2/+2 |
|/ |
|
* | Allow importing of private key strings | Dan Finlay | 2017-01-18 | 1 | -1/+9 |
* | Merge branch 'i328-MultiVault-v1' into i715-AddImportMenu | Dan Finlay | 2017-01-18 | 1 | -0/+8 |
|\ |
|
| * | Linted | Dan Finlay | 2016-11-05 | 1 | -1/+1 |
| * | Scaffold new account view | Dan Finlay | 2016-11-05 | 1 | -0/+8 |
* | | Add "import account" menu item + template view | Dan Finlay | 2017-01-18 | 1 | -0/+8 |
* | | Send update to UI when changing selected account | Dan Finlay | 2017-01-12 | 1 | -5/+4 |
* | | Convert more actions to new simple pattern | Dan Finlay | 2017-01-04 | 1 | -18/+2 |
* | | Restore missing line | Dan Finlay | 2017-01-04 | 1 | -0/+1 |
* | | Corrected instances of showWarning to displayWarning | Dan Finlay | 2017-01-04 | 1 | -3/+3 |
* | | Apply new pattern to repetitive functions | Dan Finlay | 2017-01-04 | 1 | -19/+2 |
* | | Update account list after adding account | Dan Finlay | 2017-01-04 | 1 | -10/+24 |
* | | Make notices confirmation configurable | Dan Finlay | 2016-12-21 | 1 | -0/+12 |
* | | Merge pull request #937 from MetaMask/i900-forgot-password-flow | Dan Finlay | 2016-12-20 | 1 | -2/+10 |
|\ \ |
|
| * | | Modify actions to support better transition. | Kevin Serrano | 2016-12-20 | 1 | -0/+8 |
| * | | Lint. | Kevin Serrano | 2016-12-20 | 1 | -2/+2 |
* | | | Merged master into dev | Dan Finlay | 2016-12-20 | 1 | -0/+44 |
|\ \ \
| |/ /
|/| | |
|
| * | | Add ability to show notices to user & get confirmation. | Kevin Serrano | 2016-12-17 | 1 | -1/+1 |
| * | | Add ability to show notices to user & get confirmation. | Kevin Serrano | 2016-12-17 | 1 | -0/+44 |
* | | | Fix vault encrypting & unlocking bug | Dan Finlay | 2016-12-01 | 1 | -6/+19 |
* | | | Add integration tests for logging out and back in | Dan Finlay | 2016-12-01 | 1 | -1/+2 |
* | | | Made integration test create a first vault | Dan Finlay | 2016-12-01 | 1 | -1/+2 |
* | | | Fix proper behavior for restoring accounts when password forgotten. | Kevin Serrano | 2016-11-24 | 1 | -0/+1 |
* | | | Merge pull request #858 from MetaMask/i842-WaitForSeedWord | kumavis | 2016-11-23 | 1 | -2/+4 |
|\ \ \ |
|
| * | | | Use callback in placeSeedWord method. | Dan Finlay | 2016-11-22 | 1 | -2/+4 |
* | | | | Fix camel casing on setSelectedAccount action. | Dan Finlay | 2016-11-22 | 1 | -2/+2 |
* | | | | Change fauceting to become a response of an emit. | Kevin Serrano | 2016-11-22 | 1 | -2/+2 |
* | | | | change all instances of selectedAddress to selectedAccount. | Kevin Serrano | 2016-11-22 | 1 | -4/+4 |
* | | | | Remove entropy from encryption and project. | Kevin Serrano | 2016-11-22 | 1 | -2/+2 |
|/ / / |
|
* | | | Revert one cb to previous state. | Kevin Serrano | 2016-11-16 | 1 | -1/+1 |
* | | | Minimize dispatches by using emitters and relying on state updates. | Kevin Serrano | 2016-11-16 | 1 | -19/+6 |
* | | | Linting to the max. | Kevin Serrano | 2016-11-12 | 1 | -1/+1 |
* | | | Merge branch 'master' into i328-MultiVault | Frankie | 2016-11-11 | 1 | -13/+8 |
|\| |
| |/
|/| |
|
| * | Unify warning functions. | Kevin G. Serrano | 2016-11-08 | 1 | -14/+9 |
* | | Add reveal of seed words. | Kevin Serrano | 2016-11-02 | 1 | -0/+23 |
* | | Fixed bugs related to clearing caches when restoring to a new vault | Dan Finlay | 2016-11-02 | 1 | -2/+3 |
* | | Fix seed phrase restore | Dan Finlay | 2016-11-02 | 1 | -1/+0 |
* | | Made progress on parity for MultiVault | Kevin Serrano | 2016-11-02 | 1 | -6/+17 |
* | | Implement seed word confirmation page. | Kevin Serrano | 2016-11-01 | 1 | -0/+16 |
* | | Make case condition more consistent. Remove extra action. Fix incorrect displ... | Kevin Serrano | 2016-10-31 | 1 | -1/+1 |
* | | Configure BIP44 Keychain as default one | Dan Finlay | 2016-10-29 | 1 | -1/+16 |
* | | Phase out extra warning screen. | Kevin Serrano | 2016-10-26 | 1 | -23/+0 |
* | | Improved simple account generation | Dan Finlay | 2016-10-21 | 1 | -1/+1 |
* | | Began adding first basic keyring | Dan Finlay | 2016-10-21 | 1 | -0/+16 |
* | | Fix tests | Dan Finlay | 2016-10-21 | 1 | -2/+2 |
* | | Linted & added salting to vault | Dan Finlay | 2016-10-21 | 1 | -1/+1 |
* | | Fix state updating after vault creation and unlocking | Dan Finlay | 2016-10-21 | 1 | -2/+8 |
* | | Change actions reference to keyringController to background | Dan Finlay | 2016-10-21 | 1 | -24/+24 |
* | | Git merge resolution. | Kevin Serrano | 2016-10-20 | 1 | -6/+8 |
|\| |
|
| * | Create callback and Clean-up details | Frankie | 2016-10-14 | 1 | -6/+8 |
| * | Fix gasPrice range | Frankie | 2016-10-14 | 1 | -1/+1 |
* | | Intermediary commit. | Kevin Serrano | 2016-10-20 | 1 | -24/+24 |
* | | Initial work on UI side | Kevin Serrano | 2016-10-16 | 1 | -0/+10 |
* | | Add minimal method signatures to new keyring controller | Dan Finlay | 2016-10-13 | 1 | -1/+2 |
* | | Remove additional deprecated action | Dan Finlay | 2016-10-13 | 1 | -15/+0 |
* | | Remove opinionated seed word code | Dan Finlay | 2016-10-13 | 1 | -65/+1 |
|/ |
|
* | Drop the buy button in the confTx view if account does not have enough eth | Frankie | 2016-09-16 | 1 | -1/+2 |
* | Add qrcode-npm to package.json and swap out Qr Code generator api for node-mo... | Frankie | 2016-09-13 | 1 | -39/+11 |
* | Show loading indication during unlocking. | Dan Finlay | 2016-09-09 | 1 | -0/+2 |
* | Show conf screen after send request | Dan Finlay | 2016-09-02 | 1 | -2/+1 |
* | Add a back button on lock screen to go back to init menu | Frankie | 2016-08-26 | 1 | -0/+18 |
* | Create a ShapeShift tx in tx History | Frankie | 2016-08-19 | 1 | -1/+1 |
* | Merge branch 'master' into shapeshiftTx | Frankie | 2016-08-19 | 1 | -0/+19 |
|\ |
|
| * | linting and ignoring. | Kevin Serrano | 2016-08-17 | 1 | -5/+0 |
| * | Merge master. | Kevin Serrano | 2016-08-16 | 1 | -0/+161 |
| |\ |
|
| * | | Did not previously call functions before! | Kevin Serrano | 2016-08-10 | 1 | -0/+3 |
| * | | Fix default value. Add loading indication for async. | Kevin Serrano | 2016-08-10 | 1 | -0/+4 |
| * | | currency now selectable and save-able. | Kevin Serrano | 2016-08-05 | 1 | -2/+0 |
| * | | Fix merge conflicts. Fix typos. Ensure currency immediately updated on load. | Kevin Serrano | 2016-07-23 | 1 | -0/+35 |
| |\ \ |
|
| * | | | Linting! | Kevin Serrano | 2016-07-23 | 1 | -2/+2 |
| * | | | Add date access throughout the data flow. | Kevin Serrano | 2016-07-22 | 1 | -0/+1 |
| * | | | Add data field to pass up parameters up to reducer. | Kevin Serrano | 2016-07-22 | 1 | -1/+5 |
| * | | | Add fiat actions to metamask controllere and actions. | Kevin Serrano | 2016-07-22 | 1 | -0/+14 |
* | | | | WIP: ShapeShift tx | Frankie | 2016-08-19 | 1 | -0/+29 |
| |_|/
|/| | |
|
* | | | Remove ethereum classic provider | Dan Finlay | 2016-08-15 | 1 | -2/+1 |
* | | | Add multi message capability to Qr view for market info | Frankie | 2016-08-13 | 1 | -3/+4 |
* | | | Change buy forms so that they are their own view and add Qr-code | Frankie | 2016-08-13 | 1 | -9/+37 |
* | | | Fix merge mess | Frankie | 2016-08-11 | 1 | -1/+0 |
* | | | Merge branch 'master' into buyForm | Frankie | 2016-08-11 | 1 | -1/+1 |
|\ \ \
| | |/
| |/| |
|
| * | | Buy button (#474) | Frankie | 2016-07-22 | 1 | -0/+35 |
| |/ |
|
* / | Create "buy form" add shape shift | Frankie | 2016-08-11 | 1 | -0/+169 |
|/ |
|
* | Move main drop-down state to component state | Dan Finlay | 2016-07-02 | 1 | -19/+0 |
* | Fix broken action reference | Dan Finlay | 2016-07-01 | 1 | -0/+5 |
* | Manually linted | Dan Finlay | 2016-06-22 | 1 | -7/+21 |
* | Auto linted | Dan Finlay | 2016-06-22 | 1 | -57/+56 |
* | Fix disclaimer approving action | Dan Finlay | 2016-06-17 | 1 | -1/+2 |
* | Add disclaimer consent action | Dan Finlay | 2016-06-17 | 1 | -0/+13 |
* | Merge branch 'master' into display_network | Dan Finlay | 2016-06-04 | 1 | -1/+26 |
|\ |
|
| * | Added seed word recovery to config screen | Dan Finlay | 2016-06-03 | 1 | -1/+26 |
* | | network status getting set upon start-up and showing in title bar but not aut... | Zac Mitton | 2016-06-02 | 1 | -0/+8 |
|/ |
|
* | Add clicking txs in list shows tx conf screen | Dan Finlay | 2016-05-27 | 1 | -0/+9 |
* | actions - remove use of 'this' | kumavis | 2016-05-26 | 1 | -70/+70 |
* | Added ability to nickname wallets locally | Dan Finlay | 2016-05-21 | 1 | -0/+18 |
* | Add ability to add account to vault | Dan Finlay | 2016-05-21 | 1 | -0/+15 |
* | Add dynamic list item styles | Dan Finlay | 2016-05-19 | 1 | -0/+9 |
* | Add animated sandwich button | Dan Finlay | 2016-05-19 | 1 | -0/+11 |
* | Streamlined some transition logic | Dan Finlay | 2016-05-13 | 1 | -11/+13 |
* | Fix more transition bugs | Dan Finlay | 2016-05-12 | 1 | -6/+7 |
* | Make default providers more easiliy configurable for metamask devs | Dan Finlay | 2016-05-11 | 1 | -0/+10 |
* | Fix transition bugs after vault restore | Dan Finlay | 2016-05-11 | 1 | -1/+1 |
* | Restored signTx action | Dan Finlay | 2016-05-07 | 1 | -0/+15 |
* | Fix routing bug | Dan Finlay | 2016-05-05 | 1 | -1/+0 |
* | Show any pending txs when unlocking | Dan Finlay | 2016-05-04 | 1 | -1/+0 |
* | Add UI for Signing Messages | Dan Finlay | 2016-05-04 | 1 | -6/+12 |
* | Fix outdated transitions | Dan Finlay | 2016-04-30 | 1 | -12/+6 |
* | Persist selected account | Dan Finlay | 2016-04-26 | 1 | -7/+11 |
* | Make account detail view the primary view | Dan Finlay | 2016-04-26 | 1 | -10/+15 |
* | Moved UI into repo with its own dependency stack | Dan Finlay | 2016-04-14 | 1 | -0/+418 |