| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' into i18n-translator-redux | Dan | 2018-03-27 | 1 | -2/+2 |
| |\ | |||||
| | * | Use ens-input component in send-v2 to allow sending to ens names. | Dan | 2018-03-26 | 1 | -2/+2 |
| | | | |||||
| * | | Merge branch 'master' of github.com:MetaMask/metamask-extension into ↵ | kumavis | 2018-03-21 | 1 | -1/+3 |
| |\| | | | | | | | i18n-translator-redux | ||||
| | * | Merge branch 'master' into retry-tx-refractor | Dan | 2018-03-14 | 1 | -1/+9 |
| | |\ | |||||
| | * | | Lint fixes. | Dan | 2018-03-09 | 1 | -1/+1 |
| | | | | |||||
| | * | | Merge branch 'master' into retry-tx-refractor | Dan | 2018-03-09 | 1 | -39/+87 |
| | |\ \ | |||||
| | * | | | Retry transaction logic added to tx-list-item, confirm-send-ether, ↵ | Dan | 2018-03-09 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | | | customize-gas-modal, and dependents. | ||||
| * | | | | Lint fixes. | Dan | 2018-03-20 | 1 | -1/+0 |
| | | | | | |||||
| * | | | | Handle i18n with redux. | Dan | 2018-03-16 | 1 | -1/+42 |
| | |_|/ |/| | | |||||
| * | | | Merge branch 'master' into i3033-responsive-newui-onboarding | kumavis | 2018-03-14 | 1 | -40/+87 |
| |\ \ \ | |||||
| | * \ \ | Merge pull request #3470 from danjm/newui-onboarding-fonts | kumavis | 2018-03-14 | 1 | -1/+1 |
| | |\ \ \ | | |_|/ | |/| | | Change fonts in new-ui onboarding to Roboto, with weight 400. | ||||
| | | * | | Update first time flow button fonts, and first-time-flow default font, to ↵ | Dan | 2018-03-08 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | Roboto. | ||||
| | * | | | Fix flashing to Log in screen after logging in or restoring from seed phrase ↵ | Alexander Tseung | 2018-03-08 | 1 | -45/+85 |
| | | | | | | | | | | | | | | | | | (#3466) | ||||
| | * | | | Merge pull request #3409 from scsaba/seed-phrase-verification | Dan Finlay | 2018-03-08 | 1 | -0/+7 |
| | |\ \ \ | | |/ / | |/| | | Add seed phrase verification script into background process | ||||
| | | * | | verify seedwords on log in | Csaba Solya | 2018-03-04 | 1 | -0/+7 |
| | | | | | |||||
| * | | | | Add welcome screen to new-ui browser first time flow. | Dan | 2018-03-09 | 1 | -0/+8 |
| |/ / / | |||||
| * | / | Shapeshift form handles market info unavailable errors. | Dan | 2018-03-07 | 1 | -0/+1 |
| | |/ |/| | |||||
| * | | Fix NewUI reveal seed flow. (#3410) | Dan J Miller | 2018-03-03 | 1 | -2/+3 |
| |/ | |||||
| * | Render loading inside notice screen, and don't set isLoading from ↵ | Dan | 2018-02-21 | 1 | -1/+0 |
| | | | | | unMarkPasswordForgotten. | ||||
| * | Only open a new window on restore from seed if in extension view. | Dan | 2018-02-14 | 1 | -2/+0 |
| | | |||||
| * | Remove chrome focus outline for mouse users. (#3230) | Dan J Miller | 2018-02-13 | 1 | -0/+10 |
| | | |||||
| * | Merge branch 'uat' into uat-next | Dan | 2018-02-08 | 1 | -0/+16 |
| |\ | |||||
| | * | Merge branch 'master' into uat | Dan | 2018-02-08 | 1 | -0/+16 |
| | |\ | |||||
| | | * | added reset account feature | Bruno Barbieri | 2018-01-31 | 1 | -0/+16 |
| | | | | |||||
| * | | | [NewUI] Opens to full screen when restoring from seed. (#3201) | Dan J Miller | 2018-02-08 | 1 | -0/+24 |
| | | | | | | | | | | | | | | | | | | | * Opens to full screen when restoring from seed. * Remove redundant parameter in actions.markPasswordForgotten call. | ||||
| * | | | Fix bug stemming from erroneously persistant unlock failure error message. ↵ | Dan J Miller | 2018-01-30 | 1 | -0/+10 |
| |/ / | | | | | | | (#3123) | ||||
| * | | Adding one or more tokens sets the selected token before returning the user ↵ | Dan J Miller | 2018-01-17 | 1 | -0/+3 |
| | | | | | | | | | to the main screen. (#2995) | ||||
| * | | New add account page with create and import options. | Dan | 2018-01-13 | 1 | -0/+18 |
| | | | |||||
| * | | [NewUI-flat] New deposit ether modal UI. (#2642) | Dan J Miller | 2018-01-13 | 1 | -3/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * New deposit ether modal. * New deposit modal full screen on mobile, and other style fixes. * Hide shapeshift option from deposit modal for now. * Add shapeshift form to new deposit modal. * Store recipient address for shapeshift tx in background. * Use Simpledropdown to achieve desired styling in coin selector. * Lint fix * Fix typos and remove dead code. * Remove storage of shapeshift receiving address from background. * Fix typos | ||||
| * | | Fix logging out of old UI causing infinite spinner (#2914) | Alexander Tseung | 2018-01-12 | 1 | -1/+5 |
| | | | |||||
| * | | Track usage of old and new UI (#2794) | Alexander Tseung | 2017-12-23 | 1 | -4/+33 |
| | | | | | | | [NewUI] Track usage of old and new UI | ||||
| * | | Merge branch 'NewUI-flat' into merge-master-to-newUI-flat-dec20 | Chi Kei Chan | 2017-12-21 | 1 | -0/+19 |
| |\ \ | |||||
| | * | | Adds updateTransaction to background and used it to update after editing in ↵ | Dan | 2017-12-21 | 1 | -11/+11 |
| | | | | | | | | | | | | | send-v2. | ||||
| | * | | Canceled, edited transactions show edited amount. | Dan | 2017-12-21 | 1 | -0/+19 |
| | | | | |||||
| * | | | Merge branch 'master' into NewUI-flat | Dan | 2017-12-21 | 1 | -0/+15 |
| |\ \ \ | |/ / |/| / | |/ | |||||
| | * | Fix retry action | Dan Finlay | 2017-12-07 | 1 | -2/+2 |
| | | | |||||
| | * | View tx after editing state to unconfirmed | Dan Finlay | 2017-12-07 | 1 | -1/+9 |
| | | | |||||
| | * | Fix action | Dan Finlay | 2017-12-07 | 1 | -2/+2 |
| | | | |||||
| | * | Add retry background method and action | Dan Finlay | 2017-12-07 | 1 | -0/+6 |
| | | | |||||
| * | | [NewUI] Hide UI toggle in mascara (#2772) | Dan J Miller | 2017-12-21 | 1 | -5/+2 |
| | | | | | | | | | | | | | * Hides old-UI on mascara. * Improve code clarity in select-app.js | ||||
| * | | Merge branch 'NewUI-flat' into MM-333-auto-add-users-to-new-UI | Chi Kei Chan | 2017-12-08 | 1 | -0/+9 |
| |\ \ | |||||
| | * | | Update max amount behaviour to meet new specs. | Dan | 2017-12-07 | 1 | -0/+9 |
| | | | | |||||
| * | | | Show user notifications after switch between UIs | Dan | 2017-12-05 | 1 | -0/+4 |
| | | | | |||||
| * | | | New-ui actions accomodates old-ui. | Dan | 2017-12-05 | 1 | -7/+10 |
| | | | | |||||
| * | | | Add UI selection | Dan | 2017-12-05 | 1 | -0/+29 |
| |/ / | |||||
| * | | making eslint happy | Jason Clark | 2017-11-26 | 1 | -2/+2 |
| | | | |||||
| * | | toggle wired up to preferences property store | Jason Clark | 2017-11-25 | 1 | -6/+17 |
| | | | |||||
| * | | incremental commit | Clark, Jason (Contractor) | 2017-11-24 | 1 | -0/+9 |
| | | | |||||
| * | | Create single action for updating all of send in redux state. | Dan | 2017-11-15 | 1 | -0/+9 |
| | | | |||||
| * | | Allow editing of send ether. | Dan | 2017-11-15 | 1 | -0/+21 |
| | | | |||||
| * | | Token balance in send state; validating sufficient tokens, validation ↵ | Dan | 2017-11-07 | 1 | -0/+9 |
| | | | | | | | | | updates on 'from' switching. | ||||
| * | | More lint fixes | Dan | 2017-11-02 | 1 | -6/+6 |
| | | | |||||
| * | | Lint fixes for NewUI-flat. | Dan | 2017-11-02 | 1 | -0/+2 |
| | | | |||||
| * | | Fix Settings/Info screen being visible on logout (#2490) | Alexander Tseung | 2017-10-27 | 1 | -1/+42 |
| | | | |||||
| * | | Allow editing account name in account details modal | Alexander Tseung | 2017-10-26 | 1 | -9/+17 |
| | | | |||||
| * | | Fix send token bug. | Dan | 2017-10-26 | 1 | -1/+2 |
| | | | |||||
| * | | Merge branch 'master' into NewUI-flat | Chi Kei Chan | 2017-10-25 | 1 | -46/+103 |
| |\| | |||||
| | * | Add Import With Seed Phrase | Chi Kei Chan | 2017-10-21 | 1 | -4/+14 |
| | | | |||||
| | * | Fix linter | Chi Kei Chan | 2017-10-21 | 1 | -1/+1 |
| | | | |||||
| | * | ShapeShift Integration | Chi Kei Chan | 2017-10-21 | 1 | -3/+21 |
| | | | |||||
| | * | Fix merge conflict; separate onboarding buy screen | Chi Kei Chan | 2017-10-21 | 1 | -0/+9 |
| | | | |||||
| | * | Add Go to Coinbase; Show Buy Ether after signup | Jacky Chan | 2017-10-21 | 1 | -1/+1 |
| | | | |||||
| | * | Implement Import Account Screen | Jacky Chan | 2017-10-21 | 1 | -10/+17 |
| | | | |||||
| | * | Add BackupPhraseScreen | Jacky Chan | 2017-10-21 | 1 | -7/+11 |
| | | | |||||
| | * | Add NoticeScreen | Jacky Chan | 2017-10-21 | 1 | -13/+15 |
| | | | |||||
| | * | Add UniqueImageScreen | Jacky Chan | 2017-10-21 | 1 | -10/+17 |
| | | | |||||
| * | | Clear send state on cancelling and signing. | Dan | 2017-10-24 | 1 | -1/+8 |
| | | | |||||
| * | | Merge branch 'NewUI-flat' into merge | Chi Kei Chan | 2017-10-19 | 1 | -38/+393 |
| |\ \ | |/ |/| | |||||
| | * | Handling to and amount errors. | Dan | 2017-10-19 | 1 | -0/+10 |
| | | | |||||
| | * | Move all of send state to metamask state. | Dan | 2017-10-19 | 1 | -0/+46 |
| | | | |||||
| | * | Get from and update addressBook in send-v2 | Dan | 2017-10-19 | 1 | -1/+1 |
| | | | |||||
| | * | wip | Chi Kei Chan | 2017-10-18 | 1 | -0/+9 |
| | | | |||||
| | * | Enable send-v2 functionality. | Dan | 2017-10-18 | 1 | -0/+14 |
| | | | |||||
| | * | Customize Gas connected to state | Dan | 2017-10-16 | 1 | -0/+20 |
| | | | |||||
| | * | Clear selected token when changing network. | Dan | 2017-10-09 | 1 | -4/+11 |
| | | | |||||
| | * | Removes old/second setProviderType method from before merge (commit bd99bc2e) | Dan | 2017-10-05 | 1 | -9/+0 |
| | | | |||||
| | * | Merge branch 'master' into NewUI-flat | Chi Kei Chan | 2017-10-04 | 1 | -8/+8 |
| | |\ | |||||
| | * | | Enables remove token and ensures add/remove update the list without need for ↵ | Dan | 2017-10-04 | 1 | -5/+30 |
| | | | | | | | | | | | | | refresh. | ||||
| | * | | Shapeshift deposit tx modal. | Dan | 2017-10-02 | 1 | -1/+4 |
| | | | | |||||
| | * | | Query for gas estimates | Chi Kei Chan | 2017-09-29 | 1 | -2/+2 |
| | | | | |||||
| | * | | Keep privateKey out of state and clear it after closing export private key ↵ | Dan | 2017-09-28 | 1 | -13/+26 |
| | | | | | | | | | | | | | modal. | ||||
| | * | | Gets gas and price estimates when send components mount. | Dan | 2017-09-27 | 1 | -2/+2 |
| | | | | |||||
| | * | | Refactor to store estimated gas and price in local state, return promise ↵ | Dan | 2017-09-26 | 1 | -42/+18 |
| | | | | | | | | | | | | | from actions. | ||||
| | * | | Estimate gasPrice and gasLimit in send screen. | Dan | 2017-09-26 | 1 | -0/+57 |
| | | | | |||||
| | * | | get identities from getState() instead of passing from caller, only set new ↵ | Dan | 2017-09-23 | 1 | -2/+3 |
| | | | | | | | | | | | | | account label if label set. | ||||
| | * | | New account modal now allows for addition of account name. | Dan | 2017-09-23 | 1 | -2/+18 |
| | | | | |||||
| | * | | Integrate Add Token | Chi Kei Chan | 2017-09-22 | 1 | -8/+31 |
| | | | | |||||
| | * | | Merge branch 'master' into nm | Chi Kei Chan | 2017-09-19 | 1 | -0/+13 |
| | |\ \ | |||||
| | * | | | Clear token selection when changing account. | Dan | 2017-09-16 | 1 | -0/+1 |
| | | | | | |||||
| | * | | | Add token exchange rates | Chi Kei Chan | 2017-09-13 | 1 | -0/+24 |
| | | | | | |||||
| | * | | | Improve styling in Confirmation Screen; Show decoded send token data | Chi Kei Chan | 2017-09-13 | 1 | -1/+0 |
| | | | | | |||||
| | * | | | Added signTokenTx; Adding token confirmation screen | Chi Kei Chan | 2017-09-12 | 1 | -0/+16 |
| | | | | | |||||
| | * | | | Show confirm transaction screen when clicking a pending transaction in the list. | Dan | 2017-09-08 | 1 | -3/+4 |
| | | | | | |||||
| | * | | | Send Token screen partial UI | Chi Kei Chan | 2017-09-07 | 1 | -0/+8 |
| | | | | | |||||
| | * | | | Adding Token transaction detail screen | Chi Kei Chan | 2017-09-06 | 1 | -0/+9 |
| | | | | | |||||
| | * | | | Send tx working; user is taken to confirm page with correct transaction ↵ | Dan | 2017-09-06 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | information. | ||||
| | * | | | Clean up send.js and eth-balance.js with es6. | Dan | 2017-08-31 | 1 | -3/+3 |
| | | | | | |||||
| | * | | | Hook up showAddToken to dropdown menu item in account options dropdown | sdtsui | 2017-08-23 | 1 | -2/+1 |
| | | | | | |||||
| | * | | | Extend modal implementation and state management to accomodate multiple ↵ | sdtsui | 2017-08-21 | 1 | -2/+4 |
| | | | | | | | | | | | | | | | | | modal types | ||||
| | * | | | [WIP] Extract network dropdown into own component | sdtsui | 2017-08-14 | 1 | -0/+18 |
| | | | | | |||||
| | * | | | Add actions and reducers for global modal | sdtsui | 2017-08-09 | 1 | -0/+17 |
| | | | | | |||||
| | * | | | Merge branch 'master' into feat/mm-ui-5 | sdtsui | 2017-08-07 | 1 | -3/+6 |
| | |\ \ \ | |||||
| | * | | | | Integrate slideout menu with tx view | sdtsui | 2017-08-03 | 1 | -0/+15 |
| | | | | | | |||||
| | * | | | | Hook up responsive sidebar | sdtsui | 2017-08-03 | 1 | -0/+3 |
| | | | | | | |||||
| * | | | | | Merge remote-tracking branch 'upstream/master' | Sergey Ukustov | 2017-10-03 | 1 | -25/+8 |
| |\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| | * | | | | network - remove long dead etherscan provider code | kumavis | 2017-09-30 | 1 | -10/+0 |
| | | | | | | |||||
| | * | | | | network - convert localhost from custom rpc to network type | kumavis | 2017-09-30 | 1 | -15/+8 |
| | | |_|/ | |/| | | |||||
| * / | | | Add eth_signTypedData handler | Sergey Ukustov | 2017-09-30 | 1 | -0/+27 |
| |/ / / | |||||
| * | | | Merge branch 'master' of github.com:davidp94/metamask-extension into ↵ | Kevin Serrano | 2017-09-08 | 1 | -0/+11 |
| |\ \ \ | | | | | | | | | | | | | rejectallunapproved | ||||
| | * | | | fix goHome | davidp94 | 2017-08-15 | 1 | -2/+6 |
| | | | | | |||||
| | * | | | remove unused action type | davidp94 | 2017-08-15 | 1 | -1/+0 |
| | | | | | |||||
| | * | | | cancel all txs | DavidNinja | 2017-08-15 | 1 | -0/+8 |
| | | | | | |||||
| * | | | | Transition to home view after tx error | Dan Finlay | 2017-08-17 | 1 | -18/+5 |
| |/ / / | |||||
| * | | | Merge branch 'master' into NewUI | kumavis | 2017-08-04 | 1 | -3/+6 |
| |\ \ \ | |/ / |/| / | |/ | |||||
| | * | fix cancelTransaction not reciving a callback | frankiebee | 2017-08-04 | 1 | -3/+6 |
| | | | |||||
| * | | Remove unused parameter | Dan Finlay | 2017-07-28 | 1 | -1/+1 |
| | | | |||||
| * | | Fix custom provider indication | Dan Finlay | 2017-07-27 | 1 | -1/+1 |
| | | | |||||
| * | | Move responsive ui into its own folder for easier merges | Dan Finlay | 2017-07-21 | 1 | -0/+1031 |
| | | | |||||
| * | | Make folder for responsive UI | Dan Finlay | 2017-07-04 | 1 | -1031/+0 |
| |/ | |||||
| * | Fix token adding bug | Dan Finlay | 2017-06-28 | 1 | -1/+3 |
| | | |||||
| * | Add ability to add tokens to token list | Dan Finlay | 2017-06-16 | 1 | -0/+14 |
| | | | | | Fiex #1616 | ||||
| * | 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 |
| | | | | | Also improve error handling with token balances. | ||||
| * | 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. | ||||
| | * | 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 |
| |/ | | | | | | | | - Now striping hex prefixed gas values, which may have been causing mis-estimation. - Unified calculation logic to be entirely functional. - Greatly simplified how the pending-tx form keeps updated form state. Still needs a commit from @kumavis to ensure the background passes in a txMeta.txParams.gasPrice value. | ||||
| * | 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 ↵ | Kevin Serrano | 2017-03-22 | 1 | -5/+2 |
| | | | | | | | | | disappear with display warning. | ||||
| * | | 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 |
| | | | | | | | | | | | | | | | | | | | 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. | ||||
| | * | | 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 |
| | | | | | | | | | Also fixed bug where signing would not close popup. | ||||
| | * | 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 |
| | | | | | 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 |
| | | |||||
| * | 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 - addNewAccount - dont assume hd keyring position | ||||
| | | * | 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 |
| | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| | * | | Added new modular private key import system | Dan Finlay | 2017-01-19 | 1 | -0/+16 |
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 |
| |/ | |||||
| * | Allow importing of private key strings | Dan Finlay | 2017-01-18 | 1 | -1/+9 |
| | | | | | | | | | 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 | 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 |
| | | | | | | | | | Fixes #981 | ||||
| * | | 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 | ||||
| * | | Make notices confirmation configurable | Dan Finlay | 2016-12-21 | 1 | -0/+12 |
| | | | | | | | | | - Confirm button will now dismiss the lost accounts array. | ||||
| * | | Merge pull request #937 from MetaMask/i900-forgot-password-flow | Dan Finlay | 2016-12-20 | 1 | -2/+10 |
| |\ \ | | | | | | | I900 forgot password flow | ||||
| | * | | 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 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 1 | -0/+44 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
| * | | | Fix vault encrypting & unlocking bug | Dan Finlay | 2016-12-01 | 1 | -6/+19 |
| | | | | | | | | | | | | | | | | | | | | | | | | | 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 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 |
| |\ \ \ | | | | | | | | | I842 wait for seed word | ||||
| | * | | | 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 | ||||
| * | | | | 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 |
| | | | | | | | | | | | | | | | | | | | - 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. | ||||
| * | | Implement seed word confirmation page. | Kevin Serrano | 2016-11-01 | 1 | -0/+16 |
| | | | | | | | | | | | Remove logs. Move HD render files to ui/app. | ||||
| * | | Make case condition more consistent. Remove extra action. Fix incorrect ↵ | Kevin Serrano | 2016-10-31 | 1 | -1/+1 |
| | | | | | | | | | display of network. | ||||
| * | | 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 |
| |/ | | | | | | Completely breaking all account maangement, I have removed the opinionated seed-word code from the UI. Web3 injection still seems to work. | ||||
| * | 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 ↵ | Frankie | 2016-09-13 | 1 | -39/+11 |
| | | | | | node-module | ||||
| * | 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 |
| | | | | | | | | | | | | | Fixes #542 | ||||
| * | | | 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 |
| | | | | |||||
 |
index : tangerine-wallet-browser | |
| Tangerine fork of MetaMask browser extension (https://github.com/tangerine-network/tangerine-wallet-browser) |
| aboutsummaryrefslogtreecommitdiffstats |