| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'master' into i1234-HardGasLimits-BrowserForm | Dan Finlay | 2017-03-23 | 10 | -8/+41 |
|\ |
|
| * | Merge branch 'master' into i238-kovan | Kevin Serrano | 2017-03-23 | 3 | -4/+3 |
| |\ |
|
| | * | Merge branch 'master' into hide-password | Kevin Serrano | 2017-03-23 | 2 | -4/+2 |
| | |\ |
|
| | | * | Merge branch 'master' into i1193-errorstylefix | Dan Finlay | 2017-03-23 | 2 | -3/+5 |
| | | |\ |
|
| | | * | | Fix styling of error message. | Kevin Serrano | 2017-03-23 | 2 | -4/+2 |
| | * | | | Merge branch 'master' into hide-password | Kevin Serrano | 2017-03-23 | 2 | -3/+5 |
| | |\ \ \
| | | | |/
| | | |/| |
|
| | * | | | Hide the password in the private key retrieval screen. | Kevin Serrano | 2017-03-23 | 1 | -0/+1 |
| | | |/
| | |/| |
|
| * | | | Merge branch 'master' into i238-kovan | Dan Finlay | 2017-03-23 | 2 | -3/+5 |
| |\ \ \
| | | |/
| | |/| |
|
| * | | | Add Kovan test network to our application. | Kevin Serrano | 2017-03-23 | 1 | -0/+9 |
| * | | | Add kovan to drop-menu-item | Kevin Serrano | 2017-03-23 | 1 | -1/+4 |
| * | | | Add conditional kovan to current network component. | Kevin Serrano | 2017-03-23 | 1 | -0/+12 |
| * | | | Add kovan conditional to config screen. | Kevin Serrano | 2017-03-23 | 1 | -0/+5 |
| * | | | Add conditional kovan logic to etherscan link generators. | Kevin Serrano | 2017-03-23 | 2 | -2/+7 |
| * | | | Modify css rule for unused hollow diamond. | Kevin Serrano | 2017-03-23 | 1 | -1/+1 |
| | |/
| |/| |
|
* | | | Merge branch 'master' into i1234-HardGasLimits-BrowserForm | Kevin Serrano | 2017-03-23 | 2 | -3/+5 |
|\ \ \
| | |/
| |/| |
|
| * | | Merge branch 'master' into i1033-spinnerfix | kumavis | 2017-03-23 | 3 | -45/+74 |
| |\| |
|
| * | | 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 | 2 | -5/+3 |
| * | | Add action to hide loading indication on an incorrect pw. | Kevin Serrano | 2017-03-21 | 1 | -2/+5 |
* | | | Merge branch 'master' into i1234-HardGasLimits-BrowserForm | Dan Finlay | 2017-03-23 | 3 | -46/+75 |
|\ \ \
| | |/
| |/| |
|
| * | | Adjust private key confirmation style and logic. | Kevin Serrano | 2017-03-21 | 3 | -46/+75 |
| |/ |
|
* | | Got basic validations working | Dan Finlay | 2017-03-23 | 5 | -108/+199 |
* | | Some progress | Dan Finlay | 2017-03-23 | 2 | -7/+16 |
|/ |
|
* | Improve personal_sign style | Dan Finlay | 2017-03-17 | 2 | -11/+23 |
* | Merge branch 'master' into i1165-predictive | Kevin Serrano | 2017-03-15 | 4 | -16/+13 |
|\ |
|
| * | Merge branch 'master' into i1211-currencyretention | Kevin Serrano | 2017-03-15 | 1 | -1/+5 |
| |\ |
|
| * | | Rename variables to proper currency state variables. | Kevin Serrano | 2017-03-15 | 4 | -16/+13 |
* | | | Merge branch 'i1165-predictive' of github.com:MetaMask/metamask-plugin into i... | Kevin Serrano | 2017-03-15 | 1 | -1/+5 |
|\ \ \ |
|
| * \ \ | Merge branch 'master' into i1165-predictive | kumavis | 2017-03-15 | 1 | -1/+5 |
| |\ \ \
| | | |/
| | |/| |
|
| | * | | Render config screen from unlock. | Kevin Serrano | 2017-03-14 | 1 | -0/+4 |
| | * | | Display Custom RPC on lock screen. | Kevin Serrano | 2017-03-14 | 1 | -1/+1 |
| | |/ |
|
* | / | Minor change in removing opts object. | Kevin Serrano | 2017-03-15 | 1 | -4/+1 |
|/ / |
|
* | | Add comments. | Kevin Serrano | 2017-03-11 | 2 | -0/+6 |
* | | Allow for adding recently used addresses to address book. | Kevin Serrano | 2017-03-10 | 3 | -4/+36 |
* | | Create persistence address book. | Kevin Serrano | 2017-03-10 | 1 | -0/+1 |
* | | Create distinct labels and names for addresses. | Kevin Serrano | 2017-03-10 | 1 | -1/+5 |
* | | Display owned addresses in datalist. | Kevin Serrano | 2017-03-10 | 2 | -0/+12 |
|/ |
|
* | Add ENS click to copy | Dan Finlay | 2017-03-09 | 1 | -9/+8 |
* | Get basic ENS working | Dan Finlay | 2017-03-09 | 11 | -59/+188 |
|\ |
|
| * | Add more informative message | Kevin Serrano | 2017-03-09 | 1 | -0/+6 |
| * | 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 | 2 | -21/+10 |
| * | Merge branch 'master' into i1144-moarrpc | Kevin Serrano | 2017-03-08 | 5 | -41/+93 |
| |\ |
|
| | * | Remove log | Dan Finlay | 2017-03-07 | 1 | -1/+0 |
| | * | Render personal_sign messages as utf-8 text | Dan Finlay | 2017-03-07 | 2 | -12/+46 |
| | * | Prevent submission of invalid gas parameters. | Kevin Serrano | 2017-03-02 | 2 | -3/+26 |
| | * | Various improvements to gas input. | Kevin Serrano | 2017-03-02 | 3 | -27/+22 |
| | * | Only allow numbers in gas inputs | Dan Finlay | 2017-03-02 | 1 | -0/+1 |
| * | | Break out rpc update and rpclist into two reducers. | Kevin Serrano | 2017-03-08 | 3 | -11/+31 |
| * | | More conflict resolution. | Kevin Serrano | 2017-03-02 | 2 | -2/+10 |
| |\ \ |
|
| | * \ | Merge branch 'master' into i1144-moarrpc | Dan Finlay | 2017-02-28 | 10 | -87/+263 |
| | |\ \ |
|
| | * | | | Concatenate custom RPC labels that are too long | Dan Finlay | 2017-02-28 | 1 | -1/+9 |
| * | | | | Fix merge conflicts. | Kevin Serrano | 2017-03-02 | 14 | -180/+534 |
| |\ \ \ \
| | |/ / /
| |/| | /
| | | |/
| | |/| |
|
| * | | | Tested against code to play nice with unit tests. | Kevin Serrano | 2017-02-24 | 3 | -8/+17 |
| * | | | Make the UI play nice with empty RPC lists. | Kevin Serrano | 2017-02-23 | 1 | -1/+1 |
| * | | | Linto | Kevin Serrano | 2017-02-23 | 1 | -1/+1 |
| * | | | Implemented functionality for displaying recent custom RPCs | Kevin Serrano | 2017-02-23 | 2 | -2/+26 |
| * | | | Connect to actions. | Kevin Serrano | 2017-02-22 | 2 | -0/+2 |
* | | | | Add ens recognition to send form input | Dan Finlay | 2017-03-01 | 2 | -5/+143 |
* | | | | Fix loading indication for conf-tx view | Dan Finlay | 2017-03-01 | 1 | -1/+1 |
| |/ /
|/| | |
|
* | | | Add reset button to reset gas fields. | Kevin Serrano | 2017-03-01 | 2 | -4/+20 |
* | | | Merge branch 'i765-gaslimits' of github.com:MetaMask/metamask-plugin into i76... | Dan Finlay | 2017-03-01 | 1 | -2/+12 |
|\ \ \ |
|
| * \ \ | Merge branch 'i765-gaslimits' of github.com:MetaMask/metamask-plugin into i76... | Kevin Serrano | 2017-03-01 | 2 | -3/+3 |
| |\ \ \ |
|
| * | | | | Gas and Gaslimit revert to default if set to 0 | Kevin Serrano | 2017-03-01 | 1 | -2/+12 |
* | | | | | Add a couple more debug logs | Dan Finlay | 2017-03-01 | 1 | -0/+1 |
| |/ / /
|/| | | |
|
* | | | | Merge branch 'i765-gaslimits' of github.com:MetaMask/metamask-plugin into i76... | Dan Finlay | 2017-03-01 | 1 | -18/+4 |
|\| | | |
|
| * | | | lints | Kevin Serrano | 2017-03-01 | 1 | -3/+0 |
| * | | | Remove advanced options for now. | Kevin Serrano | 2017-03-01 | 1 | -15/+4 |
* | | | | Use correct action to update and submit tx | Dan Finlay | 2017-03-01 | 2 | -3/+3 |
|/ / / |
|
* | | | Merge branch 'i765-gaslimits' of github.com:MetaMask/metamask-plugin into i76... | Dan Finlay | 2017-03-01 | 1 | -0/+2 |
|\ \ \ |
|
| * | | | lint | Kevin Serrano | 2017-03-01 | 1 | -2/+4 |
* | | | | Linted | Dan Finlay | 2017-03-01 | 2 | -4/+2 |
* | | | | Merge branch 'i765-gaslimits' of github.com:MetaMask/metamask-plugin into i76... | Dan Finlay | 2017-03-01 | 2 | -4/+17 |
|\| | | |
|
| * | | | Hide gas options behind an advanced options checkbox. | Kevin Serrano | 2017-03-01 | 1 | -4/+16 |
| * | | | Merge branch 'i765-gaslimits' of github.com:MetaMask/metamask-plugin into i76... | Kevin Serrano | 2017-03-01 | 1 | -1/+1 |
| |\ \ \ |
|
| * \ \ \ | Merge branch 'i765-gaslimits' of github.com:MetaMask/metamask-plugin into i76... | Kevin Serrano | 2017-03-01 | 2 | -2/+3 |
| |\ \ \ \ |
|
| * \ \ \ \ | Merge branch 'i765-gaslimits' of github.com:MetaMask/metamask-plugin into i76... | Kevin Serrano | 2017-03-01 | 2 | -30/+39 |
| |\ \ \ \ \ |
|
| * | | | | | | Add margins to align. | Kevin Serrano | 2017-03-01 | 1 | -0/+1 |
* | | | | | | | Remove gasMultiplier txMeta param | Dan Finlay | 2017-03-01 | 3 | -84/+7 |
| |_|_|/ / /
|/| | | | | |
|
* | | | | | | Fix bug that showed conf-tx screen on boot at wrong times | Dan Finlay | 2017-03-01 | 1 | -1/+1 |
| |_|/ / /
|/| | | | |
|
* | | | | | Fixed bug that made send screen sometimes transition to account detail | Dan Finlay | 2017-03-01 | 2 | -2/+3 |
| |/ / /
|/| | | |
|
* | | | | Fix infinite loop bug | Dan Finlay | 2017-03-01 | 2 | -30/+39 |
|/ / / |
|
* | | | Fix reference | Dan Finlay | 2017-03-01 | 1 | -1/+1 |
* | | | Reorder rows for better table logic | Dan Finlay | 2017-02-28 | 1 | -32/+37 |
* | | | Emit updated tx values on accept click | Dan Finlay | 2017-02-28 | 2 | -1/+20 |
* | | | Remove unused function | Dan Finlay | 2017-02-28 | 1 | -5/+0 |
* | | | Add action for updating and approving a tx in one action | Dan Finlay | 2017-02-28 | 1 | -0/+15 |
* | | | Got gas live re-estimating | Dan Finlay | 2017-02-28 | 2 | -20/+23 |
* | | | Align input fields for gas. | Kevin Serrano | 2017-02-28 | 1 | -0/+1 |
* | | | Fix merge conflicts. | Kevin Serrano | 2017-02-28 | 2 | -8/+68 |
|\ \ \ |
|
| * | | | Linted | Dan Finlay | 2017-02-28 | 2 | -12/+6 |
| * | | | Add non-working gas recalculating logic to tx-details view | Dan Finlay | 2017-02-28 | 1 | -6/+69 |
* | | | | Further styling to get hex component working. Fix some typos. | Kevin Serrano | 2017-02-28 | 3 | -16/+44 |
|/ / / |
|
* | | | Merge branch 'i765-gaslimits' of github.com:MetaMask/metamask-plugin into i76... | Kevin Serrano | 2017-02-28 | 10 | -73/+249 |
|\ \ \ |
|
| * \ \ | Merge branch 'master' into i765-gaslimits | Dan Finlay | 2017-02-28 | 10 | -73/+249 |
| |\ \ \
| | | |/
| | |/| |
|
| | * | | Improve pending tx blue dot style | Dan Finlay | 2017-02-24 | 2 | -9/+4 |
| | * | | Fix cancel msg signing behavior. | Dan Finlay | 2017-02-24 | 4 | -13/+20 |
| | * | | Make personal sign view look nice | Dan Finlay | 2017-02-24 | 1 | -5/+16 |
| | * | | Got personal_sign working | Dan Finlay | 2017-02-24 | 8 | -48/+133 |
| | * | | Add alternate UI for pending personal_sign messages | Dan Finlay | 2017-02-24 | 2 | -14/+12 |
| | * | | Add personal sign actions and template | Dan Finlay | 2017-02-23 | 4 | -26/+106 |
| | |/ |
|
* | / | Move input boxes into table and into details component. | Kevin Serrano | 2017-02-28 | 3 | -17/+39 |
|/ / |
|
* | | Make gasPrice accessible to the UI. | Kevin Serrano | 2017-02-25 | 1 | -2/+1 |
* | | Merge github.com:MetaMask/metamask-plugin into i765-gaslimits | Kevin Serrano | 2017-02-24 | 5 | -3/+46 |
|\| |
|
| * | Fix UI Dev Mode for Tx Approval | Dan Finlay | 2017-02-21 | 2 | -0/+10 |
| * | Merge branch 'master' into i1128-noticesdev | Dan Finlay | 2017-02-21 | 2 | -0/+24 |
| |\ |
|
| | * | Set default log levels | Dan Finlay | 2017-02-21 | 1 | -0/+1 |
| | * | Add debug logging to ui routing logic. | Dan Finlay | 2017-02-21 | 2 | -0/+23 |
| * | | Notices must be scrolled down to proceed from. | Kevin Serrano | 2017-02-21 | 1 | -0/+9 |
| * | | Fix typo. | Kevin Serrano | 2017-02-21 | 1 | -2/+2 |
| * | | Re-enable notices on dev. | Kevin Serrano | 2017-02-21 | 1 | -1/+1 |
| |/ |
|
* | | Broke hex decimal input into its own component | Dan Finlay | 2017-02-18 | 3 | -25/+71 |
* | | Change state to props, add modifiable fields. | Kevin Serrano | 2017-02-18 | 2 | -28/+54 |
|/ |
|
* | Merge branch 'master' into i1089-networkfront | Kevin Serrano | 2017-02-16 | 1 | -0/+9 |
|\ |
|
| * | Revert old style message sighing | Frankie | 2017-02-10 | 1 | -0/+9 |
* | | Remove custom RPC option when on lock screen. | Kevin Serrano | 2017-02-16 | 1 | -1/+1 |
* | | Change networks from lock screen. | Kevin Serrano | 2017-02-16 | 2 | -7/+7 |
* | | fix debug | Kevin Serrano | 2017-02-10 | 1 | -1/+1 |
* | | Prevent notices from opening in test and debug mode. | Kevin Serrano | 2017-02-10 | 1 | -1/+1 |
* | | Delete all code related to disclaimers. | Kevin Serrano | 2017-02-10 | 4 | -155/+13 |
|/ |
|
* | 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 |
* | Merge branch 'dev' into messageManagerCleanUp | Frankie | 2017-02-02 | 1 | -1/+1 |
|\ |
|
| * | default a return of an empty array | Frankie | 2017-02-02 | 1 | -1/+1 |
| * | linting | Frankie | 2017-02-02 | 1 | -1/+1 |
| * | fix transactions not showing up in history | Frankie | 2017-02-02 | 1 | -1/+1 |
* | | Merge branch 'dev' into messageManagerCleanUp | Frankie | 2017-02-02 | 13 | -39/+22 |
|\| |
|
| * | rename selectedAccount to selectedAddress | kumavis | 2017-01-31 | 13 | -39/+22 |
* | | code clan up and tests | Frankie | 2017-02-02 | 1 | -3/+3 |
* | | Merge branch 'dev' into messageManagerCleanUp | Frankie | 2017-01-29 | 3 | -5/+6 |
|\| |
|
| * | migration 5 - move keyring controller state to substate | kumavis | 2017-01-29 | 3 | -5/+6 |
* | | Clean up message manger includes: | Frankie | 2017-01-29 | 13 | -49/+52 |
|/ |
|
* | Merge branch 'dev' of github.com:MetaMask/metamask-plugin into kumavis-refactor2 | kumavis | 2017-01-27 | 1 | -2/+0 |
|\ |
|
| * | Fix ui overlap | Frankie | 2017-01-27 | 1 | -2/+0 |
* | | metamask controller - cleanup remote api | kumavis | 2017-01-27 | 1 | -2/+1 |
|/ |
|
* | Merge branch 'dev' into i#1048 | kumavis | 2017-01-25 | 8 | -12/+107 |
|\ |
|
| * | Merge pull request #1050 from MetaMask/fixConfTxBalanceLogic | kumavis | 2017-01-25 | 1 | -1/+1 |
| |\ |
|
| | * | fix base | Frankie | 2017-01-25 | 1 | -2/+2 |
| | * | Fix issue where ConfTx view lets you approve txs when the account has insuffi... | Frankie | 2017-01-25 | 1 | -1/+1 |
| * | | 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 |
| * | | Merge branch 'dev' into i715-AddJsonImport | Dan Finlay | 2017-01-19 | 1 | -1/+1 |
| |\| |
|
| * | | Add ability to import v3 JSON wallets | Dan Finlay | 2017-01-19 | 4 | -5/+14 |
| * | | Implement naieve JSON file importing | Dan Finlay | 2017-01-19 | 2 | -5/+76 |
| * | | Added new modular private key import system | Dan Finlay | 2017-01-19 | 2 | -2/+17 |
* | | | 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 |
| |/
|/| |
|
* | | Merge branch 'master' into Version-3.1.0 | Dan Finlay | 2017-01-19 | 1 | -1/+1 |
|\ \
| |/
|/| |
|
| * | Merge branch 'master' into fixSignedVsSubmitted | Frankie | 2017-01-19 | 5 | -10/+11 |
| |\ |
|
| * | | Fix the dissplay for submitted transactions and the listner wating to hear wh... | Frankie | 2017-01-19 | 1 | -1/+1 |
* | | | Fix test to log out despite number of menu items | Dan Finlay | 2017-01-18 | 1 | -1/+1 |
* | | | Remove outdated reference | Dan Finlay | 2017-01-18 | 1 | -4/+0 |
* | | | Remove unused UI files | Dan Finlay | 2017-01-18 | 2 | -109/+0 |
* | | | Allow importing of private key strings | Dan Finlay | 2017-01-18 | 4 | -8/+95 |
* | | | Merge branch 'i328-MultiVault-v1' into i715-AddImportMenu | Dan Finlay | 2017-01-18 | 15 | -74/+368 |
|\ \ \ |
|
| * | | | Develop import subviews | Dan Finlay | 2016-11-05 | 5 | -17/+86 |
| * | | | Add import account placeholder template | Dan Finlay | 2016-11-05 | 3 | -30/+71 |
| * | | | Linted | Dan Finlay | 2016-11-05 | 3 | -12/+8 |
| * | | | Add account adding subview placeholders | Dan Finlay | 2016-11-05 | 4 | -39/+121 |
| * | | | Remove unused class | Dan Finlay | 2016-11-05 | 1 | -1/+1 |
| * | | | Convert buy subview to new tab bar component | Dan Finlay | 2016-11-05 | 1 | -36/+47 |
| * | | | Scaffold new account view | Dan Finlay | 2016-11-05 | 7 | -1/+125 |
* | | | | Add "import account" menu item + template view | Dan Finlay | 2017-01-18 | 4 | -0/+63 |
* | | | | Fix message signing UI rendering | Dan Finlay | 2017-01-17 | 1 | -5/+10 |
| |_|/
|/| | |
|
* | | | Merge branch 'master' into dev | Dan Finlay | 2017-01-17 | 4 | -8/+7 |
|\ \ \ |
|
| * | | | update coinbase info and view | Frankie | 2017-01-11 | 2 | -5/+5 |
| * | | | remove network Id 2 from explorer link and Add network Id 3 | Frances Pangilinan | 2016-12-21 | 2 | -3/+2 |
* | | | | Dont render conf-tx if their are no txParams to show | Frankie | 2017-01-15 | 1 | -2/+4 |
| |_|/
|/| | |
|
* | | | remove orphaned comment | Frankie | 2017-01-14 | 1 | -1/+0 |
* | | | lint | Frankie | 2017-01-14 | 1 | -1/+1 |
* | | | Clean up code | Frankie | 2017-01-14 | 3 | -33/+37 |
* | | | Fix sorting and instances where something could be undefined | Frankie | 2017-01-12 | 3 | -4/+5 |
* | | | Merge branch 'dev' into integrateTxManagerUI | Frankie | 2017-01-12 | 1 | -5/+4 |
|\ \ \ |
|
| * | | | Send update to UI when changing selected account | Dan Finlay | 2017-01-12 | 1 | -5/+4 |
* | | | | Fix wording and icon of failed txs | Frankie | 2017-01-12 | 1 | -0/+6 |
* | | | | Take some of the tx Logic out of the UI and create a visble state for pending... | Frankie | 2017-01-12 | 6 | -45/+40 |
|/ / / |
|
* | | | quick typo fix. | Kevin Serrano | 2017-01-07 | 1 | -2/+2 |
* | | | Switch order of header and indicator. | Kevin Serrano | 2017-01-06 | 1 | -1/+1 |
* | | | Linting. | Kevin Serrano | 2017-01-05 | 2 | -2/+1 |
* | | | Make network somewhat more modular, add new network indicator. | Kevin Serrano | 2017-01-05 | 4 | -17/+24 |
* | | | 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 |
* | | | Merge remote-tracking branch 'origin/kumavis-readme-gource' into RevertTxManager | Dan Finlay | 2017-01-03 | 1 | -2/+2 |
|\ \ \ |
|
| * \ \ | Merge branch 'dev' into TxManager | Frankie | 2016-12-24 | 4 | -16/+57 |
| |\ \ \ |
|
| * \ \ \ | Merge branch 'dev' into TxManager | Frankie | 2016-12-22 | 12 | -49/+255 |
| |\ \ \ \ |
|
| * | | | | | First pass at revision requests | Frances Pangilinan | 2016-12-22 | 1 | -2/+2 |
* | | | | | | Fix rendering of loose accounts | Dan Finlay | 2016-12-24 | 2 | -3/+5 |
* | | | | | | Show a "LOOSE" warning on accounts not belonging to HD Seed phrase | Dan Finlay | 2016-12-23 | 3 | -7/+42 |
| |_|/ / /
|/| | | | |
|
* | | | | | Merge pull request #948 from MetaMask/RecoverLostAccounts | Dan Finlay | 2016-12-23 | 4 | -16/+57 |
|\ \ \ \ \
| |_|/ / /
|/| | | | |
|
| * | | | | Rename function to be an action | Dan Finlay | 2016-12-23 | 1 | -2/+2 |
| * | | | | Linted | Dan Finlay | 2016-12-21 | 3 | -5/+3 |
| * | | | | Make notices confirmation configurable | Dan Finlay | 2016-12-21 | 4 | -13/+56 |
* | | | | | Lint. | Kevin Serrano | 2016-12-21 | 1 | -1/+1 |
* | | | | | Validate URIs before entering them in. | Kevin Serrano | 2016-12-21 | 1 | -2/+26 |
|/ / / / |
|
* | | | | Merge pull request #937 from MetaMask/i900-forgot-password-flow | Dan Finlay | 2016-12-20 | 5 | -22/+28 |
|\ \ \ \ |
|
| * | | | | Modify actions to support better transition. | Kevin Serrano | 2016-12-20 | 3 | -1/+18 |
| * | | | | Lint. | Kevin Serrano | 2016-12-20 | 1 | -2/+2 |
| * | | | | Redirect to seed word screen for forgotten passwords. | Kevin Serrano | 2016-12-20 | 4 | -20/+9 |
* | | | | | Merged master into dev | Dan Finlay | 2016-12-20 | 9 | -25/+201 |
|\ \ \ \ \
| |/ / / /
|/| | / /
| | |/ /
| |/| | |
|
| * | | | Clean up first notice | Dan Finlay | 2016-12-17 | 1 | -2/+1 |
| * | | | Add date to notices display. | Kevin Serrano | 2016-12-17 | 1 | -1/+15 |
| * | | | clean - code style | kumavis | 2016-12-17 | 1 | -4/+0 |
| * | | | Add ability to show notices to user & get confirmation. | Kevin Serrano | 2016-12-17 | 2 | -1/+5 |
| * | | | Add ability to show notices to user & get confirmation. | Kevin Serrano | 2016-12-17 | 6 | -0/+187 |
| * | | | Remove morden testnet provider | Dan Finlay | 2016-12-16 | 4 | -25/+1 |
* | | | | Revert "Interface enhancements" | Dan Finlay | 2016-12-17 | 11 | -54/+101 |
* | | | | Fixed header h1 alignment and network name | Luis Iván Cuende | 2016-12-15 | 2 | -5/+3 |
* | | | | Better account details view | Luis Iván Cuende | 2016-12-15 | 5 | -42/+14 |
* | | | | Better editable label | Luis Iván Cuende | 2016-12-15 | 5 | -40/+15 |
* | | | | Better buttons | Luis Iván Cuende | 2016-12-14 | 2 | -4/+9 |
* | | | | Beautified disclaimer | Luis Iván Cuende | 2016-12-14 | 3 | -11/+14 |
| |/ /
|/| | |
|
* | | | Fix vault encrypting & unlocking bug | Dan Finlay | 2016-12-01 | 2 | -7/+32 |
* | | | 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 tx adding code | Dan Finlay | 2016-11-30 | 1 | -25/+0 |
* | | | Merge branch 'master' into dev | Dan Finlay | 2016-11-24 | 1 | -3/+3 |
|\| | |
|
| * | | Merge branch 'master' into new-faucet | Dan Finlay | 2016-11-23 | 1 | -2/+2 |
| |\ \ |
|
| | * | | Add temporary morden explorer link support | Dan Finlay | 2016-11-22 | 1 | -1/+1 |
| | * | | Add ropsten link support | Dan Finlay | 2016-11-22 | 1 | -2/+2 |
| * | | | Ropsten has sole access to the faucet. | Kevin Serrano | 2016-11-23 | 1 | -3/+3 |
| * | | | Add to changelog. | Kevin Serrano | 2016-11-23 | 1 | -1/+1 |
| |/ / |
|
* | | | Cosmetic changes, rename links. | Kevin Serrano | 2016-11-24 | 1 | -9/+9 |
* | | | Add link back to unlock. | Kevin Serrano | 2016-11-24 | 1 | -0/+16 |
* | | | Fix proper behavior for restoring accounts when password forgotten. | Kevin Serrano | 2016-11-24 | 2 | -0/+2 |
* | | | Modify forgot password flow to go back to init screen. | Kevin Serrano | 2016-11-24 | 2 | -36/+1 |
* | | | Fix undefined provider menu item | Dan Finlay | 2016-11-23 | 1 | -2/+5 |
* | | | Linted | Dan Finlay | 2016-11-23 | 1 | -1/+1 |
* | | | Merge pull request #858 from MetaMask/i842-WaitForSeedWord | kumavis | 2016-11-23 | 2 | -5/+7 |
|\ \ \ |
|
| * | | | Restore ropsten link support | Dan Finlay | 2016-11-23 | 1 | -3/+3 |
| * | | | Merge branch 'dev' into i842-WaitForSeedWord | Dan Finlay | 2016-11-23 | 1 | -2/+2 |
| |\ \ \ |
|
| * | | | | Use callback in placeSeedWord method. | Dan Finlay | 2016-11-22 | 1 | -2/+4 |
* | | | | | Merge branch 'dev' into dev-cleanup | Kevin Serrano | 2016-11-23 | 1 | -2/+2 |
|\ \ \ \ \
| | |/ / /
| |/| | | |
|
| * | | | | Make ropsten faucet button point at the correct url. | Kevin Serrano | 2016-11-23 | 1 | -2/+2 |
| |/ / / |
|
* | | | | Fix camel casing on setSelectedAccount action. | Dan Finlay | 2016-11-22 | 3 | -4/+4 |
* | | | | 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 | 9 | -21/+20 |
* | | | | Remove entropy from encryption and project. | Kevin Serrano | 2016-11-22 | 2 | -3/+3 |
|/ / / |
|
* | | | Merge pull request #837 from MetaMask/FixMenuItem | Kevin Serrano | 2016-11-22 | 1 | -7/+8 |
|\ \ \ |
|
| * | | | Fix custom provider menu item | Dan Finlay | 2016-11-22 | 1 | -7/+8 |
* | | | | Merge branch 'dev' into i831-AddRopsten-Dev | Dan Finlay | 2016-11-22 | 31 | -509/+6078 |
|\| | |
| |/ /
|/| | |
|
| * | | Convert conversion util to pure json. | Kevin Serrano | 2016-11-19 | 3 | -6/+5731 |