Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | diagnostics - minor fixes | kumavis | 2018-06-06 | 1 | -3/+3 |
* | lint - fix diagnostics reporter | kumavis | 2018-06-06 | 1 | -1/+1 |
* | diagnostics - rewrite bug-notifier as diagnostics-reporter | kumavis | 2018-06-06 | 2 | -22/+71 |
* | Linted | Dan Finlay | 2018-06-05 | 1 | -1/+1 |
* | Add version to report | Dan Finlay | 2018-06-05 | 1 | -1/+3 |
* | Fine tune error posting | Dan Finlay | 2018-06-05 | 1 | -5/+1 |
* | Begin adding unconfigured notifier | Dan Finlay | 2018-06-05 | 1 | -9/+4 |
* | Persist lost identities to storage for later analysis | Dan Finlay | 2018-06-05 | 1 | -0/+29 |
* | Merge pull request #4426 from MetaMask/sentry-url-rewrite-fix | kumavis | 2018-06-04 | 1 | -1/+1 |
|\ | |||||
| * | sentry - message rewrite - guard against missing message | kumavis | 2018-05-31 | 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 merge-ma... | kumavis | 2018-05-30 | 1 | -0/+24 |
|\ | |||||
| * | cleanErrorStack moved to separate library module | Anton | 2018-05-29 | 1 | -0/+24 |
* | | i18n - getFirstPreferredLangCode - guard against missing i18n api | kumavis | 2018-05-29 | 1 | -4/+7 |
* | | Merge pull request #4199 from MetaMask/i3487-provider-errors | Dan Finlay | 2018-05-19 | 2 | -0/+68 |
|\ \ | |||||
| * | | Add new json-rpc-engine middleware for improved error handling | bitpshr | 2018-05-14 | 2 | -0/+68 |
| |/ | |||||
* / | sentry - add helper to fully rewrite all error messages | kumavis | 2018-05-01 | 1 | -17/+25 |
|/ | |||||
* | 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 | 1 | -21/+1 |
|\ | |||||
| * | Merge branch 'master' of https://github.com/MetaMask/metamask-extension into ... | Alexander Tseung | 2018-04-23 | 3 | -5/+41 |
| |\ | |||||
| * | | Revert "Fix UI getting stuck in Reveal Seed screen" | Alexander Tseung | 2018-04-22 | 1 | -21/+1 |
* | | | guard adainst raven erroring | frankiebee | 2018-04-30 | 1 | -17/+20 |
* | | | Merge pull request #4042 from MetaMask/tx-controller-rewrite-v3 | kumavis | 2018-04-26 | 5 | -784/+0 |
|\ \ \ | |||||
| * | | | Merge branch 'master' into tx-controller-rewrite-v3 | frankiebee | 2018-04-20 | 19 | -59/+304 |
| |\| | | |||||
| * | | | meta - transactions - create a transactions dir in controller and move releva... | frankiebee | 2018-04-11 | 5 | -784/+0 |
* | | | | lint fix | Dan | 2018-04-24 | 1 | -0/+1 |
* | | | | Merge branch 'master' into dm-docs-2 | Dan | 2018-04-24 | 4 | -17/+52 |
|\ \ \ \ | |||||
| * | | | | Clean up network config | Alexander Tseung | 2018-04-24 | 1 | -12/+11 |
| | |_|/ | |/| | | |||||
| * | | | Merge pull request #4020 from MetaMask/i3941-jsdoc-bitpshr | Dan Finlay | 2018-04-21 | 3 | -5/+41 |
| |\ \ \ | | |_|/ | |/| | | |||||
| | * | | Clean up JSDoc for background scripts | bitpshr | 2018-04-20 | 2 | -3/+3 |
| | * | | Add more documentation to computed balances controller | bitpshr | 2018-04-20 | 3 | -5/+41 |
* | | | | 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 | 3 | -32/+32 |
* | | | | Minor fixes in a number of docs. | Dan | 2018-04-21 | 5 | -16/+15 |
* | | | | Notification manager method docs. | Dan | 2018-04-21 | 1 | -4/+31 |
* | | | | Merge branch 'master' into dm-docs-2 | Dan | 2018-04-20 | 16 | -74/+238 |
|\| | | | |||||
| * | | | Merge pull request #3984 from whymarrh/3941-jsdoc | Dan Finlay | 2018-04-19 | 7 | -28/+120 |
| |\ \ \ | |||||
| | * | | | Add a few missing docblocks to background files | Whymarrh Whitby | 2018-04-19 | 7 | -28/+120 |
| * | | | | Merge pull request #3987 from MetaMask/dm-docs-1 | Dan Finlay | 2018-04-19 | 4 | -0/+75 |
| |\ \ \ \ | | |/ / / | |/| | | | |||||
| | * | | | Merge branch 'master' into dm-docs-1 | Dan | 2018-04-19 | 10 | -46/+97 |
| | |\| | | |||||
| * | | | | Fix UI getting stuck in Reveal Seed screen | Alexander Tseung | 2018-04-19 | 1 | -1/+21 |
| | |/ / | |/| | | |||||
| * | | | Fix confirmation popup not always opening | Alexander Tseung | 2018-04-17 | 4 | -30/+33 |
| * | | | Require loglevel singleton in each module that uses it | bitpshr | 2018-04-14 | 5 | -1/+6 |
| * | | | Add tests for ComposableObservableStore | bitpshr | 2018-04-14 | 1 | -11/+11 |
| * | | | Add ComposableObservableStore for subscription management | bitpshr | 2018-04-13 | 1 | -0/+49 |
* | | | | Even more documentation for various controllers and libs. | Dan | 2018-04-19 | 9 | -40/+571 |
| |/ / |/| | | |||||
* | | | 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 |
* | | | Typo fixes, type fixes on the return clauses of the buyEthUrl and getPreffere... | Dan | 2018-04-17 | 2 | -3/+4 |
* | | | @params -> @param fix | Dan | 2018-04-17 | 1 | -2/+2 |
* | | | Documentation for various controllers and libs | Dan | 2018-04-17 | 5 | -3/+74 |
* | | | 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 | 4 | -6/+64 |
| |\ | |||||
| * \ | Merge branch 'master' of https://github.com/MetaMask/metamask-extension into ... | Alexander Tseung | 2018-04-05 | 2 | -35/+2 |
| |\ \ | |||||
| * \ \ | Merge branch 'master' of https://github.com/MetaMask/metamask-extension into ... | Alexander Tseung | 2018-04-04 | 2 | -3/+11 |
| |\ \ \ | |||||
| * \ \ \ | Fix merge conflicts. Modify send workflow | Alexander Tseung | 2018-04-03 | 1 | -2/+11 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Fix merge conflicts | Alexander Tseung | 2018-03-31 | 1 | -3/+2 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Fix i18n merge conflicts | Alexander Tseung | 2018-03-30 | 5 | -36/+73 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Fix merge conflicts | Alexander Tseung | 2018-03-27 | 9 | -20/+255 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'uat-next' of https://github.com/MetaMask/metamask-extension int... | Alexander Tseung | 2018-02-09 | 2 | -0/+22 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Fix merge conflicts from uat-next | Alexander Tseung | 2018-02-01 | 1 | -1/+2 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'uat' of https://github.com/MetaMask/metamask-extension into cb-254 | Alexander Tseung | 2018-01-30 | 4 | -20/+55 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Add react-router to allow use of the browser back button | Alexander Tseung | 2017-12-15 | 1 | -1/+2 |
* | | | | | | | | | | | | tx-state-manager - dont remove old tx history if candidate is not found | kumavis | 2018-04-07 | 1 | -2/+4 |
| |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | |||||
* | | | | | | | | | | | 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 #3900 from MetaMask/migration-error-report | Frankie | 2018-04-06 | 2 | -4/+56 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | 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 | 2 | -4/+53 |
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |||||
* / | | | | | | | | | | Fix populating txParams with undefined data | Alexander Tseung | 2018-04-06 | 1 | -0/+4 |
|/ / / / / / / / / / | |||||
* | | | | | | | | | | Merge branch 'master' of https://github.com/MetaMask/metamask-extension into ... | frankiebee | 2018-04-05 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | tx - txParams - allow chainId to be a hex string | kumavis | 2018-04-04 | 1 | -1/+1 |
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | |||||
* / | | | | | | | | | transactions - normalize txParams | frankiebee | 2018-04-05 | 1 | -34/+1 |
|/ / / / / / / / / | |||||
* | | | | | | | | | 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 |
* | | | | | | | | | build - correctly set METAMASK_ENV via envify | kumavis | 2018-04-04 | 1 | -1/+1 |
|/ / / / / / / / | |||||
* | | | | | | | | transactions gasLimit - use the block gasLimit if getCode fails | frankiebee | 2018-04-03 | 1 | -1/+3 |
* | | | | | | | | transactions validationt - valdate from field on txParams | frankiebee | 2018-04-03 | 1 | -1/+8 |
| |_|_|_|_|_|/ |/| | | | | | | |||||
* | | | | | | | 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 |
* | | | | | | | 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 | 1 | -5/+11 |
|/ / / / / / / | |||||
* | | | | | | | 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 |
| | |_|_|_|_|/ | |/| | | | | | |||||
* | | | | | | | 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 | 1 | -6/+1 |
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| * | | | | | | transactions - only save up to 40 txs totall across all networks | frankiebee | 2018-03-27 | 1 | -6/+1 |
| |/ / / / / | |||||
* | | | | | | Remove comments and console.logs | Dan | 2018-03-27 | 1 | -2/+1 |
* | | | | | | Merge branch 'master' into i18n-translator-redux | Dan | 2018-03-27 | 1 | -3/+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 | 1 | -4/+30 |
* | | | | | | Use extension api to get initial locale. | Dan | 2018-03-22 | 1 | -0/+18 |
|/ / / / / | |||||
* | | | | | Merge branch 'master' of https://github.com/trigun0x2/metamask-extension into... | kumavis | 2018-03-22 | 1 | -5/+6 |
|\ \ \ \ \ | |||||
| * | | | | | remove console log | Jeffrey Tong | 2018-03-12 | 1 | -2/+0 |
| * | | | | | add comments that need clarification on naming convention | Jeffrey Tong | 2018-03-12 | 1 | -6/+8 |
| * | | | | | fixed multiple notification windows when executing batch | Jeffrey Tong | 2018-03-08 | 1 | -1/+4 |
| * | | | | | removed check for width & height on multiple popup windows | Jeffrey Tong | 2018-03-08 | 1 | -3/+1 |
* | | | | | | Merge branch 'master' into retry-tx-refractor | frankiebee | 2018-03-15 | 1 | -4/+28 |
|\ \ \ \ \ \ | |||||
| * | | | | | | 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 |
* | | | | | | | fix destructuring of variables | frankiebee | 2018-03-14 | 1 | -1/+1 |
* | | | | | | | Merge branch 'master' into retry-tx-refractor | Dan | 2018-03-14 | 2 | -2/+42 |
|\| | | | | | | |||||
| * | | | | | | 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 | 2 | -1/+49 |
| | |\ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ | Merge branch 'master' into i#3509 | Frankie | 2018-03-14 | 2 | -1/+49 |
| | | |\ \ \ \ \ \ | |||||
| | * | | | | | | | | 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 | 1 | -0/+48 |
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | |||||
| * | | | | | | | | background - storage - cleanup storage wiring | kumavis | 2018-03-09 | 1 | -8/+22 |
| * | | | | | | | | Merge branch 'master' into i3076-UseStorageLocalInstead | Dan Finlay | 2018-03-08 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | | | |||||
| * | | | | | | | | Merge branch 'master' into i3076-UseStorageLocalInstead | Dan Finlay | 2018-03-07 | 10 | -5/+114 |
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | | | |||||
| * | | | | | | | | Fix retrieval of object | Dan Finlay | 2018-01-25 | 1 | -2/+1 |
| * | | | | | | | | Remove redundant async modifiers | Dan Finlay | 2018-01-25 | 1 | -2/+2 |
| * | | | | | | | | Remove extension-store since we aren't using it yet | Dan Finlay | 2018-01-25 | 1 | -39/+0 |
| * | | | | | | | | Check that extension.storage exists before attempting to call methods on it. | Dan | 2018-01-24 | 1 | -3/+3 |
| * | | | | | | | | Merge branch 'UseStorageLocal' into i3076-UseStorageLocalInstead | Dan Finlay | 2018-01-24 | 2 | -0/+64 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Modify @heyellieday's work to use storage.local to replace main storage | Dan Finlay | 2018-01-24 | 1 | -0/+25 |
| | * | | | | | | | | conditionally use extension store if supported or enabled | Ellie Day | 2018-01-03 | 1 | -0/+4 |
| | * | | | | | | | | handle situation where storage.sync is disabled in certain versions of firefox | Ellie Day | 2018-01-03 | 1 | -2/+17 |
| | * | | | | | | | | Add ExtensionStore and add basic store instance syncing to main controller | Ellie Day | 2017-12-23 | 1 | -0/+20 |
* | | | | | | | | | | 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 | 2 | -1/+49 |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | | | |||||
| * | | | | | | | | | Merge pull request #3409 from scsaba/seed-phrase-verification | Dan Finlay | 2018-03-08 | 1 | -0/+48 |
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | | | |||||
| | * | | | | | | | | add documentation | Csaba Solya | 2018-03-04 | 1 | -0/+5 |
| | * | | | | | | | | verify addresses regardless case | Csaba Solya | 2018-03-03 | 1 | -1/+1 |
| | * | | | | | | | | fix lint issues | Csaba Solya | 2018-03-03 | 1 | -9/+9 |
| | * | | | | | | | | seed phrase verifier | Csaba Solya | 2018-03-03 | 1 | -0/+43 |
| | | |_|/ / / / / | | |/| | | | | | | |||||
| * / | | | | | | | fix typo in tests and tx-state-manager | Jeffrey Tong | 2018-03-08 | 1 | -1/+1 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch 'master' into retry-tx-refractor | frankiebee | 2018-03-08 | 2 | -0/+64 |
|\| | | | | | | | |||||
| * | | | | | | | sentry - extractErrorMessage - fix comment formatting | kumavis | 2018-03-01 | 1 | -1/+1 |
| * | | | | | | | sentry - failed tx - improve ethjs-rpc error formating | kumavis | 2018-03-01 | 1 | -0/+38 |
| * | | | | | | | sentry - clean - move setupRaven to lib | kumavis | 2018-03-01 | 1 | -0/+26 |
* | | | | | | | | refactor retrytx with higher gas price: | frankiebee | 2018-03-08 | 1 | -10/+28 |
|/ / / / / / / | |||||
* | | | | | | | Merge branch 'master' into uat-master | Dan Finlay | 2018-02-22 | 2 | -2/+12 |
|\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | 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 |
| * | | | | | | | | metamask mesh - inject mesh testing container | kumavis | 2018-02-11 | 1 | -0/+9 |
| |/ / / / / / / | |||||
* | | | | | | / | Fix promise construction | Dan Finlay | 2018-02-21 | 1 | -1/+1 |
| |_|_|_|_|_|/ |/| | | | | | | |||||
* | | | | | | | Merge branch 'uat' into uat-next | Dan | 2018-02-08 | 1 | -0/+11 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Merge branch 'master' into uat | Dan | 2018-02-08 | 1 | -0/+11 |
| |\| | | | | | | | |_|_|_|_|/ | |/| | | | | | |||||
| | * | | | | | 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 | 1 | -3/+9 |
| | * | | | | | clean up | Bruno Barbieri | 2018-01-31 | 1 | -3/+3 |
| | * | | | | | added reset account feature | Bruno Barbieri | 2018-01-31 | 1 | -0/+4 |
| | |/ / / / | |||||
* | / / / / | [NewUI] Opens to full screen when restoring from seed. (#3201) | Dan J Miller | 2018-02-08 | 1 | -0/+11 |
|/ / / / / | |||||
* | | | | | Merge branch 'uat' into newmaster | Chi Kei Chan | 2018-01-20 | 3 | -2/+15 |
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| | | |||||
| * | | | Merge branch 'uat' into uat-master-011618 | Alexander Tseung | 2018-01-17 | 3 | -2/+15 |
| |\ \ \ | |||||
| | * \ \ | Merge branch 'NewUI-flat' into NewUI-flat-4.0.5c | Alexander Tseung | 2018-01-04 | 3 | -2/+15 |
| | |\ \ \ | |||||
| | | * \ \ | Merge branch 'NewUI-flat' into merge-master | Alexander Tseung | 2017-12-23 | 3 | -2/+15 |
| | | |\ \ \ | |||||
| | | | * | | | Merge branch 'master' into NewUI-flat | Dan | 2017-12-21 | 3 | -4/+10 |
| | | | |\| | | | | | | |/ | | | | |/| | |||||
| | | | * | | Merge branch 'master' into NewUI-flat | Chi Kei Chan | 2017-12-07 | 1 | -3/+15 |
| | | | |\ \ | |||||
| | | | * | | | Merge branch 'master' into NewUI-flat-merge-with-master | Dan | 2017-12-07 | 1 | -1/+3 |
| | | | * | | | Sign Typed Request styling fixes | Chi Kei Chan | 2017-10-26 | 1 | -1/+1 |
| | | | * | | | Signature request fixes. | Dan | 2017-10-26 | 1 | -1/+1 |
| | | | * | | | Merge branch 'master' into NewUI-flat | Chi Kei Chan | 2017-10-25 | 11 | -26/+25 |
| | | | |\ \ \ | |||||
| | | | * \ \ \ | Merge branch 'master' into NewUI-flat | Chi Kei Chan | 2017-10-21 | 1 | -0/+23 |
| | | | |\ \ \ \ | |||||
| | | | * \ \ \ \ | Merge branch 'NewUI-flat' into merge | Chi Kei Chan | 2017-10-19 | 2 | -1/+14 |
| | | | |\ \ \ \ \ | |||||
| | | | | * | | | | | UI for send screen container without form rows. | Dan | 2017-10-09 | 1 | -1/+4 |
| | | | | * | | | | | Merge branch 'master' into NewUI-flat | Chi Kei Chan | 2017-10-04 | 3 | -28/+19 |
| | | | | |\ \ \ \ \ | |||||
| | | | | * \ \ \ \ \ | Merge branch 'master' into mmn | Chi Kei Chan | 2017-09-28 | 7 | -175/+444 |
| | | | | |\ \ \ \ \ \ | |||||
| | | | | * \ \ \ \ \ \ | Merge branch 'master' into NewUI-flat | Chi Kei Chan | 2017-09-19 | 1 | -3/+9 |
| | | | | |\ \ \ \ \ \ \ | |||||
| | | | | * \ \ \ \ \ \ \ | Merge branch 'master' into nm | Chi Kei Chan | 2017-09-19 | 11 | -175/+250 |
| | | | | |\ \ \ \ \ \ \ \ | |||||
| | | | | * \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'mm/master' into NewUI-flat | sdtsui | 2017-08-14 | 2 | -4/+15 |
| | | | | |\ \ \ \ \ \ \ \ \ | |||||
| | | | | * \ \ \ \ \ \ \ \ \ | Merge branch 'master' into NewUI-flat | kumavis | 2017-08-09 | 3 | -33/+209 |
| | | | | |\ \ \ \ \ \ \ \ \ \ | |||||
| | | | | * \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into feat/mm-ui-5 | sdtsui | 2017-08-07 | 5 | -93/+28 |
| | | | | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | | * | | | | | | | | | | | | Adjust sidebar transition using @cjeria\'s feedback | sdtsui | 2017-08-03 | 1 | -0/+10 |
| | | | | * | | | | | | | | | | | | Ensure app-header is rendered in responsive layout | sdtsui | 2017-08-03 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | | | test - tx controller - fix txGasUtil reference | kumavis | 2018-01-18 | 1 | -1/+2 |
|/ / / / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | | | Create new flag for simple sends to avoid overloading other flag | Dan Finlay | 2018-01-17 | 1 | -2/+2 |
* | | | | | | | | | | | | | | | | Set gas limit to 21k for recipients with no code | Dan Finlay | 2018-01-16 | 1 | -5/+22 |
* | | | | | | | | | | | | | | | | Account for 0x/empty string address and contract creation | Thomas | 2018-01-08 | 1 | -0/+11 |
|/ / / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | | Merge pull request #2783 from MetaMask/tx-param-vaalidation | kumavis | 2018-01-03 | 1 | -2/+9 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | tx-gas-utils - tx-param-validation - use more intuitive check | kumavis | 2018-01-03 | 1 | -2/+2 |
| * | | | | | | | | | | | | | | | transactions - throw error if dapp provides txParams whos value has a decimal | frankiebee | 2017-12-21 | 1 | -2/+9 |
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | Merge pull request #2817 from MetaMask/i#2810 | Frankie | 2017-12-29 | 1 | -1/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | transactions:pending - only check nonces of transactions who's from adress ma... | frankiebee | 2017-12-28 | 1 | -1/+2 |
| | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |||||
* / | | | | | | | | | | | | | | Fix some silly linting issues. | Kevin Serrano | 2017-12-28 | 1 | -1/+1 |
|/ / / / / / / / / / / / / / | |||||
* / / / / / / / / / / / / / | Stop failing pending transactions after any period of time | Dan Finlay | 2017-12-22 | 1 | -7/+0 |
|/ / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | transactions:gas-utils - handle new type of estimateGas error | frankiebee | 2017-12-15 | 1 | -1/+5 |
* | | | | | | | | | | | | | dont aggresively query account data | frankiebee | 2017-12-14 | 1 | -2/+0 |
* | | | | | | | | | | | | | tx-controller - failed state is a finished state | kumavis | 2017-12-08 | 1 | -1/+1 |
* | | | | | | | | | | | | | Add retry background method and action | Dan Finlay | 2017-12-07 | 1 | -0/+4 |
| |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | firstRetryBlockNumber defaults to latestBlockNumber if undefined on txMeta in... | Dan | 2017-12-07 | 1 | -1/+1 |
* | | | | | | | | | | | | Fix undefined latestBlockNumber in _resubmitTx | Dan | 2017-12-07 | 1 | -1/+1 |
* | | | | | | | | | | | | Exponentional backoff on transaction retry in pending-tx-tracker | Dan | 2017-12-06 | 1 | -2/+14 |
* | | | | | | | | | | | | deps - obs-store@3 + migrate stream plumbing | kumavis | 2017-11-29 | 1 | -1/+3 |
| |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | |||||
* | | | | | | | | | | | Fix lint warnings | Daijiro Wachi | 2017-10-22 | 11 | -26/+25 |
| |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |||||
* | | | | | | | | | | Linted | Dan Finlay | 2017-10-20 | 1 | -1/+1 |
* | | | | | | | | | | Merge remote-tracking branch 'origin/master' into i2348-SelectAccountOnNewVault | Dan Finlay | 2017-10-19 | 3 | -27/+12 |
|\| | | | | | | | | | |||||
| * | | | | | | | | | Revert "NetworkController refactor for new EthClient interface" | kumavis | 2017-10-19 | 3 | -27/+12 |
* | | | | | | | | | | Make account tracking much more reactive | Dan Finlay | 2017-10-19 | 1 | -3/+8 |
* | | | | | | | | | | Make account tracking more reactive | Dan Finlay | 2017-10-19 | 1 | -0/+18 |
|/ / / / / / / / / | |||||
* | | | | | | | | | nonce-tracker - use blockTracker directly | kumavis | 2017-10-12 | 1 | -7/+3 |
* | | | | | | | | | util - add obj-proxy | kumavis | 2017-10-11 | 1 | -0/+19 |
* | | | | | | | | | events-proxy - clean up | kumavis | 2017-10-11 | 1 | -5/+5 |
* | | | | | | | | | Merge pull request #2223 from ukstv/master | Dan Finlay | 2017-10-10 | 1 | -0/+123 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Validate data format for eth_signTypedData | Sergey Ukustov | 2017-10-07 | 1 | -0/+4 |
| * | | | | | | | | | Merge branch 'master' into SignTypedData | Dan Finlay | 2017-10-07 | 2 | -1/+28 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'master' into SignTypedData | Dan Finlay | 2017-10-06 | 1 | -3/+5 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Add signTypedData input validations | Dan Finlay | 2017-10-06 | 1 | -0/+11 |
| * | | | | | | | | | | | Merge branch 'master' into SignTypedData | Dan Finlay | 2017-10-06 | 1 | -5/+7 |
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | |||||
| * | | | | | | | | | | | Merge remote-tracking branch 'upstream/master' | Sergey Ukustov | 2017-10-03 | 3 | -23/+12 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Add eth_signTypedData handler | Sergey Ukustov | 2017-09-30 | 1 | -0/+108 |
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge pull request #2305 from MetaMask/nodeify | Frankie | 2017-10-07 | 1 | -2/+10 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | lint fix - nodeify | kumavis | 2017-10-07 | 1 | -1/+1 |
| * | | | | | | | | | | | nodeify - allow callback to be optional | kumavis | 2017-10-07 | 1 | -2/+10 |
| | |_|/ / / / / / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge pull request #2304 from MetaMask/i1531-UpdateTxStatesOnInit | kumavis | 2017-10-07 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Check status of pending transactions on startup | Dan Finlay | 2017-10-07 | 1 | -0/+1 |
| | |_|_|/ / / / / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | When checking pending txs, check for successful txs with same nonce. | Dan Finlay | 2017-10-07 | 1 | -0/+20 |
* | | | | | | | | | | | Provide method for tx tracker to refer to all txs | Dan Finlay | 2017-10-07 | 1 | -1/+7 |
|/ / / / / / / / / / | |||||
* | | | | | | | | | | "fix" hours for message | frankiebee | 2017-10-06 | 1 | -1/+2 |
* | | | | | | | | | | pending-tx - check time stamp instead of block number for resubmit | frankiebee | 2017-10-06 | 1 | -3/+4 |
|/ / / / / / / / / | |||||
* | | | | | | | | | pending tx tracker - on tx:warn append error message instead of error obj | kumavis | 2017-10-03 | 1 | -1/+1 |
* | | | | | | | | | pending tx tracker - tx:warning event includes err obj | kumavis | 2017-10-03 | 1 | -2/+2 |
* | | | | | | | | | pending tx tracker - resubmit - warn dont error on unknown error | kumavis | 2017-10-03 | 1 | -2/+5 |
* | | | | | | | | | pending tx tracker - dont throw on load failure | kumavis | 2017-10-03 | 1 | -1/+0 |
| |/ / / / / / / |/| | | | | | | | |||||
* | | | | | | | | Merge branch 'history-notes' of github.com:MetaMask/metamask-extension into h... | kumavis | 2017-10-03 | 1 | -1/+2 |
|\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'master' into history-notes | frankiebee | 2017-10-03 | 1 | -1/+2 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | tx state history - fix bug where initial snapshot was mutated on updateTx | kumavis | 2017-10-03 | 2 | -2/+3 |
* | | | | | | | | | | tx state history - append note to first op of diff | kumavis | 2017-10-03 | 1 | -2/+5 |
|/ / / / / / / / / | |||||
* / / / / / / / / | transaction - provide notes for history | frankiebee | 2017-10-03 | 1 | -5/+5 |
|/ / / / / / / / | |||||
* / / / / / / / | pending-tx - dont check the balance to rebrodcast | frankiebee | 2017-09-30 | 1 | -15/+0 |
|/ / / / / / / | |||||
* | | | | | | | account-tracker - remove unused import | kumavis | 2017-09-28 | 1 | -1/+0 |
* | | | | | | | Merge branch 'master' into direct-block-tracker | kumavis | 2017-09-28 | 4 | -37/+261 |
|\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge pull request #2035 from MetaMask/transactionControllerRefractorPt3 | kumavis | 2017-09-28 | 3 | -36/+257 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | pending-tx - move incrementing of the retryCount on the txMeta outside pendin... | frankiebee | 2017-09-27 | 1 | -2/+1 |
| | * | | | | | | | transactions: make evnt names pretty and eaiser to read | frankiebee | 2017-09-27 | 1 | -8/+8 |
| | * | | | | | | | transactions: lint fixes and reveal status-update event for balance controller | frankiebee | 2017-09-27 | 1 | -6/+6 |
| | * | | | | | | | Merge branch 'master' into transactionControllerRefractorPt3 | frankiebee | 2017-09-27 | 11 | -185/+163 |
| | |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | | ensure that values written to txParams are hex strings | frankiebee | 2017-09-14 | 1 | -0/+9 |
| | * | | | | | | | | linting && format fixing | frankiebee | 2017-09-13 | 1 | -5/+4 |
| | * | | | | | | | | match other controller patterns | frankiebee | 2017-09-13 | 1 | -8/+13 |
| | * | | | | | | | | fix miss type | frankiebee | 2017-09-09 | 1 | -1/+1 |
| | * | | | | | | | | more tests and craete a getPendingTransactions function | frankiebee | 2017-09-09 | 1 | -0/+6 |
| | * | | | | | | | | remove unused variable | frankiebee | 2017-09-07 | 1 | -1/+0 |
| | * | | | | | | | | fix merge and errors disaperaing on update | frankiebee | 2017-09-07 | 1 | -2/+5 |