aboutsummaryrefslogtreecommitdiffstats
path: root/ui
Commit message (Collapse)AuthorAgeFilesLines
* Get basic ENS workingDan Finlay2017-03-0911-59/+188
|\ | | | | | | & merge master into ENS branch.
| * Add more informative messageKevin Serrano2017-03-091-0/+6
| |
| * Fix typo, switch to log.errorKevin Serrano2017-03-091-3/+3
| |
| * Remove unneeded setrpc method.Kevin Serrano2017-03-091-20/+8
| |
| * Nodeify and promisify calls to background.Kevin Serrano2017-03-091-9/+25
| |
| * Refactor of code into separate reducers and actions.Kevin Serrano2017-03-082-21/+10
| |
| * Merge branch 'master' into i1144-moarrpcKevin Serrano2017-03-085-41/+93
| |\
| | * Remove logDan Finlay2017-03-071-1/+0
| | |
| | * Render personal_sign messages as utf-8 textDan Finlay2017-03-072-12/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Calls to `personal_sign` are now: - When hex encoded, preserved as hex encoded, but displayed as utf-8 text. - When not hex encoded, decoded as utf-8 text as hex for signing. - The messages proposed for signing are displayed as UTF-8 text. - When the message cannot be rendered as UTF-8 text, it is displayed as hexadecimal. Fixes #1173
| | * Prevent submission of invalid gas parameters.Kevin Serrano2017-03-022-3/+26
| | |
| | * Various improvements to gas input.Kevin Serrano2017-03-023-27/+22
| | |
| | * Only allow numbers in gas inputsDan Finlay2017-03-021-0/+1
| | |
| * | Break out rpc update and rpclist into two reducers.Kevin Serrano2017-03-083-11/+31
| | |
| * | More conflict resolution.Kevin Serrano2017-03-022-2/+10
| |\ \
| | * \ Merge branch 'master' into i1144-moarrpcDan Finlay2017-02-2810-87/+263
| | |\ \
| | * | | Concatenate custom RPC labels that are too longDan Finlay2017-02-281-1/+9
| | | | |
| * | | | Fix merge conflicts.Kevin Serrano2017-03-0214-180/+534
| |\ \ \ \ | | |/ / / | |/| | / | | | |/ | | |/|
| * | | Tested against code to play nice with unit tests.Kevin Serrano2017-02-243-8/+17
| | | |
| * | | Make the UI play nice with empty RPC lists.Kevin Serrano2017-02-231-1/+1
| | | |
| * | | LintoKevin Serrano2017-02-231-1/+1
| | | |
| * | | Implemented functionality for displaying recent custom RPCsKevin Serrano2017-02-232-2/+26
| | | |
| * | | Connect to actions.Kevin Serrano2017-02-222-0/+2
| | | |
* | | | Add ens recognition to send form inputDan Finlay2017-03-012-5/+143
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Attempts to lookup `.eth` addresses on ENS. Is currently failing. I've written an isolation example of the problem here: https://github.com/flyswatter/ens-test
* | | | Fix loading indication for conf-tx viewDan Finlay2017-03-011-1/+1
| |/ / |/| |
* | | Add reset button to reset gas fields.Kevin Serrano2017-03-012-4/+20
| | |
* | | Merge branch 'i765-gaslimits' of github.com:MetaMask/metamask-plugin into ↵Dan Finlay2017-03-011-2/+12
|\ \ \ | | | | | | | | | | | | i765-gaslimits
| * \ \ Merge branch 'i765-gaslimits' of github.com:MetaMask/metamask-plugin into ↵Kevin Serrano2017-03-012-3/+3
| |\ \ \ | | | | | | | | | | | | | | | i765-gaslimits
| * | | | Gas and Gaslimit revert to default if set to 0Kevin Serrano2017-03-011-2/+12
| | | | |
* | | | | Add a couple more debug logsDan Finlay2017-03-011-0/+1
| |/ / / |/| | |
* | | | Merge branch 'i765-gaslimits' of github.com:MetaMask/metamask-plugin into ↵Dan Finlay2017-03-011-18/+4
|\| | | | | | | | | | | | | | | i765-gaslimits
| * | | lintsKevin Serrano2017-03-011-3/+0
| | | |
| * | | Remove advanced options for now.Kevin Serrano2017-03-011-15/+4
| | | |
* | | | Use correct action to update and submit txDan Finlay2017-03-012-3/+3
|/ / /
* | | Merge branch 'i765-gaslimits' of github.com:MetaMask/metamask-plugin into ↵Dan Finlay2017-03-011-0/+2
|\ \ \ | | | | | | | | | | | | i765-gaslimits
| * | | lintKevin Serrano2017-03-011-2/+4
| | | |
* | | | LintedDan Finlay2017-03-012-4/+2
| | | |
* | | | Merge branch 'i765-gaslimits' of github.com:MetaMask/metamask-plugin into ↵Dan Finlay2017-03-012-4/+17
|\| | | | | | | | | | | | | | | i765-gaslimits
| * | | Hide gas options behind an advanced options checkbox.Kevin Serrano2017-03-011-4/+16
| | | |
| * | | Merge branch 'i765-gaslimits' of github.com:MetaMask/metamask-plugin into ↵Kevin Serrano2017-03-011-1/+1
| |\ \ \ | | | | | | | | | | | | | | | i765-gaslimits
| * \ \ \ Merge branch 'i765-gaslimits' of github.com:MetaMask/metamask-plugin into ↵Kevin Serrano2017-03-012-2/+3
| |\ \ \ \ | | | | | | | | | | | | | | | | | | i765-gaslimits
| * \ \ \ \ Merge branch 'i765-gaslimits' of github.com:MetaMask/metamask-plugin into ↵Kevin Serrano2017-03-012-30/+39
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | i765-gaslimits
| * | | | | | Add margins to align.Kevin Serrano2017-03-011-0/+1
| | | | | | |
* | | | | | | Remove gasMultiplier txMeta paramDan Finlay2017-03-013-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.
* | | | | | Fix bug that showed conf-tx screen on boot at wrong timesDan Finlay2017-03-011-1/+1
| |_|/ / / |/| | | |
* | | | | Fixed bug that made send screen sometimes transition to account detailDan Finlay2017-03-012-2/+3
| |/ / / |/| | |
* | | | Fix infinite loop bugDan Finlay2017-03-012-30/+39
|/ / /
* | | Fix referenceDan Finlay2017-03-011-1/+1
| | |
* | | Reorder rows for better table logicDan Finlay2017-02-281-32/+37
| | |
* | | Emit updated tx values on accept clickDan Finlay2017-02-282-1/+20
| | |
* | | Remove unused functionDan Finlay2017-02-281-5/+0
| | |
* | | Add action for updating and approving a tx in one actionDan Finlay2017-02-281-0/+15
| | |
* | | Got gas live re-estimatingDan Finlay2017-02-282-20/+23
| | |
* | | Align input fields for gas.Kevin Serrano2017-02-281-0/+1
| | |
* | | Fix merge conflicts.Kevin Serrano2017-02-282-8/+68
|\ \ \
| * | | LintedDan Finlay2017-02-282-12/+6
| | | |
| * | | Add non-working gas recalculating logic to tx-details viewDan Finlay2017-02-281-6/+69
| | | |
* | | | Further styling to get hex component working. Fix some typos.Kevin Serrano2017-02-283-16/+44
|/ / /
* | | Merge branch 'i765-gaslimits' of github.com:MetaMask/metamask-plugin into ↵Kevin Serrano2017-02-2810-73/+249
|\ \ \ | | | | | | | | | | | | i765-gaslimits
| * \ \ Merge branch 'master' into i765-gaslimitsDan Finlay2017-02-2810-73/+249
| |\ \ \ | | | |/ | | |/|
| | * | Improve pending tx blue dot styleDan Finlay2017-02-242-9/+4
| | | |
| | * | Fix cancel msg signing behavior.Dan Finlay2017-02-244-13/+20
| | | |
| | * | Make personal sign view look niceDan Finlay2017-02-241-5/+16
| | | |
| | * | Got personal_sign workingDan Finlay2017-02-248-48/+133
| | | | | | | | | | | | | | | | Also fixed bug where signing would not close popup.
| | * | Add alternate UI for pending personal_sign messagesDan Finlay2017-02-242-14/+12
| | | |
| | * | Add personal sign actions and templateDan Finlay2017-02-234-26/+106
| | |/
* | / Move input boxes into table and into details component.Kevin Serrano2017-02-283-17/+39
|/ /
* | Make gasPrice accessible to the UI.Kevin Serrano2017-02-251-2/+1
| |
* | Merge github.com:MetaMask/metamask-plugin into i765-gaslimitsKevin Serrano2017-02-245-3/+46
|\|
| * Fix UI Dev Mode for Tx ApprovalDan Finlay2017-02-212-0/+10
| | | | | | | | | | | | | | | | | | | | 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-noticesdevDan Finlay2017-02-212-0/+24
| |\
| | * Set default log levelsDan Finlay2017-02-211-0/+1
| | |
| | * Add debug logging to ui routing logic.Dan Finlay2017-02-212-0/+23
| | |
| * | Notices must be scrolled down to proceed from.Kevin Serrano2017-02-211-0/+9
| | |
| * | Fix typo.Kevin Serrano2017-02-211-2/+2
| | |
| * | Re-enable notices on dev.Kevin Serrano2017-02-211-1/+1
| |/
* | Broke hex decimal input into its own componentDan Finlay2017-02-183-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 Serrano2017-02-182-28/+54
|/
* Merge branch 'master' into i1089-networkfrontKevin Serrano2017-02-161-0/+9
|\
| * Revert old style message sighingFrankie2017-02-101-0/+9
| |
* | Remove custom RPC option when on lock screen.Kevin Serrano2017-02-161-1/+1
| |
* | Change networks from lock screen.Kevin Serrano2017-02-162-7/+7
| |
* | fix debugKevin Serrano2017-02-101-1/+1
| |
* | Prevent notices from opening in test and debug mode.Kevin Serrano2017-02-101-1/+1
| |
* | Delete all code related to disclaimers.Kevin Serrano2017-02-104-155/+13
|/
* Remove egregious alertDan Finlay2017-02-071-1/+0
|
* Mostly got shapeshift tx management into its own controllerDan Finlay2017-02-041-1/+2
| | | | Rendering the list is still having issues, so this isn't done yet.
* migration #9 - break out CurrencyController substatekumavis2017-02-031-2/+6
|
* migration 7 - break off TransactionManager substatekumavis2017-02-031-0/+30
|
* actions - dont expect background to provide newState, manually updatekumavis2017-02-031-12/+27
|
* Merge branch 'dev' into messageManagerCleanUpFrankie2017-02-021-1/+1
|\
| * default a return of an empty arrayFrankie2017-02-021-1/+1
| |
| * lintingFrankie2017-02-021-1/+1
| |
| * fix transactions not showing up in historyFrankie2017-02-021-1/+1
| |
* | Merge branch 'dev' into messageManagerCleanUpFrankie2017-02-0213-39/+22
|\|
| * rename selectedAccount to selectedAddresskumavis2017-01-3113-39/+22
| |
* | code clan up and testsFrankie2017-02-021-3/+3
| |
* | Merge branch 'dev' into messageManagerCleanUpFrankie2017-01-293-5/+6
|\|
| * migration 5 - move keyring controller state to substatekumavis2017-01-293-5/+6
| |
* | Clean up message manger includes:Frankie2017-01-2913-49/+52
|/ | | | | | | | | 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-refactor2kumavis2017-01-271-2/+0
|\
| * Fix ui overlapFrankie2017-01-271-2/+0
| |
* | metamask controller - cleanup remote apikumavis2017-01-271-2/+1
|/
* Merge branch 'dev' into i#1048kumavis2017-01-258-12/+107
|\
| * Merge pull request #1050 from MetaMask/fixConfTxBalanceLogickumavis2017-01-251-1/+1
| |\ | | | | | | Fix conf tx balance logic
| | * fix baseFrankie2017-01-251-2/+2
| | |
| | * Fix issue where ConfTx view lets you approve txs when the account has ↵Frankie2017-01-251-1/+1
| | | | | | | | | | | | insufficient balance
| * | Merge pull request #1051 from MetaMask/hotfix1048Frankie2017-01-251-2/+2
| |\ \ | | |/ | |/| hotfix - addNewAccount - dont assume hd keyring position
| | * hotfix - dont assume hd keyring positionkumavis2017-01-251-2/+2
| | |
| * | Merge branch 'dev' into i715-AddJsonImportDan Finlay2017-01-191-1/+1
| |\|
| * | Add ability to import v3 JSON walletsDan Finlay2017-01-194-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 importingDan Finlay2017-01-192-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 systemDan Finlay2017-01-192-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 MetamaskCkumavis2017-01-251-1/+15
| | |
* | | Fix issue where generating a new account would put it in loose keysFrankie2017-01-251-2/+2
| |/ |/|
* | Merge branch 'master' into Version-3.1.0Dan Finlay2017-01-191-1/+1
|\ \ | |/ |/|
| * Merge branch 'master' into fixSignedVsSubmittedFrankie2017-01-195-10/+11
| |\
| * | Fix the dissplay for submitted transactions and the listner wating to hear ↵Frankie2017-01-191-1/+1
| | | | | | | | | | | | when tx's were included in a block
* | | Fix test to log out despite number of menu itemsDan Finlay2017-01-181-1/+1
| | |
* | | Remove outdated referenceDan Finlay2017-01-181-4/+0
| | |
* | | Remove unused UI filesDan Finlay2017-01-182-109/+0
| | |
* | | Allow importing of private key stringsDan Finlay2017-01-184-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-AddImportMenuDan Finlay2017-01-1815-74/+368
|\ \ \
| * | | Develop import subviewsDan Finlay2016-11-055-17/+86
| | | |
| * | | Add import account placeholder templateDan Finlay2016-11-053-30/+71
| | | |
| * | | LintedDan Finlay2016-11-053-12/+8
| | | |
| * | | Add account adding subview placeholdersDan Finlay2016-11-054-39/+121
| | | |
| * | | Remove unused classDan Finlay2016-11-051-1/+1
| | | |
| * | | Convert buy subview to new tab bar componentDan Finlay2016-11-051-36/+47
| | | |
| * | | Scaffold new account viewDan Finlay2016-11-057-1/+125
| | | |
* | | | Add "import account" menu item + template viewDan Finlay2017-01-184-0/+63
| | | |
* | | | Fix message signing UI renderingDan Finlay2017-01-171-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 devDan Finlay2017-01-174-8/+7
|\ \ \
| * | | update coinbase info and viewFrankie2017-01-112-5/+5
| | | |
| * | | remove network Id 2 from explorer link and Add network Id 3Frances Pangilinan2016-12-212-3/+2
| | | |
* | | | Dont render conf-tx if their are no txParams to showFrankie2017-01-151-2/+4
| |_|/ |/| |
* | | remove orphaned commentFrankie2017-01-141-1/+0
| | |
* | | lintFrankie2017-01-141-1/+1
| | |
* | | Clean up codeFrankie2017-01-143-33/+37
| | |
* | | Fix sorting and instances where something could be undefinedFrankie2017-01-123-4/+5
| | |
* | | Merge branch 'dev' into integrateTxManagerUIFrankie2017-01-121-5/+4
|\ \ \
| * | | Send update to UI when changing selected accountDan Finlay2017-01-121-5/+4
| | | | | | | | | | | | | | | | Fixes #981
* | | | Fix wording and icon of failed txsFrankie2017-01-121-0/+6
| | | |
* | | | Take some of the tx Logic out of the UI and create a visble state for ↵Frankie2017-01-126-45/+40
|/ / / | | | | | | | | | pending and unaproved transactions
* | | quick typo fix.Kevin Serrano2017-01-071-2/+2
| | |
* | | Switch order of header and indicator.Kevin Serrano2017-01-061-1/+1
| | |
* | | Linting.Kevin Serrano2017-01-052-2/+1
| | |
* | | Make network somewhat more modular, add new network indicator.Kevin Serrano2017-01-054-17/+24
| | |
* | | Convert more actions to new simple patternDan Finlay2017-01-041-18/+2
| | |
* | | Restore missing lineDan Finlay2017-01-041-0/+1
| | |
* | | Corrected instances of showWarning to displayWarningDan Finlay2017-01-041-3/+3
| | |
* | | Apply new pattern to repetitive functionsDan Finlay2017-01-041-19/+2
| | |
* | | Update account list after adding accountDan Finlay2017-01-041-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 RevertTxManagerDan Finlay2017-01-031-2/+2
|\ \ \
| * \ \ Merge branch 'dev' into TxManagerFrankie2016-12-244-16/+57
| |\ \ \
| * \ \ \ Merge branch 'dev' into TxManagerFrankie2016-12-2212-49/+255
| |\ \ \ \
| * | | | | First pass at revision requestsFrances Pangilinan2016-12-221-2/+2
| | | | | |
* | | | | | Fix rendering of loose accountsDan Finlay2016-12-242-3/+5
| | | | | |
* | | | | | Show a "LOOSE" warning on accounts not belonging to HD Seed phraseDan Finlay2016-12-233-7/+42
| |_|/ / / |/| | | |
* | | | | Merge pull request #948 from MetaMask/RecoverLostAccountsDan Finlay2016-12-234-16/+57
|\ \ \ \ \ | |_|/ / / |/| | | | Auto-Recover accounts lost to BIP44 derivation fix
| * | | | Rename function to be an actionDan Finlay2016-12-231-2/+2
| | | | |
| * | | | LintedDan Finlay2016-12-213-5/+3
| | | | |
| * | | | Make notices confirmation configurableDan Finlay2016-12-214-13/+56
| | | | | | | | | | | | | | | | | | | | - Confirm button will now dismiss the lost accounts array.
* | | | | Lint.Kevin Serrano2016-12-211-1/+1
| | | | |
* | | | | Validate URIs before entering them in.Kevin Serrano2016-12-211-2/+26
|/ / / /
* | | | Merge pull request #937 from MetaMask/i900-forgot-password-flowDan Finlay2016-12-205-22/+28
|\ \ \ \ | | | | | | | | | | I900 forgot password flow
| * | | | Modify actions to support better transition.Kevin Serrano2016-12-203-1/+18
| | | | |
| * | | | Lint.Kevin Serrano2016-12-201-2/+2
| | | | |
| * | | | Redirect to seed word screen for forgotten passwords.Kevin Serrano2016-12-204-20/+9
| | | | |
* | | | | Merged master into devDan Finlay2016-12-209-25/+201
|\ \ \ \ \ | |/ / / / |/| | / / | | |/ / | |/| |
| * | | Clean up first noticeDan Finlay2016-12-171-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 Serrano2016-12-171-1/+15
| | | |
| * | | clean - code stylekumavis2016-12-171-4/+0
| | | |
| * | | Add ability to show notices to user & get confirmation.Kevin Serrano2016-12-172-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 Serrano2016-12-176-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 providerDan Finlay2016-12-164-25/+1
| | | | | | | | | | | | | | | | Instances configured to point at Morden will now point at Ropsten.
* | | | Revert "Interface enhancements"Dan Finlay2016-12-1711-54/+101
| | | |
* | | | Fixed header h1 alignment and network nameLuis Iván Cuende2016-12-152-5/+3
| | | |
* | | | Better account details viewLuis Iván Cuende2016-12-155-42/+14
| | | |
* | | | Better editable labelLuis Iván Cuende2016-12-155-40/+15
| | | |
* | | | Better buttonsLuis Iván Cuende2016-12-142-4/+9
| | | |
* | | | Beautified disclaimerLuis Iván Cuende2016-12-143-11/+14
| |/ / |/| |
* | | Fix vault encrypting & unlocking bugDan Finlay2016-12-012-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 inDan Finlay2016-12-011-1/+2
| | |
* | | Made integration test create a first vaultDan Finlay2016-12-011-1/+2
| | |
* | | Fix tx adding codeDan Finlay2016-11-301-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 devDan Finlay2016-11-241-3/+3
|\| |
| * | Merge branch 'master' into new-faucetDan Finlay2016-11-231-2/+2
| |\ \
| | * | Add temporary morden explorer link supportDan Finlay2016-11-221-1/+1
| | | |
| | * | Add ropsten link supportDan Finlay2016-11-221-2/+2
| | | |
| * | | Ropsten has sole access to the faucet.Kevin Serrano2016-11-231-3/+3
| | | |
| * | | Add to changelog.Kevin Serrano2016-11-231-1/+1
| |/ /
* | | Cosmetic changes, rename links.Kevin Serrano2016-11-241-9/+9
| | |
* | | Add link back to unlock.Kevin Serrano2016-11-241-0/+16
| | |
* | | Fix proper behavior for restoring accounts when password forgotten.Kevin Serrano2016-11-242-0/+2
| | |
* | | Modify forgot password flow to go back to init screen.Kevin Serrano2016-11-242-36/+1
| | |
* | | Fix undefined provider menu itemDan Finlay2016-11-231-2/+5
| | |
* | | LintedDan Finlay2016-11-231-1/+1
| | |
* | | Merge pull request #858 from MetaMask/i842-WaitForSeedWordkumavis2016-11-232-5/+7
|\ \ \ | | | | | | | | I842 wait for seed word
| * | | Restore ropsten link supportDan Finlay2016-11-231-3/+3
| | | |
| * | | Merge branch 'dev' into i842-WaitForSeedWordDan Finlay2016-11-231-2/+2
| |\ \ \
| * | | | Use callback in placeSeedWord method.Dan Finlay2016-11-221-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-cleanupKevin Serrano2016-11-231-2/+2
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Make ropsten faucet button point at the correct url.Kevin Serrano2016-11-231-2/+2
| |/ / /
* | | | Fix camel casing on setSelectedAccount action.Dan Finlay2016-11-223-4/+4
| | | |
* | | | Change fauceting to become a response of an emit.Kevin Serrano2016-11-221-2/+2
| | | |
* | | | change all instances of selectedAddress to selectedAccount.Kevin Serrano2016-11-229-21/+20
| | | |
* | | | Remove entropy from encryption and project.Kevin Serrano2016-11-222-3/+3
|/ / /
* | | Merge pull request #837 from MetaMask/FixMenuItemKevin Serrano2016-11-221-7/+8
|\ \ \ | | | | | | | | Fix custom provider menu item
| * | | Fix custom provider menu itemDan Finlay2016-11-221-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-DevDan Finlay2016-11-2231-509/+6078
|\| | | | |/ / |/| |
| * | Convert conversion util to pure json.Kevin Serrano2016-11-193-6/+5731
| | |
| * | Revert one cb to previous state.Kevin Serrano2016-11-161-1/+1
| | |
| * | Minimize dispatches by using emitters and relying on state updates.Kevin Serrano2016-11-161-19/+6
| | |
| * | Re-enable disclaimer screen. Rename variables to reflect role more clearly.Kevin Serrano2016-11-152-4/+4
| | |
| * | Fix lint rules for ternary operator placement.Kevin Serrano2016-11-121-18/+18
| | |
| * | Typo fix.Kevin Serrano2016-11-121-9/+9
| | |
| * | Linting to the max.Kevin Serrano2016-11-1216-51/+36
| | |
| * | Merge branch 'master' into i328-MultiVaultkumavis2016-11-112-2/+6
| |\ \
| * \ \ Merge branch 'master' into i328-MultiVaultkumavis2016-11-111-0/+9
| |\ \ \
| * \ \ \ Merge branch 'master' into i328-MultiVaultFrankie2016-11-113-16/+11
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into i328-MultiVaultDan Finlay2016-11-081-1/+1
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Remove insane actions hashDan Finlay2016-11-051-6/+2
| | | | | |
| * | | | | Add reveal of seed words.Kevin Serrano2016-11-023-0/+43
| | | | | |
| * | | | | Make identicon tolerant of changing stateDan Finlay2016-11-021-0/+17
| | | | | |
| * | | | | Fixed bugs related to clearing caches when restoring to a new vaultDan Finlay2016-11-023-3/+6
| | | | | |
| * | | | | Make forgot password button.Dan Finlay2016-11-023-32/+23
| | | | | |
| * | | | | Fix seed phrase restoreDan Finlay2016-11-022-4/+3
| | | | | |
| * | | | | Made progress on parity for MultiVaultKevin Serrano2016-11-026-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.
| * | | | | LintedKevin Serrano2016-11-011-1/+0
| | | | | |
| * | | | | Implement seed word confirmation page.Kevin Serrano2016-11-015-0/+392
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove logs. Move HD render files to ui/app.
| * | | | | Make case condition more consistent. Remove extra action. Fix incorrect ↵Kevin Serrano2016-10-312-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | display of network.
| * | | | | Add focus to password field.Kevin Serrano2016-10-311-0/+4
| | | | | |
| * | | | | Add password warning div.Kevin Serrano2016-10-311-2/+7
| | | | | |
| * | | | | Modify first-screen design to match docs.Kevin Serrano2016-10-311-2/+3
| | | | | |
| * | | | | Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into ↵Kevin Serrano2016-10-295-21/+124
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | i328-MultiVault
| | * | | | | Configure BIP44 Keychain as default oneDan Finlay2016-10-292-4/+19
| | | | | | |
| | * | | | | Fix identicon renderingDan Finlay2016-10-281-7/+6
| | | | | | |
| | * | | | | Update first screen to match design.Dan Finlay2016-10-282-10/+99
| | | | | | |
| * | | | | | Merge branch 'master' into i328-MultiVaultKevin Serrano2016-10-292-9/+8
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Phase out extra warning screen.Kevin Serrano2016-10-266-128/+1
| | | | | | |
| * | | | | | Merge branch 'master' into i328-MultiVaultDan Finlay2016-10-222-1/+12
| |\ \ \ \ \ \
| * | | | | | | Fix duplicate provider menu item bugDan Finlay2016-10-221-6/+1
| | | | | | | |
| * | | | | | | Improved simple account generationDan Finlay2016-10-211-1/+1
| | | | | | | |
| * | | | | | | Began adding first basic keyringDan Finlay2016-10-213-4/+19
| | | | | | | |
| * | | | | | | Fix testsDan Finlay2016-10-211-2/+2
| | | | | | | |
| * | | | | | | Linted & added salting to vaultDan Finlay2016-10-213-8/+4
| | | | | | | |
| * | | | | | | Fix state updating after vault creation and unlockingDan Finlay2016-10-212-2/+9
| | | | | | | |
| * | | | | | | Commented out useless advanced not on init screenDan Finlay2016-10-211-0/+2
| | | | | | | |
| * | | | | | | Change actions reference to keyringController to backgroundDan Finlay2016-10-212-25/+25
| | | | | | | |
| * | | | | | | LintedDan Finlay2016-10-211-1/+1
| | | | | | | |
generated by cgit (git 2.34.1) at 2024-10-17 10:31:53 +0800