Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Begin adding unconfigured notifier | Dan Finlay | 2018-06-05 | 2 | -13/+21 |
| | |||||
* | Persist lost identities to storage for later analysis | Dan Finlay | 2018-06-05 | 2 | -2/+33 |
| | |||||
* | Add minimal user notification of issue. | Dan Finlay | 2018-06-05 | 1 | -1/+1 |
| | |||||
* | Add identity synchronizing code | Dan Finlay | 2018-06-05 | 2 | -1/+48 |
| | | | | | | | | | | | | Addresses #4475, where entries in the identities object do not necessarily have corresponding accounts in the vault. On password submission, this change passes known accounts to the preferencesController (responsible for nickname management), and removes unknown entries. Includes "TODO" notes for where we could log the issue to sentry or notify the user. | ||||
* | metamask-controller - clear account labels on restore from seed phrase | kumavis | 2018-06-04 | 1 | -0/+4 |
| | |||||
* | preferences controller - jsdoc fix | kumavis | 2018-06-04 | 1 | -2/+2 |
| | |||||
* | metamask - update preferences controller identities on keyring controller update | kumavis | 2018-06-04 | 2 | -3/+30 |
| | |||||
* | Merge pull request #4426 from MetaMask/sentry-url-rewrite-fix | kumavis | 2018-06-04 | 1 | -1/+1 |
|\ | | | | | sentry - message rewrite - guard against missing message | ||||
| * | sentry - message rewrite - guard against missing message | kumavis | 2018-05-31 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #4425 from MetaMask/master | kumavis | 2018-06-02 | 1 | -0/+17 |
|\ \ | | | | | | | Merge Master into Develop | ||||
| * | | Version 4.7.1v4.7.1 | Dan Finlay | 2018-06-02 | 1 | -0/+17 |
| | | | |||||
* | | | Fix return value of migration 26 when missing KC or PC | Whymarrh Whitby | 2018-06-02 | 1 | -1/+1 |
|/ / | |||||
* / | Properly end the middleware stack on RPC error | bitpshr | 2018-06-02 | 1 | -0/+1 |
|/ | |||||
* | Merge branch 'master' of github.com:MetaMask/metamask-extension into ↵ | kumavis | 2018-05-30 | 5 | -21/+61 |
|\ | | | | | | | merge-master | ||||
| * | cleanErrorStack moved to separate library module | Anton | 2018-05-29 | 3 | -19/+36 |
| | | | | | | | | more errors traces cleaned up | ||||
| * | error message fix | Anton | 2018-05-29 | 1 | -2/+1 |
| | | |||||
| * | Clean up user rejection error message | Anton | 2018-05-28 | 1 | -3/+14 |
| | | |||||
| * | Merge pull request #3997 from jakubsta/master | kumavis | 2018-05-22 | 1 | -4/+10 |
| |\ | | | | | | | Allow other extensions to connect | ||||
| | * | Update: allow other extension to connect | Jakub Stasiak | 2018-04-18 | 1 | -4/+10 |
| | | | |||||
| * | | Merge pull request #4140 from MetaMask/v4.6.1 | Thomas Huang | 2018-05-01 | 4 | -40/+40 |
| |\ \ | | | | | | | | | Version 4.6.1 | ||||
| * | | | require log | frankiebee | 2018-05-01 | 1 | -0/+1 |
| | | | | |||||
| * | | | log emitter errors | frankiebee | 2018-04-30 | 1 | -6/+10 |
| | | | | |||||
| * | | | transactions - run event emitters outside context of _setTxStatus | frankiebee | 2018-04-30 | 1 | -7/+9 |
| | | | | |||||
* | | | | Merge pull request #4390 from MetaMask/i18n-brave-fix | kumavis | 2018-05-30 | 1 | -4/+7 |
|\ \ \ \ | | | | | | | | | | | i18n - getFirstPreferredLangCode - guard against missing i18n api | ||||
| * | | | | i18n - getFirstPreferredLangCode - guard against missing i18n api | kumavis | 2018-05-29 | 1 | -4/+7 |
| | | | | | | | | | | | | | | | fix for brave | ||||
* | | | | | metamask-controller - lint fix | kumavis | 2018-05-29 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | metamask-controller - update preferences controller addresses after import ↵ | kumavis | 2018-05-29 | 1 | -10/+10 |
|/ / / / | | | | | | | | | | | | | account | ||||
* | | | | controllers - recent-blocks - pull first historical blocks in parallel | kumavis | 2018-05-22 | 1 | -15/+7 |
| | | | | |||||
* | | | | Reveal get filtered tx list (#4332) | Frankie | 2018-05-22 | 2 | -16/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | * add getFilteredTxList from txController to getApi * transactions - remove dead code (isNonceTaken) | ||||
* | | | | Merge branch 'develop' into ci-publish-release | kumavis | 2018-05-22 | 8 | -34/+167 |
|\ \ \ \ | |||||
| * \ \ \ | Merge branch 'develop' of https://github.com/Trigalti/metamask-extension ↵ | kumavis | 2018-05-22 | 1 | -1/+2 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | into Trigalti-develop | ||||
| | * | | | | Added trailing comma for eslint | simon | 2018-05-18 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Added adyen.com to blacklisted domains because postMessages are blocking ↵ | simon | 2018-05-18 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | card encryption | ||||
| * | | | | | Merge pull request #4034 from whymarrh/account-nicknames | kumavis | 2018-05-22 | 5 | -33/+97 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Move account names out of KeyringController | ||||
| | * | | | | | Fix migration 026 to produce the correct shape for state.identities | Whymarrh Whitby | 2018-05-18 | 1 | -1/+8 |
| | | | | | | | |||||
| | * | | | | | Add migration to move identities from KeyringController | Whymarrh Whitby | 2018-05-17 | 2 | -0/+41 |
| | | | | | | | |||||
| | * | | | | | Add PreferencesController#setAddresses to update ids | Whymarrh Whitby | 2018-05-17 | 2 | -8/+22 |
| | | | | | | | |||||
| | * | | | | | Update AddressBookController to read from preferences store | Whymarrh Whitby | 2018-05-17 | 2 | -22/+8 |
| | | | | | | | |||||
| | * | | | | | Move setAccountLabel into PreferencesController | Whymarrh Whitby | 2018-05-17 | 2 | -3/+19 |
| | |/ / / / | |||||
| * | | | | | Merge pull request #4199 from MetaMask/i3487-provider-errors | Dan Finlay | 2018-05-19 | 2 | -0/+68 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | RPC error middleware for json-rpc-engine | ||||
| | * | | | | Add new json-rpc-engine middleware for improved error handling | bitpshr | 2018-05-14 | 2 | -0/+68 |
| | | | | | | |||||
* | | | | | | docs - jsdoc - fix syntax | kumavis | 2018-05-19 | 1 | -1/+1 |
|/ / / / / | |||||
* | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵ | kumavis | 2018-05-17 | 6 | -167/+68 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | scsaba-transaction-history-timestamps | ||||
| * \ \ \ \ | Merge pull request #4146 from MetaMask/sentry-error-like2 | kumavis | 2018-05-17 | 1 | -17/+25 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | sentry - add helper to fully rewrite all error messages | ||||
| | * | | | | | sentry - add helper to fully rewrite all error messages | kumavis | 2018-05-01 | 1 | -17/+25 |
| | | |_|/ / | | |/| | | | |||||
| * | | | | | network - remove debugging console.log | kumavis | 2018-05-17 | 1 | -1/+0 |
| | | | | | | |||||
| * | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵ | kumavis | 2018-05-17 | 4 | -1/+18 |
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | network-controller-remove-setNetworkEndpoints | ||||
| * | | | | | lint - cleanup some unused variables | kumavis | 2018-05-03 | 1 | -1/+0 |
| | | | | | | |||||
| * | | | | | controllers - network - move default config out of first-time-state | kumavis | 2018-05-03 | 2 | -11/+15 |
| | | | | | | |||||
| * | | | | | network - refactor to remove unnecesary code | kumavis | 2018-05-01 | 3 | -124/+29 |
| | | | | | | |||||
| * | | | | | network - remove setNetworkEndpoints | kumavis | 2018-05-01 | 2 | -14/+0 |
| | | | | | | |||||
| * | | | | | controllers - network - more semantic assert | kumavis | 2018-05-01 | 1 | -1/+1 |
| | |/ / / | |/| | | | |||||
* | | | | | tx-state-history-helper - use more readable Date.now method | kumavis | 2018-05-17 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | fix lint issues | Csaba Solya | 2018-05-10 | 2 | -2/+2 |
| | | | | | |||||
* | | | | | remove unnecessary lib | Csaba Solya | 2018-05-10 | 1 | -1/+0 |
| | | | | | |||||
* | | | | | revert unnecessary change in state manager | Csaba Solya | 2018-05-10 | 1 | -13/+7 |
| | | | | | |||||
* | | | | | add time stamps to transaction history log entries | Csaba Solya | 2018-05-10 | 2 | -16/+28 |
| |/ / / |/| | | | |||||
* | | | | Fix documentation typo | bitpshr | 2018-05-08 | 1 | -1/+1 |
| | | | | |||||
* | | | | transactions - add a nonce check utility for ui use | frankiebee | 2018-05-02 | 2 | -0/+16 |
| | | | | |||||
* | | | | fix - getTxsByMetaData check if the key is in the object not if the value is ↵ | frankiebee | 2018-05-02 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | truthy | ||||
* | | | | Merge pull request #4143 from prettymuchbryce/blacklist-shopify-iframe | kumavis | 2018-05-01 | 1 | -0/+1 |
|\ \ \ \ | |/ / / |/| | | | Blacklist problematic shopify iFrame | ||||
| * | | | Blacklist problematic shopify iFrame | Bryce Neal | 2018-05-01 | 1 | -0/+1 |
| | | | | |||||
* | | | | sentry - report error-like messages using the obj message | kumavis | 2018-05-01 | 1 | -0/+10 |
| | | | | |||||
* | | | | sentry - wrap report modifiers in a try-catch | kumavis | 2018-05-01 | 1 | -16/+24 |
| | | | | |||||
* | | | | Merge pull request #4059 from MetaMask/i-4033-seed-words | kumavis | 2018-05-01 | 2 | -23/+1 |
|\ \ \ \ | |/ / / |/| | | | Use new design for Reveal Seed screen. Persist seed words only in the first time flow. | ||||
| * | | | Merge branch 'master' of https://github.com/MetaMask/metamask-extension into ↵ | Alexander Tseung | 2018-04-23 | 11 | -79/+295 |
| |\ \ \ | | | | | | | | | | | | | | | | i-4033-seed-words | ||||
| * | | | | Revert "Fix UI getting stuck in Reveal Seed screen" | Alexander Tseung | 2018-04-22 | 2 | -23/+1 |
| | | | | | | | | | | | | | | | | | | | | This reverts commit 2c8156ebe91941309d49e8f8f1ed8e9d740bb9de. | ||||
* | | | | | Merge pull request #4132 from MetaMask/master | kumavis | 2018-04-30 | 2 | -18/+25 |
|\ \ \ \ \ | | |_|/ / | |/| | | | Master | ||||
| * | | | | guard adainst raven erroring | frankiebee | 2018-04-30 | 2 | -18/+25 |
| | | | | | |||||
* | | | | | Merge pull request #4110 from MetaMask/master | kumavis | 2018-04-28 | 9 | -221/+695 |
|\| | | | | | | | | | | | | | | Develop - Add commits to develop that are already in Master | ||||
| * | | | | Merge pull request #4095 from MetaMask/v4.6.0v4.6.0 | Thomas Huang | 2018-04-27 | 2 | -2/+2 |
| |\ \ \ \ | | | | | | | | | | | | | Version 4.6.0 | ||||
| * \ \ \ \ | Merge pull request #4042 from MetaMask/tx-controller-rewrite-v3 | kumavis | 2018-04-26 | 9 | -221/+695 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | docs and file organization for txController | ||||
| | * | | | | | transactions - more docs and clean ups | frankiebee | 2018-04-26 | 6 | -55/+116 |
| | | | | | | | |||||
| | * | | | | | Cleaned up some typos and JSDocs in Transactions | Dan Finlay | 2018-04-24 | 3 | -38/+40 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Nonce tracker is not fully documented yet. Have not yet touched: - tx-state-manager - tx-state-history-helper - util - tx-gas-utils - pending-tx-tracker | ||||
| | * | | | | | transactions - fix refernces | frankiebee | 2018-04-20 | 2 | -1/+2 |
| | | | | | | | |||||
| | * | | | | | Merge branch 'master' into tx-controller-rewrite-v3 | frankiebee | 2018-04-20 | 35 | -197/+871 |
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | | | |||||
| | * | | | | | meta - transactions - docs yo! | frankiebee | 2018-04-20 | 8 | -73/+351 |
| | | | | | | | |||||
| | * | | | | | fix up - more docs | frankiebee | 2018-04-14 | 3 | -38/+77 |
| | | | | | | | |||||
| | * | | | | | meta - transactions - code clean up and jsDoc | frankiebee | 2018-04-14 | 1 | -41/+109 |
| | | | | | | | |||||
| | * | | | | | transactions - code cleanup | frankiebee | 2018-04-13 | 2 | -58/+59 |
| | | | | | | | |||||
| | * | | | | | transactions - lint fixes | frankiebee | 2018-04-11 | 3 | -12/+12 |
| | | | | | | | |||||
| | * | | | | | meta - transactions - create a transactions dir in controller and move ↵ | frankiebee | 2018-04-11 | 8 | -69/+93 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | relevant files into it | ||||
* | | | | | | | Return 0 for token rate fetch failures | bitpshr | 2018-04-27 | 1 | -1/+5 |
| |_|_|/ / / |/| | | | | | |||||
* | | | | | | rpc - bump provider-engine + eth-json-rpc-filters | kumavis | 2018-04-26 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | Merge pull request #4069 from MetaMask/i4056-LatestPriceApi | Dan Finlay | 2018-04-26 | 1 | -1/+1 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | Use latest balanc3 api for prices | ||||
| * | | | | | Use latest balanc3 api for prices | Dan Finlay | 2018-04-25 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | lint fix | Dan | 2018-04-24 | 1 | -0/+1 |
| | | | | | | |||||
* | | | | | | Merge branch 'master' into dm-docs-2 | Dan | 2018-04-24 | 18 | -280/+867 |
|\| | | | | | |||||
| * | | | | | Use the metamask balanc3 dev price api | Dan Finlay | 2018-04-24 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | Fixes #4056 | ||||
| * | | | | | Merge pull request #4029 from MetaMask/DocumentMetaMaskController | Dan Finlay | 2018-04-24 | 1 | -131/+330 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Added docs to MM-controller | ||||
| | * | | | | | Linted docs | Dan Finlay | 2018-04-24 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | Linted jsdocs | Dan Finlay | 2018-04-21 | 1 | -52/+60 |
| | | | | | | | |||||
| | * | | | | | Added docs to MM-controller | Dan Finlay | 2018-04-19 | 1 | -130/+321 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #3968 from MetaMask/gh-3653 | Dan Finlay | 2018-04-24 | 7 | -104/+151 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Clean up network config | ||||
| | * | | | | | | Clean up network config | Alexander Tseung | 2018-04-24 | 7 | -104/+151 |
| | | |_|_|/ / | | |/| | | | | |||||
| * | | | | | | Merge pull request #4041 from MetaMask/DocumentBackground | Dan Finlay | 2018-04-24 | 1 | -2/+127 |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | Document Background Script | ||||
| | * | | | | | Remove wrong chars | Dan Finlay | 2018-04-21 | 1 | -2/+2 |
| | | | | | | | |||||
| | * | | | | | Add ui note to background docs | Dan Finlay | 2018-04-21 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | Lint background docs | Dan Finlay | 2018-04-21 | 1 | -12/+12 |
| | | | | | | | |||||
| | * | | | | | Document MetaMaskState and TransactionMeta | Dan Finlay | 2018-04-21 | 1 | -0/+69 |
| | | | | | | | |||||
| | * | | | | | Document Background Script | Dan Finlay | 2018-04-20 | 1 | -2/+58 |
| | | |_|/ / | | |/| | | | |||||
| * | | | | | Merge pull request #4020 from MetaMask/i3941-jsdoc-bitpshr | Dan Finlay | 2018-04-21 | 11 | -79/+295 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | Documentation | ||||
| | * | | | | Clean up JSDoc for background scripts | bitpshr | 2018-04-20 | 7 | -24/+32 |
| | | | | | | |||||
| | * | | | | Add more documentation to computed balances controller | bitpshr | 2018-04-20 | 4 | -6/+77 |
| | | | | | | |||||
| | * | | | | Add JSDoc to various background scripts | bitpshr | 2018-04-19 | 3 | -11/+13 |
| | | | | | | |||||
| | * | | | | Add generated docs | bitpshr | 2018-04-19 | 3 | -6/+6 |
| | | | | | | |||||
| | * | | | | Add JSDoc to various background scripts | bitpshr | 2018-04-19 | 6 | -70/+205 |
| | | |_|/ | | |/| | | |||||
* | | | | | Remove accidentally added code in message-manager. | Dan | 2018-04-24 | 1 | -8/+0 |
| | | | | | |||||
* | | | | | Remove unnecessary doc comment. | Dan | 2018-04-24 | 1 | -2/+0 |
| | | | | | |||||
* | | | | | Fix nits. | Dan | 2018-04-24 | 4 | -33/+33 |
| | | | | | |||||
* | | | | | Minor fixes in a number of docs. | Dan | 2018-04-21 | 6 | -18/+17 |
| | | | | | |||||
* | | | | | Notification manager method docs. | Dan | 2018-04-21 | 1 | -4/+31 |
| | | | | | |||||
* | | | | | Merge branch 'master' into dm-docs-2 | Dan | 2018-04-20 | 30 | -329/+596 |
|\| | | | | |||||
| * | | | | Merge pull request #3984 from whymarrh/3941-jsdoc | Dan Finlay | 2018-04-19 | 9 | -48/+150 |
| |\ \ \ \ | | |_|/ / | |/| | | | Add a few docblocks to background files | ||||
| | * | | | Add a few missing docblocks to background files | Whymarrh Whitby | 2018-04-19 | 9 | -48/+150 |
| | | | | | |||||
| * | | | | Merge pull request #3987 from MetaMask/dm-docs-1 | Dan Finlay | 2018-04-19 | 8 | -17/+389 |
| |\ \ \ \ | | |/ / / | |/| | | | Documentation for various controllers and and lib utils | ||||
| | * | | | Missing bracket in docblock. | Dan | 2018-04-19 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Merge branch 'master' into dm-docs-1 | Dan | 2018-04-19 | 22 | -145/+288 |
| | |\| | | |||||
| | * | | | NO MIXED TABS AND SPACES | Dan | 2018-04-19 | 3 | -137/+137 |
| | | | | | |||||
| | * | | | Documentation fix: @constant -> @property | Dan | 2018-04-19 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Fix UI getting stuck in Reveal Seed screen | Alexander Tseung | 2018-04-19 | 2 | -1/+23 |
| | |/ / | |/| | | |||||
| * | | | Fix confirmation popup not always opening | Alexander Tseung | 2018-04-17 | 6 | -53/+83 |
| | | | | |||||
| * | | | Merge branch 'master' into i3981-contract-rates | Dan Finlay | 2018-04-17 | 16 | -9/+17 |
| |\ \ \ | |||||
| | * | | | Require loglevel singleton in each module that uses it | bitpshr | 2018-04-14 | 16 | -9/+17 |
| | | | | | |||||
| * | | | | Disable token price polling when no client is active | bitpshr | 2018-04-17 | 3 | -0/+13 |
| | | | | | |||||
| * | | | | Maintain token prices using a background service | bitpshr | 2018-04-16 | 2 | -0/+83 |
| |/ / / | |||||
| * | | | Add tests for ComposableObservableStore | bitpshr | 2018-04-14 | 1 | -11/+11 |
| | | | | |||||
| * | | | Add ComposableObservableStore for subscription management | bitpshr | 2018-04-13 | 2 | -70/+85 |
| | | | | |||||
* | | | | Even more documentation for various controllers and libs. | Dan | 2018-04-19 | 13 | -49/+742 |
| |/ / |/| | | |||||
* | | | Add missing descriptions in util.js | Dan | 2018-04-17 | 1 | -4/+4 |
| | | | |||||
* | | | Document async function as returning a promise. | Dan | 2018-04-17 | 1 | -1/+1 |
| | | | |||||
* | | | Improve documentation of promises that return undefined. | Dan | 2018-04-17 | 2 | -4/+4 |
| | | | |||||
* | | | Typo fixes, type fixes on the return clauses of the buyEthUrl and ↵ | Dan | 2018-04-17 | 6 | -7/+8 |
| | | | | | | | | | | | | getPrefferedLangCode functions. | ||||
* | | | Spell deprecated correctly. | Dan | 2018-04-17 | 1 | -2/+2 |
| | | | |||||
* | | | @params -> @param fix | Dan | 2018-04-17 | 3 | -8/+8 |
| | | | |||||
* | | | Documentation for various controllers and libs | Dan | 2018-04-17 | 9 | -19/+387 |
| | | | |||||
* | | | Documentation for environemnt-type.js | Dan | 2018-04-12 | 1 | -0/+9 |
|/ / | |||||
* | | Merge pull request #3921 from MetaMask/gh-3736-react-router | kumavis | 2018-04-10 | 1 | -1/+2 |
|\ \ | | | | | | | Add react-router integration | ||||
| * \ | Merge branch 'master' of https://github.com/MetaMask/metamask-extension into ↵ | Alexander Tseung | 2018-04-06 | 10 | -36/+198 |
| |\ \ | | | | | | | | | | | | | cb-254 | ||||
| * \ \ | Merge branch 'master' of https://github.com/MetaMask/metamask-extension into ↵ | Alexander Tseung | 2018-04-05 | 6 | -38/+110 |
| |\ \ \ | | | | | | | | | | | | | | | | cb-254 | ||||
| * \ \ \ | Merge branch 'master' of https://github.com/MetaMask/metamask-extension into ↵ | Alexander Tseung | 2018-04-04 | 10 | -40/+45 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | cb-254 | ||||
| * \ \ \ \ | Fix merge conflicts. Modify send workflow | Alexander Tseung | 2018-04-03 | 2 | -4/+14 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'master' of https://github.com/MetaMask/metamask-extension into ↵ | Alexander Tseung | 2018-03-31 | 2 | -3/+8 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | cb-254 | ||||
| * \ \ \ \ \ \ | Fix merge conflicts | Alexander Tseung | 2018-03-31 | 3 | -6/+5 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Fix i18n merge conflicts | Alexander Tseung | 2018-03-30 | 13 | -142/+261 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Fix merge conflicts | Alexander Tseung | 2018-03-27 | 21 | -333/+898 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'uat-next' of https://github.com/MetaMask/metamask-extension ↵ | Alexander Tseung | 2018-02-09 | 6 | -9/+88 |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into cb-254 | ||||
| * \ \ \ \ \ \ \ \ \ \ | Fix merge conflicts from uat-next | Alexander Tseung | 2018-02-01 | 6 | -3/+85 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'uat' of https://github.com/MetaMask/metamask-extension into cb-254 | Alexander Tseung | 2018-01-30 | 14 | -74/+419 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | Add react-router to allow use of the browser back button | Alexander Tseung | 2017-12-15 | 1 | -1/+2 |
| | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | Merge pull request #3922 from MetaMask/empty-vault-fix | kumavis | 2018-04-07 | 1 | -3/+31 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | Empty vault - attempt recovery | ||||
| * | | | | | | | | | | | | | metamask - never persist if state is missing | kumavis | 2018-04-07 | 1 | -1/+4 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | metamask - never persist if state is missing data | kumavis | 2018-04-07 | 1 | -3/+6 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | metamask - attempt recovery from empty vault | kumavis | 2018-04-07 | 1 | -0/+22 |
| | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | tx-state-manager - dont remove old tx history if candidate is not found | kumavis | 2018-04-07 | 1 | -2/+4 |
|/ / / / / / / / / / / / / | |||||
* | | | | | | | | | | | / | migrations - back fixes | frankiebee | 2018-04-06 | 8 | -88/+115 |
| |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | create migration 25 | frankiebee | 2018-04-06 | 2 | -0/+62 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | meta - create a migration template | frankiebee | 2018-04-06 | 1 | -0/+29 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge pull request #3857 from MetaMask/match-local-localecodes | kumavis | 2018-04-06 | 1 | -2/+4 |
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure get-first-preferred-lang-code.js matches locale codes from loc… | ||||
| * | | | | | | | | | | | | Map existingLocaleCodes and userPreferredLocaleCodes to lower case in ↵ | Dan | 2018-04-04 | 1 | -2/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | get-first-preferred-lang-code.js | ||||
| * | | | | | | | | | | | | Ensure get-first-preferred-lang-code.js matches locale codes from local ↵ | Dan | 2018-04-04 | 1 | -1/+1 |
| | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | directory names and chrome extension api. | ||||
* | | | | | | | | | | | | Merge pull request #3887 from MetaMask/i#3886 | kumavis | 2018-04-06 | 1 | -19/+18 |
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | transactions - remove unnecessary keys on txParams | ||||
| * | | | | | | | | | | | | transactions - _normalizeTxParams will now return a new object for txParams | frankiebee | 2018-04-06 | 1 | -31/+18 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | transactions - remove unnecessary keys on txParams | frankiebee | 2018-04-05 | 1 | -0/+12 |
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge pull request #3900 from MetaMask/migration-error-report | Frankie | 2018-04-06 | 4 | -14/+80 |
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | migrations - report migrations errors to sentry with vault structure | ||||
| * | | | | | | | | | | | | migrator - dont overwrite error stack and warn to console | kumavis | 2018-04-06 | 1 | -2/+5 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | migrator - fix typo | kumavis | 2018-04-06 | 1 | -1/+1 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | migrations - report migrations errors to sentry with vault structure | kumavis | 2018-04-06 | 4 | -14/+77 |
| |/ / / / / / / / / / / | |||||
* | | | | | | | | | | | | Merge pull request #3892 from alextsg/gh-3891 | kumavis | 2018-04-06 | 1 | -0/+4 |
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix populating txParams with undefined data | ||||
| * | | | | | | | | | | | | Fix populating txParams with undefined data | Alexander Tseung | 2018-04-06 | 1 | -0/+4 |
| |/ / / / / / / / / / / | |||||
* / / / / / / / / / / / | make migration-24 compat with first-time-state | frankiebee | 2018-04-06 | 1 | -1/+1 |
|/ / / / / / / / / / / | |||||
* | | | | | | | | | | | transactions - make #_validateTxParams not async and "linting" wink wink ↵ | frankiebee | 2018-04-05 | 1 | -7/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nudge nudge | ||||
* | | | | | | | | | | | Merge branch 'master' of https://github.com/MetaMask/metamask-extension into ↵ | frankiebee | 2018-04-05 | 2 | -2/+6 |
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | normalize-transactions | ||||
| * | | | | | | | | | | | tx - txParams - allow chainId to be a hex string | kumavis | 2018-04-04 | 1 | -1/+1 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Add webby awards to web3 block list. | Dan Finlay | 2018-04-04 | 1 | -1/+5 |
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |||||
* | | | | | | | | | | | hot-fix - migrate unaproved txParams so that the from is lowercase | frankiebee | 2018-04-05 | 2 | -0/+46 |
| | | | | | | | | | | | |||||
* | | | | | | | | | | | transactions - normalize txParams | frankiebee | 2018-04-05 | 2 | -36/+53 |
|/ / / / / / / / / / | |||||
* | | | | | | | | | | tx-state-manager - validateTxParams - validate chainId is Number | kumavis | 2018-04-04 | 1 | -2/+10 |
| | | | | | | | | | | |||||
* | | | | | | | | | | transactions - dont throw if chain id is not a string | frankiebee | 2018-04-04 | 1 | -2/+2 |
| | | | | | | | | | | |||||
* | | | | | | | | | | app - currency - fix typo + prefer log over console | kumavis | 2018-04-04 | 1 | -2/+3 |
| | | | | | | | | | | |||||
* | | | | | | | | | | app - currency - fix typo | kumavis | 2018-04-04 | 1 | -1/+1 |
| | | | | | | | | | | |||||
* | | | | | | | | | | app - warn on fetch errors instead of spamming sentry | kumavis | 2018-04-04 | 4 | -32/+28 |
| | | | | | | | | | | |||||
* | | | | | | | | | | build - correctly set METAMASK_ENV via envify | kumavis | 2018-04-04 | 5 | -6/+6 |
|/ / / / / / / / / | |||||
* | | | | | | | | | transactions gasLimit - use the block gasLimit if getCode fails | frankiebee | 2018-04-03 | 2 | -3/+6 |
| | | | | | | | | | |||||
* | | | | | | | | | transactions validationt - valdate from field on txParams | frankiebee | 2018-04-03 | 1 | -1/+8 |
| |_|_|_|_|_|_|/ |/| | | | | | | | |||||
* | | | | | | | | transactions#newUnapprovedTransaction - dont default origin to metamask | frankiebee | 2018-03-31 | 1 | -1/+1 |
| | | | | | | | | |||||
* | | | | | | | | transactions - put the origing on the txMeta to help with debugging | frankiebee | 2018-03-31 | 2 | -3/+8 |
| |_|_|_|_|_|/ |/| | | | | | | |||||
* | | | | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into ↵ | kumavis | 2018-03-30 | 1 | -3/+2 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | ci-artifacts | ||||
| * \ \ \ \ \ \ | Merge pull request #3782 from MetaMask/i3670-FixNonceBug | Frankie | 2018-03-29 | 1 | -3/+2 |
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | Add test for suspected nonce bug | ||||
| | * | | | | | | Rename variable to be more understandable | Dan Finlay | 2018-03-29 | 1 | -3/+2 |
| | | | | | | | | |||||
* | | | | | | | | build - extension - move js files to toplevel | kumavis | 2018-03-29 | 1 | -3/+3 |
| | | | | | | | | |||||
* | | | | | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into ↵ | kumavis | 2018-03-29 | 4 | -12/+30 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ci-artifacts | ||||
| * | | | | | | | Merge pull request #3777 from MetaMask/etc-fixes | Frankie | 2018-03-29 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Sentry spam fix and etc fixes | ||||
| | * | | | | | | | controllers - currency - warn currency and encountered error | kumavis | 2018-03-29 | 1 | -1/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge pull request #3765 from MetaMask/sentry-error-simplify | Frankie | 2018-03-29 | 1 | -2/+12 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | sentry - simplify error message 'Transaction Failed: known transaction' | ||||
| | * | | | | | | | | sentry - simplify error message 'Transaction Failed: known transaction' | kumavis | 2018-03-28 | 1 | -2/+12 |
| | |/ / / / / / / | |||||
| * / / / / / / / | tx controller - explode on non-hex txParams + dont add chainId to txParams + ↵ | kumavis | 2018-03-28 | 2 | -9/+17 |
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | sign with chainId as number | ||||
* / / / / / / / | build - rename 'popup.js' to 'ui.js' | kumavis | 2018-03-29 | 1 | -0/+0 |
|/ / / / / / / | |||||
* | | | | | | | Merge pull request #3752 from MetaMask/sentry-error-fix | Frankie | 2018-03-28 | 3 | -25/+35 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | sentry - simplify all ethjs errors for better batching | ||||
| * | | | | | | | sentry - simplify all ethjs errors for better batching | kumavis | 2018-03-28 | 3 | -25/+35 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #3760 from MetaMask/i3439-ResetCacheOnAccountReset | kumavis | 2018-03-28 | 1 | -34/+39 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Fix bug where resetAccount does not clear network cache | ||||
| * | | | | | | | | metamask-controller - fix typo | kumavis | 2018-03-28 | 1 | -1/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | Fix bug where resetAccount does not clear network cache | Dan Finlay | 2018-03-28 | 1 | -34/+39 |
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #3439 | ||||
* | | | | | | | | i18n - derrive locale codes from index | kumavis | 2018-03-28 | 1 | -3/+2 |
| | | | | | | | | |||||
* | | | | | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into ↵ | kumavis | 2018-03-28 | 3 | -6/+52 |
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | i18n-translator-redux | ||||
| * | | | | | | | Merge branch 'master' into i#3731 | frankiebee | 2018-03-28 | 1 | -2/+0 |
| |\| | | | | | | |||||
| * | | | | | | | migration for removing unnecessary transactions from state | frankiebee | 2018-03-28 | 2 | -0/+52 |
| | | | | | | | | |||||
| * | | | | | | | transactions - only save up to 40 txs totall across all networks | frankiebee | 2018-03-27 | 1 | -6/+1 |
| | |_|_|_|_|/ | |/| | | | | | |||||
* | | | | | | | Undo unnecessary line removals. | Dan | 2018-03-27 | 2 | -0/+2 |
| | | | | | | | |||||
* | | | | | | | Remove comments and console.logs | Dan | 2018-03-27 | 1 | -2/+1 |
| | | | | | | | |||||
* | | | | | | | Merge branch 'master' into i18n-translator-redux | Dan | 2018-03-27 | 3 | -2/+40 |
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| * | | | | | | include migration 22 | frankiebee | 2018-03-27 | 1 | -0/+1 |
| | | | | | | | |||||
| * | | | | | | Fix bug where full localStorage would crash on start | Dan Finlay | 2018-03-27 | 1 | -2/+0 |
| |/ / / / / | |||||
| * | | | | | migration for adding submittedTime to the txMeta (#3727) | Frankie | 2018-03-27 | 1 | -0/+39 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * test for migration 022 * write migration 022 adding submittedTime to txMetas whove been submitted | ||||
* | | | | | | Merge branch 'master' into i18n-translator-redux | Dan | 2018-03-27 | 2 | -6/+29 |
|\| | | | | | |||||
| * | | | | | lint - fix | kumavis | 2018-03-24 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | sentry - namespace files under metamask dir | kumavis | 2018-03-24 | 1 | -2/+2 |
| | | | | | | |||||
| * | | | | | sentry - rewrite report urls + use raven-js from npm | kumavis | 2018-03-24 | 2 | -7/+30 |
| | | | | | | |||||
* | | | | | | Use extension api to get initial locale. | Dan | 2018-03-22 | 4 | -6/+26 |
| | | | | | | |||||
* | | | | | | Merge branch 'master' into i18n-translator-redux | Dan | 2018-03-22 | 7 | -251/+392 |
|\| | | | | | |||||
| * | | | | | Merge branch 'master' of https://github.com/trigun0x2/metamask-extension ↵ | kumavis | 2018-03-22 | 3 | -6/+15 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | into trigun0x2-master | ||||
| | * | | | | | fix for lint | Jeffrey Tong | 2018-03-21 | 1 | -5/+5 |
| | | | | | | | |||||
| | * | | | | | remove console log | Jeffrey Tong | 2018-03-12 | 1 | -2/+0 |
| | | | | | | | |||||
| | * | | | | | add comments that need clarification on naming convention | Jeffrey Tong | 2018-03-12 | 3 | -9/+10 |
| | | | | | | | |||||
| | * | | | | | fixed multiple notification windows when executing batch | Jeffrey Tong | 2018-03-08 | 2 | -2/+14 |
| | | | | | | | |||||
| | * | | | | | removed check for width & height on multiple popup windows | Jeffrey Tong | 2018-03-08 | 1 | -3/+1 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #3585 from lazaridiscom/laz/i3568 | kumavis | 2018-03-21 | 1 | -245/+354 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | [WIP] document/rearrange metamask-controller.js, re #3568 | ||||
| | * | | | | | | moves setup-related code towads end of file, re #3568 | Lazaridis | 2018-03-17 | 1 | -115/+124 |
| | | | | | | | | |||||
| | * | | | | | | add ESLint exceptions for //= and //-, re #3568 | Lazaridis | 2018-03-16 | 1 | -3/+3 |
| | | | | | | | | |||||
| | * | | | | | | group all vault/keyring related methods together, re #3568 | Lazaridis | 2018-03-16 | 1 | -128/+130 |
| | | | | | | | | |||||
| | * | | | | | | adds initial documentation, re #3568 | Lazaridis | 2018-03-16 | 1 | -40/+138 |
| | | | | | | | | |||||
| * | | | | | | | Merge pull request #3504 from lazaridiscom/laz/i3427 | kumavis | 2018-03-21 | 3 | -0/+23 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | adds READMEs to folders, re #3427 | ||||
| | * | | | | | | | add READMEs to folders, re #3427 | Lazaridis | 2018-03-14 | 3 | -0/+23 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into ↵ | kumavis | 2018-03-21 | 2 | -31/+64 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | i18n-translator-redux | ||||
| * | | | | | | | | Merge branch 'master' into retry-tx-refractor | Dan | 2018-03-20 | 1 | -1/+16 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'master' into retry-tx-refractor | frankiebee | 2018-03-15 | 1 | -4/+28 |
| |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | | | |||||
| * | | | | | | | | | fix destructuring of variables | frankiebee | 2018-03-14 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Fix TransactionStateManager spelling. | Dan | 2018-03-14 | 1 | -2/+2 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Merge branch 'master' into retry-tx-refractor | Dan | 2018-03-14 | 3 | -5/+74 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | transactions - return the txMeta in retryTransaction | frankiebee | 2018-03-14 | 1 | -2/+3 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | transactions:state - add a submittedTime stamp so the ui has a better grasp ↵ | frankiebee | 2018-03-14 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | of the time of submission | ||||
| * | | | | | | | | | | Merge branch 'master' into retry-tx-refractor | Dan | 2018-03-09 | 4 | -12/+95 |
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / | | |/| | | | | | | | | |||||
| * | | | | | | | | | | fix marking of confirmed transaction as dropped | frankiebee | 2018-03-09 | 1 | -1/+1 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | transactions - make _markNonceDuplicatesDropped | frankiebee | 2018-03-08 | 1 | -21/+20 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Merge branch 'master' into retry-tx-refractor | frankiebee | 2018-03-08 | 5 | -8/+121 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | refactor retrytx with higher gas price: | frankiebee | 2018-03-08 | 2 | -26/+55 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - create a new tx instead of overwriting the tx hash - add a new state 'dropped' to the txStateManager - mark duplicate txs as dropped when one gets confirmed in a block | ||||
* | | | | | | | | | | | | Lint fixes. | Dan | 2018-03-20 | 1 | -1/+0 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge branch 'master' into i18n-translator-redux | Dan | 2018-03-20 | 1 | -1/+16 |
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / | |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | Inject Script: Blacklist domains where not to inject script | Saptak Sengupta | 2018-03-17 | 1 | -1/+16 |
| | |_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Put a blacklist domain check where if the page url is in the list of blacklisted domains, we shouldn't inject script in that web page. | ||||
* | | | | | | | | | | | Fetch localeMessages in front end only. | Dan | 2018-03-20 | 2 | -13/+3 |
| | | | | | | | | | | |