Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | 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 | |
* | | | | Merge pull request #4143 from prettymuchbryce/blacklist-shopify-iframe | kumavis | 2018-05-01 | 1 | -0/+1 | |
|\ \ \ \ | |/ / / |/| | | | ||||||
| * | | | 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 | |
|\ \ \ \ | |/ / / |/| | | | ||||||
| * | | | Merge branch 'master' of https://github.com/MetaMask/metamask-extension into ... | Alexander Tseung | 2018-04-23 | 11 | -79/+295 | |
| |\ \ \ | ||||||
| * | | | | Revert "Fix UI getting stuck in Reveal Seed screen" | Alexander Tseung | 2018-04-22 | 2 | -23/+1 | |
* | | | | | Merge pull request #4132 from MetaMask/master | kumavis | 2018-04-30 | 2 | -18/+25 | |
|\ \ \ \ \ | | |_|/ / | |/| | | | ||||||
| * | | | | 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 | |
|\| | | | | ||||||
| * | | | | Merge pull request #4095 from MetaMask/v4.6.0v4.6.0 | Thomas Huang | 2018-04-27 | 2 | -2/+2 | |
| |\ \ \ \ | ||||||
| * \ \ \ \ | Merge pull request #4042 from MetaMask/tx-controller-rewrite-v3 | kumavis | 2018-04-26 | 9 | -221/+695 | |
| |\ \ \ \ \ | ||||||
| | * | | | | | 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 | |
| | * | | | | | 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 releva... | frankiebee | 2018-04-11 | 8 | -69/+93 | |
* | | | | | | | 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 | 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 | |
| * | | | | | Merge pull request #4029 from MetaMask/DocumentMetaMaskController | Dan Finlay | 2018-04-24 | 1 | -131/+330 | |
| |\ \ \ \ \ | ||||||
| | * | | | | | 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 | Alexander Tseung | 2018-04-24 | 7 | -104/+151 | |
| | | |_|_|/ / | | |/| | | | | ||||||
| * | | | | | | Merge pull request #4041 from MetaMask/DocumentBackground | Dan Finlay | 2018-04-24 | 1 | -2/+127 | |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | ||||||
| | * | | | | | 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 | |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | ||||||
| | * | | | | 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 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 | |
| |\ \ \ \ | | |/ / / | |/| | | | ||||||
| | * | | | 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 getPreffere... | Dan | 2018-04-17 | 6 | -7/+8 | |
* | | | 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 | |
|\ \ | ||||||
| * \ | Merge branch 'master' of https://github.com/MetaMask/metamask-extension into ... | Alexander Tseung | 2018-04-06 | 10 | -36/+198 | |
| |\ \ | ||||||
| * \ \ | Merge branch 'master' of https://github.com/MetaMask/metamask-extension into ... | Alexander Tseung | 2018-04-05 | 6 | -38/+110 | |
| |\ \ \ | ||||||
| * \ \ \ | Merge branch 'master' of https://github.com/MetaMask/metamask-extension into ... | Alexander Tseung | 2018-04-04 | 10 | -40/+45 | |
| |\ \ \ \ | ||||||
| * \ \ \ \ | 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 | |
| |\ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ | 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 int... | Alexander Tseung | 2018-02-09 | 6 | -9/+88 | |
| |\ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ | 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 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | 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 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Map existingLocaleCodes and userPreferredLocaleCodes to lower case in get-fir... | Dan | 2018-04-04 | 1 | -2/+4 | |
| * | | | | | | | | | | | | Ensure get-first-preferred-lang-code.js matches locale codes from local direc... | Dan | 2018-04-04 | 1 | -1/+1 | |
| | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge pull request #3887 from MetaMask/i#3886 | kumavis | 2018-04-06 | 1 | -19/+18 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | 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 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | 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 | 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 nudg... | frankiebee | 2018-04-05 | 1 | -7/+12 | |
* | | | | | | | | | | | Merge branch 'master' of https://github.com/MetaMask/metamask-extension into ... | frankiebee | 2018-04-05 | 2 | -2/+6 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | 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 ci-artif... | kumavis | 2018-03-30 | 1 | -3/+2 | |
|\ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ | Merge pull request #3782 from MetaMask/i3670-FixNonceBug | Frankie | 2018-03-29 | 1 | -3/+2 | |
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | ||||||
| | * | | | | | | 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 ci-artif... | kumavis | 2018-03-29 | 4 | -12/+30 | |
|\| | | | | | | | ||||||
| * | | | | | | | Merge pull request #3777 from MetaMask/etc-fixes | Frankie | 2018-03-29 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ | ||||||
| | * | | | | | | | 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' | 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 | |
| |/ / / / / / / | ||||||
* / / / / / / / | 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 | kumavis | 2018-03-28 | 3 | -25/+35 | |
* | | | | | | | | Merge pull request #3760 from MetaMask/i3439-ResetCacheOnAccountReset | kumavis | 2018-03-28 | 1 | -34/+39 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | 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 | |
| |/ / / / / / / | ||||||
* | | | | | | | | i18n - derrive locale codes from index | kumavis | 2018-03-28 | 1 | -3/+2 | |
* | | | | | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into i18n-tra... | kumavis | 2018-03-28 | 3 | -6/+52 | |
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | ||||||
| * | | | | | | | 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 | |
* | | | | | | 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 into... | kumavis | 2018-03-22 | 3 | -6/+15 | |
| |\ \ \ \ \ | ||||||
| | * | | | | | 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 | |
| |\ \ \ \ \ \ | ||||||
| | * | | | | | | 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 | |
| |\ \ \ \ \ \ \ | ||||||
| | * | | | | | | | add READMEs to folders, re #3427 | Lazaridis | 2018-03-14 | 3 | -0/+23 | |
* | | | | | | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into i18n-tra... | kumavis | 2018-03-21 | 2 | -31/+64 | |
|\| | | | | | | | | ||||||
| * | | | | | | | | 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 o... | frankiebee | 2018-03-14 | 1 | -0/+4 | |
| * | | | | | | | | | | 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 | |
* | | | | | | | | | | | | 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 | |
| | |_|_|_|/ / / / / / | |/| | | | | | | | | | ||||||
* | | | | | | | | | | | Fetch localeMessages in front end only. | Dan | 2018-03-20 | 2 | -13/+3 | |
* | | | | | | | | | | | Handle i18n with redux. | Dan | 2018-03-16 | 4 | -8/+25 | |
* | | | | | | | | | | | i18n - load locales manually | kumavis | 2018-03-15 | 1 | -59/+74 | |
|/ / / / / / / / / / | ||||||
* | | | | | | | | | | local-store - fix class syntax | kumavis | 2018-03-15 | 1 | -2/+2 | |
* | | | | | | | | | | local-store - check for error from extension.runtime | kumavis | 2018-03-15 | 1 | -3/+28 | |
* | | | | | | | | | | local-store - fix promisification of methods | kumavis | 2018-03-15 | 1 | -3/+2 | |
* | | | | | | | | | | fix destructuring of variables | frankiebee | 2018-03-14 | 1 | -1/+1 | |
| |_|_|/ / / / / / |/| | | | | | | | | ||||||
* | | | | | | | | | Merge branch 'master' into i3076-UseStorageLocalInstead | kumavis | 2018-03-14 | 1 | -2/+4 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | tx-gas-utils - fix code style | kumavis | 2018-03-14 | 1 | -1/+1 | |
| * | | | | | | | | | transactions move validation of the to field to validateRecipient | frankiebee | 2018-03-14 | 1 | -7/+3 | |
| * | | | | | | | | | Merge remote-tracking branch 'origin/i#3509' into i#3509 | frankiebee | 2018-03-14 | 4 | -12/+95 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ | Merge branch 'master' into i#3509 | Frankie | 2018-03-14 | 4 | -12/+95 | |
| | |\ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / | | | |/| | | | | | | | ||||||
| * | / | | | | | | | | fix error message | frankiebee | 2018-03-14 | 1 | -1/+1 | |
| |/ / / / / / / / / | ||||||
| * | | / / / / / / | transactions - insure if a to field in tx params has a truthy valu that it is... | frankiebee | 2018-03-14 | 1 | -1/+7 | |
| | |_|/ / / / / / | |/| | | | | | | | ||||||
* | | | | | | | | | lint fix | kumavis | 2018-03-09 | 1 | -1/+1 | |
* | | | | | | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into i3076-Us... | kumavis | 2018-03-09 | 2 | -9/+92 | |
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | ||||||
| * | | | | | | | | Merge pull request #3409 from scsaba/seed-phrase-verification | Dan Finlay | 2018-03-08 | 2 | -9/+92 | |
| |\ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | | ||||||
| | * | | | | | | | modify verifySeedPhrase to async and call it from addNewAccount also | Csaba Solya | 2018-03-06 | 1 | -32/+34 | |
| | * | | | | | | | add documentation | Csaba Solya | 2018-03-04 | 2 | -0/+9 | |
| | * | | | | | | | verify seedwords on log in | Csaba Solya | 2018-03-04 | 1 | -3/+16 | |
| | * | | | | | | | verify addresses regardless case | Csaba Solya | 2018-03-03 | 1 | -1/+1 | |
| | * | | | | | | | fix lint issues | Csaba Solya | 2018-03-03 | 2 | -11/+11 | |
| | * | | | | | | | seed phrase verifier | Csaba Solya | 2018-03-03 | 2 | -2/+61 | |
* | | | | | | | | | background - storage - cleanup storage wiring | kumavis | 2018-03-09 | 2 | -34/+30 | |
* | | | | | | | | | Tighten up data loading code | Dan Finlay | 2018-03-08 | 1 | -4/+8 | |
* | | | | | | | | | Add clarifying comment | Dan Finlay | 2018-03-08 | 1 | -0/+1 | |
* | | | | | | | | | Some fixes for new storage strategy | Dan Finlay | 2018-03-08 | 1 | -5/+9 | |
* | | | | | | | | | Increase storage debounce to 2s | Dan Finlay | 2018-03-08 | 1 | -1/+1 | |
* | | | | | | | | | Merge branch 'master' into i3076-UseStorageLocalInstead | Dan Finlay | 2018-03-08 | 2 | -3/+3 | |
|\| | | | | | | | | ||||||
| * | | | | | | | | fix typo in tests and tx-state-manager | Jeffrey Tong | 2018-03-08 | 1 | -1/+1 | |
| * | | | | | | | | fix typo in transaction.js | Jeffrey Tong | 2018-03-07 | 1 | -2/+2 | |
| | |/ / / / / / | |/| | | | | | | ||||||
* | | | | | | | | Merge branch 'master' into i3076-UseStorageLocalInstead | Dan Finlay | 2018-03-07 | 22 | -32/+397 | |
|\| | | | | | | | ||||||
| * | | | | | | | Merge pull request #3309 from scsaba/edge-support | Dan Finlay | 2018-03-07 | 2 | -0/+77 | |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | ||||||
| | * | | | | | | make keyFromPassword private | Csaba Solya | 2018-02-23 | 1 | -3/+3 | |
| | * | | | | | | Merge branch 'master' into edge-support | Csaba S | 2018-02-22 | 13 | -12/+196 | |
| | |\ \ \ \ \ \ | ||||||
| | * | | | | | | | add edge support | Csaba Solya | 2018-02-22 | 2 | -0/+77 | |
| * | | | | | | | | sentry - extractErrorMessage - fix comment formatting | kumavis | 2018-03-01 | 1 | -1/+1 | |
| * | | | | | | | | sentry - failed tx - improve ethjs-rpc error formating | kumavis | 2018-03-01 | 2 | -5/+41 | |
| * | | | | | | | | sentry - clean - move setupRaven to lib | kumavis | 2018-03-01 | 3 | -3/+3 | |
| | |_|/ / / / / | |/| | | | | | | ||||||
| * | | | | | | | Merge pull request #3281 from MetaMask/sentry-failed-tx-debatch | Dan Finlay | 2018-02-28 | 1 | -1/+2 | |
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | ||||||
| | * | | | | | | sentry - report failed tx with more specific message | kumavis | 2018-02-17 | 1 | -1/+2 | |
| * | | | | | | | Merge pull request #3306 from danjm/MM-805-send-from-tab-popup-fix | Thomas Huang | 2018-02-22 | 1 | -1/+11 | |
| |\ \ \ \ \ \ \ | ||||||
| | * | | | | | | | Prevents new transaction from generating popup when metamask is open in an ac... | Dan | 2018-02-22 | 1 | -1/+11 | |
| | | |_|_|_|_|/ | | |/| | | | | | ||||||
| * | | | | | | | Merge branch 'master' into uat-master | Dan Finlay | 2018-02-22 | 4 | -3/+17 | |
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | ||||||
| | * | | | | | | Merge pull request #3250 from MetaMask/i#3136 | kumavis | 2018-02-16 | 1 | -2/+3 | |
| | |\ \ \ \ \ \ | ||||||
| | | * | | | | | | fix - hex prefix estimatedGas on txMeta | frankiebee | 2018-02-15 | 1 | -2/+3 | |
| | * | | | | | | | Fix incorrect promise instantiation | Dan Finlay | 2018-02-16 | 1 | -1/+1 | |
| | | |_|/ / / / | | |/| | | | | | ||||||
| | * | | | | | | Merge pull request #3222 from MetaMask/mesh-test | Dan Finlay | 2018-02-16 | 2 | -0/+13 | |
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | ||||||
| | | * | | | | | metamask mesh - inject mesh testing container | kumavis | 2018-02-11 | 2 | -0/+13 | |
| | * | | | | | | use the providers initial _blocktracker. fixes #2393 | Lazaridis | 2018-02-11 | 1 | -1/+1 | |
| | |/ / / / / | ||||||
| * | / / / / | Fix promise construction | Dan Finlay | 2018-02-21 | 1 | -1/+1 | |
| | |/ / / / | |/| | | | | ||||||
| * | | | | | Merge branch 'uat' into uat-next | Dan | 2018-02-08 | 5 | -9/+62 | |
| |\ \ \ \ \ | ||||||
| | * | | | | | Merge branch 'master' into uat | Dan | 2018-02-08 | 5 | -9/+62 | |
| | |\| | | | | | | |_|_|/ | | |/| | | | ||||||
| | | * | | | Merge branch 'master' into localStorage-clean-up | Frankie | 2018-02-01 | 3 | -0/+23 | |
| | | |\ \ \ | ||||||
| | | | * | | | preserve other networks TXs | Bruno Barbieri | 2018-02-01 | 1 | -3/+4 | |
| | | | * | | | use txMeta.txParams | Bruno Barbieri | 2018-01-31 | 1 | -1/+1 | |
| | | | * | | | wipe only transactions for current account | Bruno Barbieri | 2018-01-31 | 3 | -9/+15 | |
| | | | * | | | clean up | Bruno Barbieri | 2018-01-31 | 1 | -3/+3 | |
| | | | * | | | added reset account feature | Bruno Barbieri | 2018-01-31 | 3 | -0/+16 |