Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | | | | | | | |||||
* | | | | | | | 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 ↵ | frankiebee | 2018-03-14 | 1 | -1/+7 |
| | |_|/ / | |/| | | | | | | | | | | | | | is a valid addres and if it is falsy that it is not null to fix issue #3509 | ||||
* | | | | | lint fix | kumavis | 2018-03-09 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into ↵ | kumavis | 2018-03-09 | 2 | -9/+92 |
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | i3076-UseStorageLocalInstead | ||||
| * | | | | Merge pull request #3409 from scsaba/seed-phrase-verification | Dan Finlay | 2018-03-08 | 2 | -9/+92 |
| |\ \ \ \ | | |_|_|/ | |/| | | | Add seed phrase verification script into background process | ||||
| | * | | | 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 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Don't persist undefined data - Write to new storage strategy without waiting for completion. - Continue writing to localStorage as fallback. | ||||
* | | | | | 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 |
| |\ \ \ | | |/ / | |/| | | Add Edge Support | ||||
| | * | | 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 | ||||
| | * | | 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 |
| |\ \ \ | | | | | | | | | | | [NewUI] Prevents new tx from active tab from opening popup | ||||
| | * | | | Prevents new transaction from generating popup when metamask is open in an ↵ | Dan | 2018-02-22 | 1 | -1/+11 |
| | | | | | | | | | | | | | | | | | | | | active tab. | ||||
| * | | | | 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 | ||||
| | | * | | | 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 | ||||
| | | * | | 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 |
| | | | | | |||||
| | | * | | remove RecentBlocks from disk | frankiebee | 2018-02-01 | 2 | -3/+2 |
| | | | | | |||||
| | | * | | creater migration to remove BlacklistController | frankiebee | 2018-01-31 | 1 | -0/+33 |
| | | | | | |||||
| | | * | | remove BlacklistController from disk state | frankiebee | 2018-01-31 | 2 | -6/+2 |
| | | |/ | |||||
| | | * | Bump limit for event emitter warning. | Kevin Serrano | 2018-01-26 | 1 | -0/+2 |
| | | | | |||||
| * | | | [NewUI] Opens to full screen when restoring from seed. (#3201) | Dan J Miller | 2018-02-08 | 2 | -0/+26 |
| |/ / | | | | | | | | | | | | | | | | * Opens to full screen when restoring from seed. * Remove redundant parameter in actions.markPasswordForgotten call. | ||||
| * | | Merge branch 'master' into uat | Thomas | 2018-01-23 | 2 | -1/+13 |
| | | | |||||
| * | | Merge branch 'uat' into newmaster | Chi Kei Chan | 2018-01-20 | 11 | -11/+159 |
| |\ \ | |||||
| | * \ | Merge branch 'uat' into uat-master-011618 | Alexander Tseung | 2018-01-17 | 11 | -13/+157 |
| | |\ \ | |||||
| | | * | | [NewUI] Place all users of extension into old UI (disable auto adding). (#2946) | Dan J Miller | 2018-01-16 | 1 | -3/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Place all users of extension into old UI (disable auto adding). * Fix lint errors. | ||||
| | | * | | Fix styling in initialization | Alexander Tseung | 2018-01-13 | 1 | -2/+7 |
| | | | | | |||||
| | | * | | Merge branch 'NewUI-flat' into NewUI-flat-4.0.5c | Alexander Tseung | 2018-01-04 | 11 | -13/+148 |
| | | |\ \ | |||||
| | | | * \ | Merge branch 'NewUI-flat' into merge-master | Alexander Tseung | 2017-12-23 | 11 | -13/+148 |
| | | | |\ \ | |||||
| | | | | * | | Track usage of old and new UI (#2794) | Alexander Tseung | 2017-12-23 | 3 | -6/+57 |
| | | | | | | | | | | | | | | | | | | | | | [NewUI] Track usage of old and new UI | ||||
| | | | | * | | Merge branch 'NewUI-flat' into merge-master-to-newUI-flat-dec20 | Chi Kei Chan | 2017-12-21 | 2 | -0/+5 |
| | | | | |\ \ | |||||
| | | | | | * | | Adds updateTransaction to background and used it to update after editing in ↵ | Dan | 2017-12-21 | 2 | -6/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | send-v2. | ||||
| | | | | | * | | Canceled, edited transactions show edited amount. | Dan | 2017-12-21 | 2 | -0/+6 |
| | | | | | | | | |||||
| | | | | * | | | Merge branch 'master' into NewUI-flat | Dan | 2017-12-21 | 9 | -37/+179 |
| | | | | |\ \ \ | | | | | | |/ / | | | | | |/| | | |||||
| | | | | * | | | Adds button for opening app in main browser window in extension. | Dan | 2017-12-13 | 1 | -0/+5 |
| | | | | | | | | |||||
| | | | | * | | | Merge branch 'NewUI-flat' into MM-333-auto-add-users-to-new-UI | Chi Kei Chan | 2017-12-08 | 10 | -29/+150 |
| | | | | |\ \ \ | |||||
| | | | | | * \ \ | Merge branch 'master' into NewUI-flat | Chi Kei Chan | 2017-12-07 | 2 | -3/+21 |
| | | | | | |\ \ \ | |||||
| | | | | | * | | | | Merge branch 'master' into NewUI-flat-merge-with-master | Dan | 2017-12-07 | 8 | -26/+129 |
| | | | | | | | | | | |||||
| | | | | * | | | | | Lint fix | Dan | 2017-12-05 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| | | | | * | | | | | Css selected in background based on betaUI state. | Dan | 2017-12-05 | 1 | -6/+15 |
| | | | | | | | | | | |||||
| | | | | * | | | | | Add UI selection | Dan | 2017-12-05 | 3 | -0/+19 |
| | | | | |/ / / / | |||||
| | | | | * | | | | Fixes changes requested in pullrequestreview-79088534 | Jason Clark | 2017-11-27 | 1 | -0/+1 |
| | | | | | | | | | |||||
| | | | | * | | | | more eslint fixes | Jason Clark | 2017-11-26 | 1 | -1/+1 |
| | | | | | | | | | |||||
| | | | | * | | | | toggle wired up to preferences property store | Jason Clark | 2017-11-25 | 2 | -2/+12 |
| | | | | | | | | | |||||
| | | | | * | | | | incremental commit | Clark, Jason (Contractor) | 2017-11-24 | 1 | -0/+8 |
| | | | | | | | | | |||||
| | | | | * | | | | Merge branch 'master' into merge-master | Chi Kei Chan | 2017-11-16 | 3 | -2/+12 |
| | | | | |\ \ \ \ | |||||
| | | | | * | | | | | Lint fixes for NewUI-flat. | Dan | 2017-11-02 | 1 | -2/+0 |
| | | | | | | | | | | |||||
| | | | | * | | | | | Merge branch 'master' into NewUI-flat | Chi Kei Chan | 2017-10-26 | 1 | -3/+7 |
| | | | | |\ \ \ \ \ | |||||
| | | | | * | | | | | | 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 | 13 | -31/+30 |
| | | | | |\ \ \ \ \ \ | |||||
| | | | | * \ \ \ \ \ \ | Merge branch 'master' into NewUI-flat | Chi Kei Chan | 2017-10-25 | 1 | -0/+4 |
| | | | | |\ \ \ \ \ \ \ | |||||
| | | | | * \ \ \ \ \ \ \ | Merge branch 'master' into NewUI-flat | Chi Kei Chan | 2017-10-21 | 4 | -27/+88 |
| | | | | |\ \ \ \ \ \ \ \ | |||||
| | | | | * \ \ \ \ \ \ \ \ | Merge branch 'NewUI-flat' into merge | Chi Kei Chan | 2017-10-19 | 5 | -2/+29 |
| | | | | |\ \ \ \ \ \ \ \ \ | |||||
| | | | | | * | | | | | | | | | 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 | 8 | -84/+87 |
| | | | | | |\ \ \ \ \ \ \ \ \ | |||||
| | | | | | * | | | | | | | | | | Enables remove token and ensures add/remove update the list without need for ↵ | Dan | 2017-10-04 | 2 | -1/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | refresh. | ||||
| | | | | | * | | | | | | | | | | Merge branch 'master' into mmn | Chi Kei Chan | 2017-09-28 | 19 | -1118/+750 |
| | | | | | |\ \ \ \ \ \ \ \ \ \ | |||||
| | | | | | * \ \ \ \ \ \ \ \ \ \ | 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 | 19 | -241/+516 |
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | | | * | | | | | | | | | | | | | Improve styling in Confirmation Screen; Show decoded send token data | Chi Kei Chan | 2017-09-13 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | | | | |||||
| | | | | | * | | | | | | | | | | | | | Added signTokenTx; Adding token confirmation screen | Chi Kei Chan | 2017-09-12 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | |||||
| | | | | | * | | | | | | | | | | | | | Merge remote-tracking branch 'mm/master' into NewUI-flat | sdtsui | 2017-08-14 | 3 | -4/+20 |
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into NewUI-flat | kumavis | 2017-08-09 | 5 | -189/+253 |
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into feat/mm-ui-5 | sdtsui | 2017-08-07 | 12 | -360/+307 |
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | | | * | | | | | | | | | | | | | | | | 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 |
| | | | | | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | | | | Increase storage debounce value | Dan Finlay | 2018-01-26 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | | | | Debounce storage to avoid crashing pump | Dan Finlay | 2018-01-26 | 1 | -8/+8 |
| | | | | | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | | | | Remove local storage writes, add log | Dan Finlay | 2018-01-25 | 1 | -5/+16 |
| | | | | | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | | | | 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 already handled TODO comment. | Dan | 2018-01-25 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | | | | 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 |
| | | | | | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | | | | Handle errors when getting and setting to localStore. | Dan | 2018-01-24 | 1 | -2/+12 |
| | | | | | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'UseStorageLocal' into i3076-UseStorageLocalInstead | Dan Finlay | 2018-01-24 | 3 | -0/+82 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | | | Modify @heyellieday's work to use storage.local to replace main storage | Dan Finlay | 2018-01-24 | 2 | -7/+33 |
| | | | | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | | | conditionally use extension store if supported or enabled | Ellie Day | 2018-01-03 | 2 | -3/+13 |
| | | | | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | | | handle situation where storage.sync is disabled in certain versions of firefox | Ellie Day | 2018-01-03 | 2 | -5/+19 |
| | | | | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | | | Add ExtensionStore and add basic store instance syncing to main controller | Ellie Day | 2017-12-23 | 2 | -0/+32 |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | | | sentry - report failed txs | kumavis | 2018-01-23 | 2 | -1/+13 |
| |/ / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | | Merge pull request #3016 from MetaMask/sentry | Dan Finlay | 2018-01-19 | 4 | -0/+37 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Stability - Add Sentry Remote Error Reporting | ||||
| * | | | | | | | | | | | | | | | | | | | | sentry - dedupe raven vendor | kumavis | 2018-01-18 | 2 | -5/+2 |
| | | | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | | sentry - breakout raven setup and add release config | kumavis | 2018-01-18 | 3 | -9/+35 |
| | | | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | | sentry - update raven and add to ui | kumavis | 2018-01-18 | 4 | -7/+13 |
| | | | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | | sentry - add raven + sentry reporting config | kumavis | 2018-01-18 | 2 | -0/+8 |
| | |/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | | test - tx controller - fix txGasUtil reference | kumavis | 2018-01-18 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | | Update transactions.js | kumavis | 2018-01-18 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | | transactions - transtion approved transactions to failed transactions on boot | frankiebee | 2018-01-18 | 1 | -0/+8 |
| | | | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | | transactions - fail txs on boot who fail addTxDefaults | frankiebee | 2018-01-18 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | | transactions - wrap addTxDefaults in a try catch and re try addTxDefaults on ↵ | frankiebee | 2018-01-18 | 1 | -2/+20 |
|/ / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | boot if they did not complete | ||||
* | | | | | | | | | | | | | | | | | | | Create new flag for simple sends to avoid overloading other flag | Dan Finlay | 2018-01-17 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | Merge branch 'master' into i2907-NoCodeGasLimit | kumavis | 2018-01-17 | 1 | -2/+6 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into open-popup | Frankie | 2018-01-16 | 3 | -13/+79 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | transactions - emit 'newUnapprovedTx' before estimateGas finishes | frankiebee | 2018-01-15 | 1 | -2/+6 |
| | | | | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into i2907-NoCodeGasLimit | Dan Finlay | 2018-01-16 | 2 | -11/+74 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | | Merge pull request #2936 from MetaMask/i2925-BetterGasEstimation | Dan Finlay | 2018-01-16 | 2 | -11/+74 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve gas price estimation by backfilling recent-blocks | ||||
| | * | | | | | | | | | | | | | | | | | | | | Prefer passing a provider over an ethQuery instance | Dan Finlay | 2018-01-13 | 2 | -8/+4 |
| | | | | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | | | | Improve gas price estimation by backfilling recent-blocks | Dan Finlay | 2018-01-12 | 2 | -9/+76 |
| | |/ / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When first initializing, recent-block controller now back-fills up to its desired history length. This makes estimated gas prices reflect a longer recent history, even when first switching to a new network. Fixes #2925 | ||||
* | / / / / / / / / / / / / / / / / / / / | Set gas limit to 21k for recipients with no code | Dan Finlay | 2018-01-16 | 1 | -5/+22 |
|/ / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #2907 | ||||
* | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into infura-rest-api | kumavis | 2018-01-12 | 1 | -2/+9 |
|\| | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | Default to 1 gwei for empty blocks | Dan Finlay | 2018-01-09 | 1 | -2/+3 |
| | | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | Default gas estimate to 1 gwei for networks with no block activity | Dan Finlay | 2018-01-09 | 1 | -0/+6 |
| | | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | bugfix - transactions controller - breakout logic and fix order of ↵ | kumavis | 2018-01-09 | 1 | -2/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | operations bug | ||||
* | | | | | | | | | | | | | | | | | | | | provider - infura - use infura REST api | kumavis | 2018-01-09 | 1 | -2/+5 |
| | | | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | | bugfix - transactions controller - breakout logic and fix order of ↵ | kumavis | 2018-01-09 | 1 | -2/+4 |
|/ / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | operations bug | ||||
* | | | | | | | | | | | | | | | | | | | Merge pull request #2891 from MetaMask/i2621-0xRecipientAddress | Thomas Huang | 2018-01-09 | 1 | -0/+11 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Account for 0x/empty string recipient | ||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into i2621-0xRecipientAddress | Dan Finlay | 2018-01-09 | 3 | -2/+28 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | Account for 0x/empty string address and contract creation | Thomas | 2018-01-08 | 1 | -0/+11 |
| | |_|/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | | Merge pull request #2851 from MetaMask/i2812-seedworderrorfix | Kevin Serrano | 2018-01-09 | 1 | -4/+9 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | Fix condition where failing seed word checks would infinite-spin future attempts. | ||||
| * | | | | | | | | | | | | | | | | | | | Add fix for infinite spinner for incorrect seed phrase. | Kevin Serrano | 2018-01-04 | 1 | -4/+9 |
| | | | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | | Fix feature to work | Dan Finlay | 2018-01-06 | 2 | -3/+11 |
| | | | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | | Linted | Dan Finlay | 2018-01-06 | 1 | -3/+0 |
| | | | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | | Derive gas price estimate from previous transactions | Dan Finlay | 2018-01-06 | 3 | -2/+23 |
| |/ / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Return the 50th percentile lowest gas price of the previous 20 blocks. | ||||
* | | | | | | | | | | | | | | | | | | | Merge pull request #2783 from MetaMask/tx-param-vaalidation | kumavis | 2018-01-03 | 1 | -2/+9 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | transactions - throw error if txParams.value contains a decimal | ||||
| * | | | | | | | | | | | | | | | | | | tx-gas-utils - tx-param-validation - use more intuitive check | kumavis | 2018-01-03 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | Merge branch 'master' into tx-param-vaalidation | Frankie | 2017-12-22 | 3 | -18/+73 |
| |\| | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | 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 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | only check nonces of transactions who's from address match the txMeta | ||||
| * | | | | | | | | | | | | | | | | | | | transactions:pending - only check nonces of transactions who's from adress ↵ | frankiebee | 2017-12-28 | 1 | -1/+2 |
| | |_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | match the txMeta | ||||
* / | | | | | | | | | | | | | | | | | | Fix some silly linting issues. | Kevin Serrano | 2017-12-28 | 2 | -2/+2 |
|/ / / / / / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | | | | | Remove retryTimePeriod from tx controller | Dan Finlay | 2017-12-22 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | Stop failing pending transactions after any period of time | Dan Finlay | 2017-12-22 | 1 | -7/+0 |
| |/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | Merge pull request #2763 from MetaMask/AddRecentBlocksController | Thomas Huang | 2017-12-21 | 2 | -14/+69 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Recent Blocks controller | ||||
| * | | | | | | | | | | | | | | | | | Do not log whole txs in recent block controller. | Dan Finlay | 2017-12-20 | 1 | -1/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only record gas prices, because that has a current use. | ||||
| * | | | | | | | | | | | | | | | | | Add Recent Blocks controller | Dan Finlay | 2017-12-18 | 2 | -14/+62 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tracks recent blocks, useful for estimating recent successful gas prices. | ||||
* | | | | | | | | | | | | | | | | | | Allow updating token details | Dan Finlay | 2017-12-19 | 1 | -4/+4 |
| |/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #2173 | ||||
* | | | | | | | | | | | | | | | | | Merge branch 'master' into i#2720 | frankiebee | 2017-12-16 | 1 | -1/+1 |
|\| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | Change console.log for opts in _configureInfuraProvider | Thomas Huang | 2017-12-16 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | transactions:gas-utils - handle new type of estimateGas error | frankiebee | 2017-12-15 | 1 | -1/+5 |
|/ / / / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | | | Merge pull request #2662 from williamchong007/master | Thomas Huang | 2017-12-15 | 1 | -2/+10 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix #1398, prevent injecting xml without xml suffix | ||||
| * | | | | | | | | | | | | | | | | fix #1398, prevent injecting xml without xml suffix | William Chong | 2017-12-05 | 1 | -2/+10 |
| | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | Revert "Revert "network - for infura networks use the infura block tracker ↵ | kumavis | 2017-12-14 | 1 | -7/+50 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | provider"" This reverts commit 5df7dcd758c5a16b503a5ee237970c05c7e990c9. | ||||
* | | | | | | | | | | | | | | | | | Revert "network - for infura networks use the infura block tracker provider" | Frankie | 2017-12-14 | 1 | -50/+7 |
| | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | Merge pull request #2741 from MetaMask/infura-block-tracker | Frankie | 2017-12-14 | 1 | -7/+50 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | network - for infura networks use the infura block tracker provider | ||||
| * | | | | | | | | | | | | | | | | | network - for infura networks use the infura block tracker provider | kumavis | 2017-12-14 | 1 | -7/+50 |
| | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | dont aggresively query account data | frankiebee | 2017-12-14 | 1 | -2/+0 |
|/ / / / / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | | | | Pass polling interval to zero client provider | Dan Finlay | 2017-12-10 | 1 | -1/+5 |
| | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | tx-controller - failed state is a finished state | kumavis | 2017-12-08 | 2 | -7/+9 |
| | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | Do not allow nonces larger than the next valid nonce | Dan Finlay | 2017-12-08 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To avoid situations where a user signs a transaction that will become surprisingly valid in the future. |