Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | | * | | 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 |
| |/ / | |||||
| * | | 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 |
| | | * | | 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 |
| | | | | * | | 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 s... | Dan | 2017-12-21 | 2 | -6/+5 |
| | | | | | * | | 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 |
| | | | | | * | | | | | | | | | | 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 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | 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 |
|/ / / / / / / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | | | | | | 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 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | | | | | | 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 |
| | |/ / / / / / / / / / / / / / / / / / / | |||||
* | / / / / / / / / / / / / / / / / / / / | Set gas limit to 21k for recipients with no code | Dan Finlay | 2018-01-16 | 1 | -5/+22 |
|/ / / / / / / / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | | | | | | | 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 operations... | kumavis | 2018-01-09 | 1 | -2/+4 |
* | | | | | | | | | | | | | | | | | | | | provider - infura - use infura REST api | kumavis | 2018-01-09 | 1 | -2/+5 |
* | | | | | | | | | | | | | | | | | | | | bugfix - transactions controller - breakout logic and fix order of operations... | kumavis | 2018-01-09 | 1 | -2/+4 |
|/ / / / / / / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | | | | | | Merge pull request #2891 from MetaMask/i2621-0xRecipientAddress | Thomas Huang | 2018-01-09 | 1 | -0/+11 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | 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 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | 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 |
| |/ / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | 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 |
| * | | | | | | | | | | | | | | | | | | 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 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | 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 | 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 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | Do not log whole txs in recent block controller. | Dan Finlay | 2017-12-20 | 1 | -1/+8 |
| * | | | | | | | | | | | | | | | | | Add Recent Blocks controller | Dan Finlay | 2017-12-18 | 2 | -14/+62 |
* | | | | | | | | | | | | | | | | | | Allow updating token details | Dan Finlay | 2017-12-19 | 1 | -4/+4 |
| |/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | 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 | William Chong | 2017-12-05 | 1 | -2/+10 |
* | | | | | | | | | | | | | | | | | Revert "Revert "network - for infura networks use the infura block tracker pr... | kumavis | 2017-12-14 | 1 | -7/+50 |
* | | | | | | | | | | | | | | | | | 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 | 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 |
* | | | | | | | | | | | | | | | | | Merge branch 'master' into patch-2 | Dan Finlay | 2017-12-08 | 3 | -0/+20 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | Enforce retry tx at minimum gas of previous tx | Dan Finlay | 2017-12-07 | 1 | -1/+4 |
| * | | | | | | | | | | | | | | | | | Fix retry action | Dan Finlay | 2017-12-07 | 1 | -1/+9 |
| * | | | | | | | | | | | | | | | | | Add retry background method and action | Dan Finlay | 2017-12-07 | 3 | -0/+9 |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | A more expressive way | vicnaum | 2017-12-07 | 1 | -5/+2 |
* | | | | | | | | | | | | | | | | | Fix for #2644 - Specified Nonce isn't used | vicnaum | 2017-12-07 | 1 | -1/+6 |
|/ / / / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | | | firstRetryBlockNumber defaults to latestBlockNumber if undefined on txMeta in... | Dan | 2017-12-07 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | | Correct note for updateTx after block-update event in transaction.js | 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 | 2 | -2/+20 |
|/ / / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | | Merge pull request #2630 from MetaMask/i2624-VersionedNoticesv3.12.1 | Thomas Huang | 2017-11-30 | 4 | -16/+84 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | Fix migration comment | Dan Finlay | 2017-11-30 | 1 | -2/+3 |
| * | | | | | | | | | | | | | | | Migrate old data to include firstVersion info | Dan Finlay | 2017-11-29 | 2 | -0/+41 |
| * | | | | | | | | | | | | | | | Linted | Dan Finlay | 2017-11-29 | 2 | -2/+2 |
| * | | | | | | | | | | | | | | | Add seed phrase bounty award notice | Dan Finlay | 2017-11-29 | 1 | -1/+0 |
| * | | | | | | | | | | | | | | | Get notice version filtering working nicely | Dan Finlay | 2017-11-29 | 2 | -24/+28 |
| * | | | | | | | | | | | | | | | Add firstVersion field to notices selector | Dan Finlay | 2017-11-29 | 2 | -1/+5 |
| * | | | | | | | | | | | | | | | Add optional version field to notices | Dan Finlay | 2017-11-29 | 2 | -1/+20 |
* | | | | | | | | | | | | | | | | Merge branch 'master' of github.com:MetaMask/metamask-plugin into reload-fix | kumavis | 2017-11-30 | 1 | -1/+1 |
|\| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Merge pull request #2441 from MetaMask/kumavis-patch-3 | Dan Finlay | 2017-11-28 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | network controller - warn via log.warn | kumavis | 2017-11-28 | 1 | -1/+1 |
| | * | | | | | | | | | | | | | | | Update network.js | kumavis | 2017-10-24 | 1 | -1/+1 |
| | | |_|_|_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | | | | |||||
* | / | | | | | | | | | | | | | | deps - obs-store@3 + migrate stream plumbing | kumavis | 2017-11-29 | 3 | -6/+10 |
|/ / / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | | Prevent creation of multiple vaults | Dan Finlay | 2017-11-21 | 1 | -31/+20 |
* | | | | | | | | | | | | | | | Add reproduction and mutex code | Dan Finlay | 2017-11-21 | 1 | -2/+37 |
* | | | | | | | | | | | | | | | Merge pull request #2516 from MetaMask/i2507-DoubleWeb3Error | Thomas Huang | 2017-11-21 | 1 | -0/+7 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Add useful error when duplicate web3 is detected. | Dan Finlay | 2017-11-01 | 1 | -0/+7 |
* | | | | | | | | | | | | | | | newUnaprovedTx => newUnapprovedTx | Dora E. Mondrian | 2017-11-06 | 2 | -2/+2 |
|/ / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | Merge pull request #2291 from MetaMask/gasPriceSpecified | Kevin Serrano | 2017-10-28 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | Add indicator for specified gas price | Kevin Serrano | 2017-10-06 | 1 | -0/+1 |
| | |_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | Resolve merge conflicts | Kevin Serrano | 2017-10-27 | 18 | -63/+132 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Resolving that ugly merge. | Kevin Serrano | 2017-10-26 | 1 | -3/+7 |
| | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Merge pull request #2422 from watilde/fixes-lint | Kevin Serrano | 2017-10-25 | 13 | -31/+30 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / | |/| | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Fix lint warnings | Daijiro Wachi | 2017-10-22 | 13 | -31/+30 |
| | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | |||||
| * / | | | | | | | | | | Try to fix intermittent test failure in NonceTracker tests | Dan Finlay | 2017-10-23 | 1 | -0/+4 |
| |/ / / / / / / / / / | |||||
| * | | | | | | | | | | Linted | Dan Finlay | 2017-10-20 | 2 | -2/+1 |
| * | | | | | | | | | | Fix bug where new account was not immediately selected | Dan Finlay | 2017-10-20 | 1 | -3/+14 |
| * | | | | | | | | | | Allow computed balances to enumerate its own view | Dan Finlay | 2017-10-20 | 1 | -2/+3 |
| * | | | | | | | | | | Remove account-tracker from keyringController | Dan Finlay | 2017-10-19 | 1 | -1/+0 |
| * | | | | | | | | | | Merge remote-tracking branch 'origin/master' into i2348-SelectAccountOnNewVault | Dan Finlay | 2017-10-19 | 6 | -90/+72 |
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | | | |||||
| | * | | | | | | | | | Revert "NetworkController refactor for new EthClient interface" | kumavis | 2017-10-19 | 6 | -90/+72 |
| * | | | | | | | | | | Make account tracking much more reactive | Dan Finlay | 2017-10-19 | 2 | -12/+13 |
| * | | | | | | | | | | Make account tracking more reactive | Dan Finlay | 2017-10-19 | 3 | -29/+33 |
| * | | | | | | | | | | Refresh computed balances controller when restoring vault | Dan Finlay | 2017-10-19 | 2 | -1/+6 |
| * | | | | | | | | | | Add validation to balance constructor | Dan Finlay | 2017-10-19 | 1 | -0/+10 |
| * | | | | | | | | | | Stop tracking old account balances after restore vault | Dan Finlay | 2017-10-19 | 1 | -0/+13 |
| * | | | | | | | | | | Promisify metamask-controller vault creating methods | Dan Finlay | 2017-10-18 | 1 | -17/+10 |
| * | | | | | | | | | | Select first account when restoring seed | Dan Finlay | 2017-10-18 | 1 | -3/+17 |
| * | | | | | | | | | | Select first account on new vault creation | Dan Finlay | 2017-10-18 | 1 | -1/+12 |
| |/ / / / / / / / / | |||||
| * | | | | | | | | | contentscript - fix inpage require and bundling | kumavis | 2017-10-13 | 1 | -4/+4 |
| * | | | | | | | | | Break up inpage file read into multiple lines | Dan Finlay | 2017-10-13 | 1 | -1/+3 |
| * | | | | | | | | | Merge branch 'master' into i1340-SynchronousInjection | Dan Finlay | 2017-10-13 | 11 | -79/+316 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | nonce-tracker - use blockTracker directly | kumavis | 2017-10-12 | 2 | -7/+4 |
| | * | | | | | | | | | network-controller - use obj-proxy for providerProxy | kumavis | 2017-10-11 | 1 | -3/+4 |
| | * | | | | | | | | | util - add obj-proxy | kumavis | 2017-10-11 | 1 | -0/+19 |
| | * | | | | | | | | | events-proxy - clean up | kumavis | 2017-10-11 | 1 | -5/+5 |
| | * | | | | | | | | | lint fixes | kumavis | 2017-10-11 | 2 | -8/+3 |
| | * | | | | | | | | | network controller - refactor to use eth-rpc-client | kumavis | 2017-10-11 | 2 | -29/+34 |
| | * | | | | | | | | | metamask controller - define this.newTransaction to ease instantiation order | kumavis | 2017-10-11 | 1 | -1/+6 |
| | * | | | | | | | | | metamask controller - simplify provider init | kumavis | 2017-10-11 | 1 | -22/+16 |
| | * | | | | | | | | | metamask controller - breakout getAccounts method | kumavis | 2017-10-11 | 1 | -12/+14 |
| * | | | | | | | | | | Begin implementing sync injection idea | Dan Finlay | 2017-10-05 | 1 | -2/+1 |
| | |/ / / / / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'master' into version-debugging | Kevin Serrano | 2017-10-10 | 7 | -4/+221 |
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | |||||
| * | | | | | | | | | Merge pull request #2223 from ukstv/master | Dan Finlay | 2017-10-10 | 3 | -1/+182 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Validate data format for eth_signTypedData | Sergey Ukustov | 2017-10-07 | 1 | -0/+4 |
| | * | | | | | | | | | Merge branch 'master' into SignTypedData | Dan Finlay | 2017-10-07 | 3 | -1/+29 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ | Merge branch 'master' into SignTypedData | Dan Finlay | 2017-10-06 | 2 | -4/+6 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | Add signTypedData input validations | Dan Finlay | 2017-10-06 | 2 | -4/+20 |
| | * | | | | | | | | | | | Merge branch 'master' into SignTypedData | Dan Finlay | 2017-10-06 | 2 | -6/+7 |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / | | | |/| | | | | | | | | | |||||
| | * | | | | | | | | | | | Merge remote-tracking branch 'upstream/master' | Sergey Ukustov | 2017-10-03 | 8 | -78/+80 |
| | |\ \ \ \ \ \ \ \ \ \ \ |