Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Gas and Gaslimit revert to default if set to 0 | Kevin Serrano | 2017-03-01 | 1 | -2/+12 |
| | |||||
* | lints | Kevin Serrano | 2017-03-01 | 1 | -3/+0 |
| | |||||
* | Remove advanced options for now. | Kevin Serrano | 2017-03-01 | 1 | -15/+4 |
| | |||||
* | Merge branch 'i765-gaslimits' of github.com:MetaMask/metamask-plugin into ↵ | Dan Finlay | 2017-03-01 | 1 | -0/+2 |
|\ | | | | | | | i765-gaslimits | ||||
| * | 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 ↵ | Dan Finlay | 2017-03-01 | 2 | -4/+17 |
|\| | | | | | | | i765-gaslimits | ||||
| * | 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 ↵ | Kevin Serrano | 2017-03-01 | 2 | -2/+3 |
| |\ | | | | | | | | | | i765-gaslimits | ||||
| * \ | Merge branch 'i765-gaslimits' of github.com:MetaMask/metamask-plugin into ↵ | Kevin Serrano | 2017-03-01 | 2 | -30/+39 |
| |\ \ | | | | | | | | | | | | | i765-gaslimits | ||||
| * | | | Add margins to align. | Kevin Serrano | 2017-03-01 | 1 | -0/+1 |
| | | | | |||||
* | | | | Remove gasMultiplier txMeta param | Dan Finlay | 2017-03-01 | 3 | -84/+7 |
| |_|/ |/| | | | | | | | | | | | | | | This was used by the custom gas slider on the `send` screen, and it was used to modify the gas value before sending it out, breaking our new custom gas field logic. Removed it and the logic that referred to this now-outdated parameter. | ||||
* | | | 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 ↵ | Kevin Serrano | 2017-02-28 | 8 | -67/+238 |
|\ | | | | | | | i765-gaslimits | ||||
| * | Merge branch 'master' into i765-gaslimits | Dan Finlay | 2017-02-28 | 8 | -67/+238 |
| |\ | |||||
| | * | 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 | 6 | -47/+130 |
| | | | | | | | | | | | | Also fixed bug where signing would not close popup. | ||||
| | * | 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 | 3 | -21/+98 |
| | | | |||||
* | | | 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 | 3 | -3/+37 |
|\| | |||||
| * | Fix UI Dev Mode for Tx Approval | Dan Finlay | 2017-02-21 | 1 | -0/+5 |
| | | | | | | | | | | | | | | | | | | | | The state object had been changed, but our mock states for tx approval were using the old keys. Rather than try to muck about and figure out each and every change, I've re-generated a UI dev state for tx approval, which should help @zanibas on his current project. We can continue adding new dev states as needed from here. If anyone catches a state that doesn't render correctly, it's worth checking if a new snapshot doesn't solve things. Debugged by adding new debugging loggers, and I've left them in place for easier future debugging. | ||||
| * | Merge branch 'master' into i1128-noticesdev | Dan Finlay | 2017-02-21 | 1 | -0/+20 |
| |\ | |||||
| | * | Add debug logging to ui routing logic. | Dan Finlay | 2017-02-21 | 1 | -0/+20 |
| | | | |||||
| * | | 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 |
| | | | | | | | | Also added a new state to try to make UI dev mode work again, but it has other issues, like #1128, that need to be addressed before UI dev mode can be used again. | ||||
* | | 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 |
| | | | | Rendering the list is still having issues, so this isn't done yet. | ||||
* | 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 | 10 | -41/+44 |
|/ | | | | | | | | | Provider egine bump Remove presence of message manger in keyring controller Change the status wording fom conf to approved make Message manager a class fix messages not being apart of the badge re write message manger to better reflect controller pattern | ||||
* | 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 conf tx balance logic | ||||
| | * | fix base | Frankie | 2017-01-25 | 1 | -2/+2 |
| | | | |||||
| | * | Fix issue where ConfTx view lets you approve txs when the account has ↵ | Frankie | 2017-01-25 | 1 | -1/+1 |
| | | | | | | | | | | | | insufficient balance | ||||
| * | | Merge pull request #1051 from MetaMask/hotfix1048 | Frankie | 2017-01-25 | 1 | -2/+2 |
| |\ \ | | |/ | |/| | hotfix - addNewAccount - dont assume hd keyring position | ||||
| | * | 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 |
| | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | | Implement naieve JSON file importing | Dan Finlay | 2017-01-19 | 2 | -5/+76 |
| | | | | | | | | | | | | 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. | ||||
| * | | Added new modular private key import system | Dan Finlay | 2017-01-19 | 2 | -2/+17 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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! | ||||
* | | | 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 | 4 | -9/+10 |
| |\ | |||||
| * | | Fix the dissplay for submitted transactions and the listner wating to hear ↵ | Frankie | 2017-01-19 | 1 | -1/+1 |
| | | | | | | | | | | | | when tx's were included in a block | ||||
* | | | 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 |
| | | | | | | | | | | | | | | | | | | | | | | | | 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`. | ||||
* | | | Merge branch 'i328-MultiVault-v1' into i715-AddImportMenu | Dan Finlay | 2017-01-18 | 14 | -74/+367 |
|\ \ \ | |||||
| * | | | Develop import subviews | Dan Finlay | 2016-11-05 | 4 | -16/+85 |
| | | | | |||||
| * | | | Add import account placeholder template | Dan Finlay | 2016-11-05 | 2 | -30/+70 |
| | | | | |||||
| * | | | 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 |
| |_|/ |/| | | | | | | | | | | | | | | [A recent PR](https://github.com/MetaMask/metamask-plugin/pull/1004) removed logic that rendered pending messages for approval. This commit fixes that. | ||||
* | | | Merge branch 'master' into dev | Dan Finlay | 2017-01-17 | 3 | -7/+6 |
|\ \ \ | |||||
| * | | | 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 | 1 | -2/+1 |
| | | | | |||||
* | | | | 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 |
| | | | | | | | | | | | | | | | | Fixes #981 | ||||
* | | | | 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 ↵ | Frankie | 2017-01-12 | 6 | -45/+40 |
|/ / / | | | | | | | | | | pending and unaproved transactions | ||||
* | | | 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 |
| | | | | | | | | | | | | | | | | | | Fixed by finally making a function generator for a pattern we use frequently, communicating to the background process. Fixes #961 | ||||
* | | | 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 | 3 | -16/+34 |
| |\ \ \ | |||||
| * \ \ \ | 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 | 3 | -16/+34 |
|\ \ \ \ \ | |_|/ / / |/| | | | | Auto-Recover accounts lost to BIP44 derivation fix | ||||
| * | | | | Rename function to be an action | Dan Finlay | 2016-12-23 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Linted | Dan Finlay | 2016-12-21 | 2 | -4/+2 |
| | | | | | |||||
| * | | | | Make notices confirmation configurable | Dan Finlay | 2016-12-21 | 3 | -13/+33 |
| | | | | | | | | | | | | | | | | | | | | - Confirm button will now dismiss the lost accounts array. | ||||
* | | | | | 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 |
|\ \ \ \ | | | | | | | | | | | I900 forgot password flow | ||||
| * | | | | 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 |
| | | | | | | | | | | | | | | | | | | | | Remove redundant title from notice component. Make link color the same orange as the rest of the UI. | ||||
| * | | | 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 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement generation of markdown for notice files. Create npm command. Enhance notice generation. Add test files to test multiple notices. Add basic markdown support to notices. Interval checks for updates. Add extensionizer and linker Add terms and conditions state file Add link support to disclaimer. Changelog addition. | ||||
| * | | | Add ability to show notices to user & get confirmation. | Kevin Serrano | 2016-12-17 | 6 | -0/+187 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement generation of markdown for notice files. Create npm command. Enhance notice generation. Add test files to test multiple notices. Add basic markdown support to notices. Interval checks for updates. Add extensionizer and linker Add terms and conditions state file Add link support to disclaimer. Changelog addition. | ||||
| * | | | Remove morden testnet provider | Dan Finlay | 2016-12-16 | 4 | -25/+1 |
| | | | | | | | | | | | | | | | | Instances configured to point at Morden will now point at Ropsten. | ||||
* | | | | 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 |
| | | | | | | | | | | | | | | | | | | | | | | | | This is only a bug in dev, but was committed yesterday. Sometimes the `encrypt` method was being passed values other than the password as the encryption key, leading to un-unlockable vaults. To find this, and avoid it for all time hereafter, I added several more steps to our oft-neglected integration test suite, which now fully initializes a vault, locks it, and unlocks it again, to make sure all of those steps definitely work always. | ||||
* | | | 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 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Broken in this commit: https://github.com/MetaMask/metamask-plugin/commit/bc39cd7b894ddf0f3724d4af3cfc30c2638e0939 Synchronous methods were added to an `async.waterfall` array. This commit also removes the delegate call checking, since we concluded it was misinformed. | ||||
* | | | Merge branch 'master' into dev | Dan Finlay | 2016-11-24 | 1 | -3/+3 |
|\| | | |||||
| * | | 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 |
| | | | |||||
* | | | Merge pull request #858 from MetaMask/i842-WaitForSeedWord | kumavis | 2016-11-23 | 1 | -2/+4 |
|\ \ \ | | | | | | | | | I842 wait for seed word | ||||
| * \ \ | 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 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When displaying seed words, we were not using a callback, which had some race condition potential. This is simply a little cleaner and more correct. Fixes #842 | ||||
* | | | | | 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 | 2 | -3/+3 |
| | | | | |||||
* | | | | 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 | 8 | -17/+16 |
| | | | | |||||
* | | | | 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 | ||||
| * | | | Fix custom provider menu item | Dan Finlay | 2016-11-22 | 1 | -7/+8 |
| | | | | | | | | | | | | | | | | The Custom RPC menu item in the provider menu would not appear when Localhost:8545 was selected. | ||||
* | | | | Merge branch 'dev' into i831-AddRopsten-Dev | Dan Finlay | 2016-11-22 | 27 | -500/+6070 |
|\| | | | |/ / |/| | | |||||
| * | | Convert conversion util to pure json. | Kevin Serrano | 2016-11-19 | 3 | -6/+5731 |
| | | | |||||
| * | | 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 |
| | | | |||||
| * | | Re-enable disclaimer screen. Rename variables to reflect role more clearly. | Kevin Serrano | 2016-11-15 | 2 | -4/+4 |
| | | | |||||
| * | | Fix lint rules for ternary operator placement. | Kevin Serrano | 2016-11-12 | 1 | -18/+18 |
| | | | |||||
| * | | Typo fix. | Kevin Serrano | 2016-11-12 | 1 | -9/+9 |
| | | | |||||
| * | | Linting to the max. | Kevin Serrano | 2016-11-12 | 13 | -43/+29 |
| | | | |||||
| * | | Merge branch 'master' into i328-MultiVault | kumavis | 2016-11-11 | 2 | -2/+6 |
| |\ \ | |||||
| * \ \ | Merge branch 'master' into i328-MultiVault | kumavis | 2016-11-11 | 1 | -0/+9 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'master' into i328-MultiVault | Frankie | 2016-11-11 | 3 | -16/+11 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'master' into i328-MultiVault | Dan Finlay | 2016-11-08 | 1 | -1/+1 |
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||||
| * | | | | | Remove insane actions hash | Dan Finlay | 2016-11-05 | 1 | -6/+2 |
| | | | | | | |||||
| * | | | | | Add reveal of seed words. | Kevin Serrano | 2016-11-02 | 3 | -0/+43 |
| | | | | | | |||||
| * | | | | | Make identicon tolerant of changing state | Dan Finlay | 2016-11-02 | 1 | -0/+17 |
| | | | | | | |||||
| * | | | | | Fixed bugs related to clearing caches when restoring to a new vault | Dan Finlay | 2016-11-02 | 3 | -3/+6 |
| | | | | | | |||||
| * | | | | | Make forgot password button. | Dan Finlay | 2016-11-02 | 3 | -32/+23 |
| | | | | | | |||||
| * | | | | | Fix seed phrase restore | Dan Finlay | 2016-11-02 | 2 | -4/+3 |
| | | | | | | |||||
| * | | | | | Made progress on parity for MultiVault | Kevin Serrano | 2016-11-02 | 6 | -171/+43 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Deleted some unused items - Renamed files and paths to match with new locations. - Modified keyring controller logic to separate concerns. - Fix account naming issues. - Enable creation of new vault with default HD keyring. - Formatting issues. | ||||
| * | | | | | Linted | Kevin Serrano | 2016-11-01 | 1 | -1/+0 |
| | | | | | | |||||
| * | | | | | Implement seed word confirmation page. | Kevin Serrano | 2016-11-01 | 5 | -0/+392 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove logs. Move HD render files to ui/app. | ||||
| * | | | | | Make case condition more consistent. Remove extra action. Fix incorrect ↵ | Kevin Serrano | 2016-10-31 | 2 | -2/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | display of network. | ||||
| * | | | | | Add focus to password field. | Kevin Serrano | 2016-10-31 | 1 | -0/+4 |
| | | | | | | |||||
| * | | | | | Add password warning div. | Kevin Serrano | 2016-10-31 | 1 | -2/+7 |
| | | | | | | |||||
| * | | | | | Modify first-screen design to match docs. | Kevin Serrano | 2016-10-31 | 1 | -2/+3 |
| | | | | | | |||||
| * | | | | | Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into ↵ | Kevin Serrano | 2016-10-29 | 5 | -21/+124 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | i328-MultiVault | ||||
| | * | | | | | Configure BIP44 Keychain as default one | Dan Finlay | 2016-10-29 | 2 | -4/+19 |
| | | | | | | | |||||
| | * | | | | | Fix identicon rendering | Dan Finlay | 2016-10-28 | 1 | -7/+6 |
| | | | | | | | |||||
| | * | | | | | Update first screen to match design. | Dan Finlay | 2016-10-28 | 2 | -10/+99 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'master' into i328-MultiVault | Kevin Serrano | 2016-10-29 | 2 | -9/+8 |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| * | | | | | | Phase out extra warning screen. | Kevin Serrano | 2016-10-26 | 6 | -128/+1 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'master' into i328-MultiVault | Dan Finlay | 2016-10-22 | 2 | -1/+12 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Fix duplicate provider menu item bug | Dan Finlay | 2016-10-22 | 1 | -6/+1 |
| | | | | | | | | |||||
| * | | | | | | | Improved simple account generation | Dan Finlay | 2016-10-21 | 1 | -1/+1 |
| | | | | | | | | |||||
| * | | | | | | | Began adding first basic keyring | Dan Finlay | 2016-10-21 | 3 | -4/+19 |
| | | | | | | | | |||||
| * | | | | | | | Fix tests | Dan Finlay | 2016-10-21 | 1 | -2/+2 |
| | | | | | | | | |||||
| * | | | | | | | Linted & added salting to vault | Dan Finlay | 2016-10-21 | 3 | -8/+4 |
| | | | | | | | | |||||
| * | | | | | | | Fix state updating after vault creation and unlocking | Dan Finlay | 2016-10-21 | 2 | -2/+9 |
| | | | | | | | | |||||
| * | | | | | | | Commented out useless advanced not on init screen | Dan Finlay | 2016-10-21 | 1 | -0/+2 |
| | | | | | | | | |||||
| * | | | | | | | Change actions reference to keyringController to background | Dan Finlay | 2016-10-21 | 1 | -24/+24 |
| | | | | | | | | |||||
| * | | | | | | | Linted | Dan Finlay | 2016-10-21 | 1 | -1/+1 |
| | | | | | | | | |||||
| * | | | | | | | Git merge resolution. | Kevin Serrano | 2016-10-20 | 4 | -38/+179 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | Intermediary commit. | Kevin Serrano | 2016-10-20 | 1 | -24/+24 |
| | | | | | | | | | |||||
| * | | | | | | | | Initial work on UI side | Kevin Serrano | 2016-10-16 | 4 | -1/+56 |
| | | | | | | | | | |||||
| * | | | | | | | | 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 | 7 | -486/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Completely breaking all account maangement, I have removed the opinionated seed-word code from the UI. Web3 injection still seems to work. | ||||
* | | | | | | | | | Begin adding Ropsten support | Dan Finlay | 2016-11-22 | 4 | -3/+31 |
| |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ropsten links will still not work until Etherscan publishes their ropsten link format. At that time we will need to update ui/lib/account-link.js Otherwise, fixes #831 | ||||
* | | | | | | | | lint fix | Frankie | 2016-11-11 | 1 | -1/+2 |
| | | | | | | | | |||||
* | | | | | | | | Fix funny looking errors in conf-tx | Frankie | 2016-11-11 | 2 | -2/+5 |
| |_|_|_|_|_|/ |/| | | | | | | |||||
* | | | | | | | detect tx error - show warning and fix gasLimit | kumavis | 2016-11-11 | 1 | -0/+9 |
| |_|_|_|_|/ |/| | | | | | |||||
* | | | | | | Unify warning functions. | Kevin G. Serrano | 2016-11-08 | 3 | -17/+12 |
| |_|_|_|/ |/| | | | | |||||
* | | | | | Fix github link on info page | Dan Finlay | 2016-11-01 | 1 | -1/+1 |
| |_|_|/ |/| | | | |||||
* | | | | Fix provider menu selection indication | Dan Finlay | 2016-10-26 | 2 | -9/+8 |
| |_|/ |/| | | |||||
* | | | Change regex in isHex function | Frankie | 2016-10-22 | 1 | -4/+1 |
| | | | |||||
* | | | clean up the isHex function | Frankie | 2016-10-22 | 1 | -3/+4 |
| | | | |||||
* | | | Add test and ability for isHex to handle hex strings with hex-prefix | Frankie | 2016-10-20 | 1 | -0/+1 |
| | | | |||||
* | | | Fix up wording | Frankie | 2016-10-20 | 1 | -1/+1 |
| | | | |||||
* | | | Add valdations to txData param | Frankie | 2016-10-20 | 2 | -0/+12 |
| |/ |/| | |||||
* | | Create callback and Clean-up details | Frankie | 2016-10-14 | 3 | -10/+12 |
| | | |||||
* | | fix spelling | Frankie | 2016-10-14 | 1 | -4/+2 |
| | | |||||
* | | Specify base 10 in bignumber | Frankie | 2016-10-14 | 1 | -1/+1 |
| | | |||||
* | | Fix gasPrice range | Frankie | 2016-10-14 | 4 | -16/+12 |
| | | |||||
* | | Merge branch 'master' into i#495CustomGasField | Frankie | 2016-10-12 | 6 | -16/+73 |
|\| | |||||
| * | Merge branch 'master' into i721-ScrollAccountList | Dan Finlay | 2016-10-12 | 5 | -15/+72 |
| |\ | |||||
| | * | Remove logs. | Kevin Serrano | 2016-10-12 | 1 | -3/+0 |
| | | | |||||
| | * | Cleanup. | Kevin Serrano | 2016-10-12 | 2 | -1/+4 |
| | | | |||||
| | * | Move tos hash logic to build phase. Create dynamic global variables based on ↵ | Kevin Serrano | 2016-10-12 | 1 | -1/+1 |
| | | | | | | | | | | | | build. | ||||
| | * | Prevent back/login buttons from appearing on the terms of service. | Kevin Serrano | 2016-10-07 | 1 | -0/+1 |
| | | | |||||
| | * | Rewritten to react standards. Way easier. | Kevin Serrano | 2016-10-05 | 1 | -9/+8 |
| | | | |||||
| | * | Linting. | Kevin Serrano | 2016-10-05 | 1 | -3/+3 |
| | | | |||||
| | * | Rename drop menu item to be consistent with naming. | Kevin Serrano | 2016-10-05 | 1 | -1/+1 |
| | | | |||||
| | * | Add relevant legal links to help page. | Kevin Serrano | 2016-10-05 | 1 | -8/+41 |
| | | | |||||
| | * | Make config page title consistent with menu item. | Kevin Serrano | 2016-10-05 | 1 | -1/+1 |
| | | | |||||
| | * | Add links to relevant legal pages on user agreement page. | Kevin Serrano | 2016-10-05 | 1 | -2/+6 |
| | | | |||||
| | * | Add conditional logic for adding listener. | Kevin Serrano | 2016-10-05 | 1 | -3/+5 |
| | | | |||||
| | * | Add padding to markdown paragraphs. | Kevin Serrano | 2016-10-05 | 1 | -0/+4 |
| | | | |||||
| | * | Merge branch 'master' into tos | Kevin Serrano | 2016-10-05 | 2 | -3/+7 |
| | |\ | |||||
| | * | | Add CSS rules for proper formatting. | Kevin Serrano | 2016-10-05 | 1 | -1/+7 |
| | | | |