Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | | |||||
* | | 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 |
| | | |||||
* | | Version 4.2.0 | kumavis | 2018-03-07 | 1 | -3/+3 |
| | | |||||
* | | 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 | 71 | -41/+562 |
| |\ \ | |||||
| * | | | add edge support | Csaba Solya | 2018-02-22 | 2 | -0/+77 |
| | | | | |||||
* | | | | Version 4.1.3v4.1.3 | Dan Finlay | 2018-03-03 | 1 | -1/+1 |
| |_|/ |/| | | |||||
* | | | Merge pull request #3356 from MetaMask/cdn-minimization | Kevin Serrano | 2018-03-02 | 7 | -0/+644 |
|\ \ \ | | | | | | | | | Check in all font files locally. | ||||
| * | | | Check in all font files locally. | Kevin Serrano | 2018-03-01 | 7 | -0/+644 |
| | | | | |||||
* | | | | 4.1.2 | kumavis | 2018-03-01 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge pull request #3361 from MetaMask/4.1.1v4.1.1 | Thomas Huang | 2018-03-01 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | Version 4.1.1 | ||||
| * | | | | v4.1.1 | kumavis | 2018-03-01 | 1 | -1/+1 |
| |/ / / | |||||
* | | | | 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 #3323 from MetaMask/version-4.0.0v4.1.0 | Frankie | 2018-02-28 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Version 4.1.0 | ||||
| * | | | Bump Version | Thomas | 2018-02-28 | 1 | -1/+1 |
| | | | | |||||
| * | | | Version 4.0.0 | Thomas | 2018-02-23 | 1 | -1/+1 |
| | |/ | |/| | |||||
* | | | 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 |
| | |_|/ | |/| | | |||||
| * | | | Version 3.14.2v3.14.2 | 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 |
| |/ |/| | |||||
* | | Bump uat version to 4.0.12 | Dan | 2018-02-17 | 1 | -1/+1 |
| | | |||||
* | | Make oldui compatible with newUI style changes | Thomas Huang | 2018-02-16 | 1 | -2/+2 |
| | | |||||
* | | Merge branch 'uat' into uat-next | Dan | 2018-02-08 | 6 | -10/+63 |
|\ \ | |||||
| * | | Merge branch 'master' into uat | Dan | 2018-02-08 | 6 | -10/+63 |
| |\| | |||||
| | * | Version 3.14.1v3.14.1 | Dan Finlay | 2018-02-02 | 1 | -1/+1 |
| | | | |||||
| | * | Version 3.14.0 | Dan Finlay | 2018-02-02 | 1 | -1/+1 |
| | | | |||||
| | * | 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 |
| | |/ | |||||
| | * | Version 3.13.8v3.13.8 | Dan Finlay | 2018-01-30 | 1 | -1/+1 |
| | | | |||||
| | * | Bump limit for event emitter warning. | Kevin Serrano | 2018-01-26 | 1 | -0/+2 |
| | | | |||||
| | * | Merge remote-tracking branch 'origin/master' into Version-3.13.7 | Dan Finlay | 2018-01-23 | 2 | -1/+13 |
| | |\ | |||||
| | | * | sentry - report failed txs | kumavis | 2018-01-23 | 2 | -1/+13 |
| | | | | |||||
| | * | | Version 3.13.7 | Dan Finlay | 2018-01-23 | 1 | -1/+1 |
| | |/ | |||||
* | / | [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 | 3 | -2/+14 |
| | | |||||
* | | Merge branch 'uat' into newmaster | Chi Kei Chan | 2018-01-20 | 69 | -40/+525 |
|\ \ | |/ |/| | |||||
| * | 4.0.10 | kumavis | 2018-01-19 | 1 | -1/+1 |
| | | |||||
| * | Update popout to fullscreen icon | Alexander Tseung | 2018-01-18 | 1 | -0/+21 |
| | | |||||
| * | Merge branch 'uat' into uat-master-011618 | Alexander Tseung | 2018-01-17 | 68 | -42/+502 |
| |\ | |||||
| | * | [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. | ||||
| | * | Merge branch 'uat' into cb-388 | Chi Kei Chan | 2018-01-13 | 3 | -2/+7 |
| | |\ | |||||
| | | * | Fix styling in initialization | Alexander Tseung | 2018-01-13 | 1 | -2/+7 |
| | | | | |||||
| | | * | [NewUI-flat] New deposit ether modal UI. (#2642) | Dan J Miller | 2018-01-13 | 2 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * New deposit ether modal. * New deposit modal full screen on mobile, and other style fixes. * Hide shapeshift option from deposit modal for now. * Add shapeshift form to new deposit modal. * Store recipient address for shapeshift tx in background. * Use Simpledropdown to achieve desired styling in coin selector. * Lint fix * Fix typos and remove dead code. * Remove storage of shapeshift receiving address from background. * Fix typos | ||||
| | * | | Update main view styling | Alexander Tseung | 2018-01-11 | 1 | -0/+128 |
| | |/ | |||||
| | * | 4.0.9 | kumavis | 2018-01-09 | 1 | -1/+1 |
| | | | |||||
| | * | Merge branch 'NewUI-flat' into NewUI-flat-4.0.5c | Alexander Tseung | 2018-01-04 | 65 | -42/+365 |
| | |\ | |||||
| | | * | Merge branch 'NewUI-flat' into merge-master | Alexander Tseung | 2017-12-23 | 1 | -1/+1 |
| | | |\ | |||||
| | | | * | Update manifest.json version from 4.0.4 to 4.0.5 (#2797) | Alexander Tseung | 2017-12-23 | 1 | -1/+1 |
| | | | | | |||||
| | | * | | Merge branch 'NewUI-flat' into merge-master | Alexander Tseung | 2017-12-23 | 65 | -42/+365 |
| | | |\| | |||||
| | | | * | 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 | 2 | -0/+20 |
| | | | | | | |||||
| | | | * | | 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 |
| | | | | | | | |||||
| | | | * | | | Version Bump | Chi Kei Chan | 2017-11-16 | 1 | -1/+1 |
| | | | | | | | |||||
| | | | * | | | Merge branch 'master' into merge-master | Chi Kei Chan | 2017-11-16 | 3 | -2/+12 |
| | | | |\ \ \ | |||||
| | | | * \ \ \ | Merge pull request #2519 from danjm/NewUI-flat-lintfixes | Thomas Huang | 2017-11-03 | 1 | -2/+0 |
| | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | [NewUI-flat] New ui flat lintfixes | ||||
| | | | | * | | | | Lint fixes for NewUI-flat. | Dan | 2017-11-02 | 1 | -2/+0 |
| | | | | | | | | | |||||
| | | | * | | | | | 4.0.3 | kumavis | 2017-10-26 | 1 | -1/+1 |
| | | | | | | | | | |||||
| | | | * | | | | | Merge branch 'NewUI-flat' into uat | Chi Kei Chan | 2017-10-26 | 19 | -37/+134 |
| | | | |\| | | | | |||||
| | | | | * | | | | 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 |
| | | | | | | | | | | |||||
| | | | | * | | | | | Add Info section | Alexander Tseung | 2017-10-26 | 1 | -0/+0 |
| | | | | | | | | | | |||||
| | | | | * | | | | | Fix styling on notification view | Chi Kei Chan | 2017-10-25 | 1 | -2/+2 |
| | | | | | | | | | | |||||
| | | | | * | | | | | 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 | 3 | -1/+81 |
| | | | | |\ \ \ \ \ \ | |||||
| | | | | * | | | | | | | Account menu white check mark | Chi Kei Chan | 2017-10-24 | 1 | -0/+14 |
| | | | | | | | | | | | | |||||
| | | | * | | | | | | | | 4.0.2 | kumavis | 2017-10-21 | 1 | -1/+1 |
| | | | | | | | | | | | | |||||
| | | | * | | | | | | | | 4.0.1 | kumavis | 2017-10-21 | 1 | -1/+1 |
| | | | |/ / / / / / / | |||||
| | | | * | | | | | | | 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 | 55 | -29/+215 |
| | | | |\ \ \ \ \ \ \ \ | |||||
| | | | | * | | | | | | | | Adding Account Dropdown V2 | Chi Kei Chan | 2017-10-13 | 4 | -24/+57 |
| | | | | | | | | | | | | | |||||
| | | | | * | | | | | | | | 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 | 9 | -86/+90 |
| | | | | |\ \ \ \ \ \ \ \ | |||||
| | | | | * | | | | | | | | | 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 | 20 | -1119/+751 |
| | | | | |\ \ \ \ \ \ \ \ \ | |||||
| | | | | * \ \ \ \ \ \ \ \ \ | Merge branch 'master' into NewUI-flat | Chi Kei Chan | 2017-09-19 | 2 | -4/+10 |
| | | | | |\ \ \ \ \ \ \ \ \ \ | |||||
| | | | | * \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into nm | Chi Kei Chan | 2017-09-19 | 20 | -245/+519 |
| | | | | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | | * | | | | | | | | | | | | 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 |
| | | | | | | | | | | | | | | | | | |||||
| | | | | * | | | | | | | | | | | | Fix html height | Chi Kei Chan | 2017-09-06 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | |||||
| | | | | * | | | | | | | | | | | | Replace Avenir Next with alternative. | Dan | 2017-08-30 | 11 | -0/+93 |
| | | | | | | | | | | | | | | | | | |||||
| | | | | * | | | | | | | | | | | | Add bolt and info icon vector images | sdtsui | 2017-08-23 | 2 | -0/+22 |
| | | | | | | | | | | | | | | | | | |||||
| | | | | * | | | | | | | | | | | | Merge remote-tracking branch 'mm/master' into NewUI-flat | sdtsui | 2017-08-14 | 4 | -5/+21 |
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | | * \ \ \ \ \ \ \ \ \ \ \ \ | 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 | 13 | -370/+308 |
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | | * | | | | | | | | | | | | | | | Add Roboto without hooking it up via import | sdtsui | 2017-08-05 | 18 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | |||||
| | | | | * | | | | | | | | | | | | | | | 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 |
| | | | | | | | | | | | | | | | | | | | | |||||
| | | | | * | | | | | | | | | | | | | | | Add Ethereum Logo | sdtsui | 2017-08-03 | 1 | -0/+11 |
| | | | | | | | | | | | | | | | | | | | | |||||
| | | | | * | | | | | | | | | | | | | | | Reset popup to 350x500, old form factor as advised by @Zanibas | sdtsui | 2017-08-01 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | |||||
| | | | | * | | | | | | | | | | | | | | | Add new fonts from @cjeria: DIN Next and DIN OT | sdtsui | 2017-08-01 | 12 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | |||||
| | | | | * | | | | | | | | | | | | | | | Adjust popup size to 545x450; refactor wallet view to fit | sdtsui | 2017-08-01 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | |||||
| | | | | * | | | | | | | | | | | | | | | Set font-size on body of popup.html, for responsiveness | sdtsui | 2017-07-31 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | |||||
| | | | | * | | | | | | | | | | | | | | | Adjust dimensions of popup.html and app bar to match | sdtsui | 2017-07-31 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | | 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 | ||||
* | | | | | | | | | | | | | | | | | | | Version 3.13.5v3.13.5 | Dan Finlay | 2018-01-17 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | 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 pull request #2900 from MetaMask/infura-rest-api | kumavis | 2018-01-16 | 1 | -2/+5 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | Provider - Use Infura rest api for infura networks | ||||
| * | | | | | | | | | | | | | | | | | | | Merge branch 'master' into infura-rest-api | kumavis | 2018-01-12 | 2 | -3/+10 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | 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 | ||||
* | | | | | | | | | | | | | | | | | | | | | ci(ko/messages.json): add korean localization file | x86kernel | 2018-01-10 | 1 | -0/+10 |
| |/ / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | | Version 3.13.4v3.13.4 | Dan Finlay | 2018-01-10 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | | 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 | ||||
* | | | | | | | | | | | | | | | | | | | 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 #2747 from MetaMask/Version-3.13.3 | Thomas Huang | 2017-12-15 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Version 3.13.3 | ||||
| * | | | | | | | | | | | | | | | | Version 3.13.3v3.13.3 | Dan Finlay | 2017-12-15 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | 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 |
|/ / / / / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | | | | Version 3.13.2v3.13.2 | Dan Finlay | 2017-12-10 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | 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 |
| | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | Version 3.13.1 | Dan Finlay | 2017-12-08 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | 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. | ||||
* | | | | | | | | | | | | | | | | | Merge branch 'master' into patch-2 | Dan Finlay | 2017-12-08 | 4 | -1/+21 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | Version 3.13.0 | Dan Finlay | 2017-12-07 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | 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 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | replaced ifs with ? : | ||||
* | | | | | | | | | | | | | | | | | Fix for #2644 - Specified Nonce isn't used | vicnaum | 2017-12-07 | 1 | -1/+6 |
|/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added nonceSpecified. And a check if nonce was specified - then we should use the specified nonce instead of generating a new one. | ||||
* | | | | | | | | | | | | | | | | firstRetryBlockNumber defaults to latestBlockNumber if undefined on txMeta ↵ | Dan | 2017-12-07 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in _resubmitTx | ||||
* | | | | | | | | | | | | | | | | 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 | 5 | -17/+85 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Versioned notices | ||||
| * | | | | | | | | | | | | | | | Bump version to 3.12.1 | Dan Finlay | 2017-11-30 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | 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 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only shows to people who installed before or equal to MetaMask 3.12.1 | ||||
| * | | | | | | | | | | | | | | | 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 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allows notices to only show to users who are on a certain version. | ||||
* | | | | | | | | | | | | | | | | 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 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NetworkController - add warning when aborting lookupNetwork | ||||
| | * | | | | | | | | | | | | | | | 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 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #2577 by ensuring only one seed phrase can be set for a new vault. Also cleans up logs and reproduction logic. | ||||
* | | | | | | | | | | | | | | | | 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. | ||||
| * | | | | | | | | | | | | | | | Add useful error when duplicate web3 is detected. | Dan Finlay | 2017-11-01 | 1 | -0/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #2507 | ||||
* | | | | | | | | | | | | | | | | newUnaprovedTx => newUnapprovedTx | Dora E. Mondrian | 2017-11-06 | 2 | -2/+2 |
|/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This typo tripped me up when I was reading through the code and trying to understand what's going on. | ||||
* | | | | | | | | | | | | | | | Merge pull request #2291 from MetaMask/gasPriceSpecified | Kevin Serrano | 2017-10-28 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add boolean for specified gas price | ||||
| * | | | | | | | | | | | | | | | Add indicator for specified gas price | Kevin Serrano | 2017-10-06 | 1 | -0/+1 |
| | |_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | Resolve merge conflicts | Kevin Serrano | 2017-10-27 | 20 | -64/+209 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | 3.12.0v3.12.0 | kumavis | 2017-10-26 | 1 | -1/+1 |
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | 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 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | Fixes lint warnings | ||||
| | * | | | | | | | | | | | | Fix lint warnings | Daijiro Wachi | 2017-10-22 | 13 | -31/+30 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed warnings: ```md app/scripts/controllers/computed-balances.js + 35:27 warning Missing space before function parentheses space-before-function-paren + 41:14 warning 'address' is never reassigned. Use 'const' instead prefer-const + 61:9 warning 'updater' is never reassigned. Use 'const' instead prefer-const + 68:11 warning 'newState' is never reassigned. Use 'const' instead prefer-const app/scripts/controllers/network.js + 104:29 warning Missing space before function parentheses space-before-function-paren app/scripts/lib/createLoggerMiddleware.js + 4:32 warning Missing space before function parentheses space-before-function-paren + 15:2 warning Newline required at end of file but not found eol-last app/scripts/lib/createOriginMiddleware.js + 4:32 warning Missing space before function parentheses space-before-function-paren + 9:2 warning Newline required at end of file but not found eol-last app/scripts/lib/createProviderMiddleware.js + 5:34 warning Missing space before function parentheses space-before-function-paren + 13:2 warning Newline required at end of file but not found eol-last app/scripts/lib/events-proxy.js + 1:50 warning Missing space before function parentheses space-before-function-paren + 31:2 warning Newline required at end of file but not found eol-last app/scripts/lib/nodeify.js + 2:22 warning Missing space before function parentheses space-before-function-paren + 2:24 warning Missing space before opening brace space-before-blocks + 5:18 warning Missing space before function parentheses space-before-function-paren + 5:20 warning Missing space before opening brace space-before-blocks app/scripts/lib/pending-balance-calculator.js + 16:19 warning Missing space before function parentheses space-before-function-paren app/scripts/lib/pending-tx-tracker.js + 85:11 warning '||' should be placed at the end of the line operator-linebreak + 87:11 warning '||' should be placed at the end of the line operator-linebreak + 88:11 warning '||' should be placed at the end of the line operator-linebreak + 90:11 warning '||' should be placed at the end of the line operator-linebreak + 91:11 warning '||' should be placed at the end of the line operator-linebreak app/scripts/lib/port-stream.js + 3:22 warning Missing space before function parentheses space-before-function-paren + 3:24 warning Missing space before opening brace space-before-blocks app/scripts/lib/tx-gas-utils.js + 84:2 warning Newline required at end of file but not found eol-last app/scripts/lib/tx-state-history-helper.js + 12:37 warning Missing space before function parentheses space-before-function-paren + 23:30 warning Missing space before function parentheses space-before-function-paren + 30:23 warning Missing space before function parentheses space-before-function-paren + 35:28 warning Missing space before function parentheses space-before-function-paren + 41:2 warning Newline required at end of file but not found eol-last app/scripts/lib/tx-state-manager.js + 94:13 warning 'value' is never reassigned. Use 'const' instead prefer-const ui/app/reducers.js + 45:7 warning 'state' is never reassigned. Use 'const' instead prefer-const + 53:7 warning 'stateString' is never reassigned. Use 'const' instead prefer-const ui/lib/tx-helper.js + 27:2 warning Newline required at end of file but not found eol-last ui/app/components/account-dropdowns.js + 163:1 warning More than 2 blank lines not allowed no-multiple-empty-lines ui/app/components/menu-droppo.js + 22:7 warning 'style' is never reassigned. Use 'const' instead prefer-const ui/app/components/shapeshift-form.js + 135:11 warning '&&' should be placed at the end of the line operator-linebreak ui/app/components/typed-message-renderer.js + 35:25 warning Missing space before function parentheses space-before-function-paren + 42:2 warning Newline required at end of file but not found eol-last mascara/server/index.js + 11:42 warning Use path.join() or path.resolve() instead of + to create paths no-path-concat + 12:36 warning Use path.join() or path.resolve() instead of + to create paths no-path-concat + 13:33 warning Use path.join() or path.resolve() instead of + to create paths no-path-concat + 14:40 warning Use path.join() or path.resolve() instead of + to create paths no-path-concat + 20:29 warning Use path.join() or path.resolve() instead of + to create paths no-path-concat + 21:29 warning Use path.join() or path.resolve() instead of + to create paths no-path-concat + 26:40 warning Use path.join() or path.resolve() instead of + to create paths no-path-concat ``` | ||||
| * | | | | | | | | | | | | | Merge branch 'firsttimeflow' of ↵ | tmashuang | 2017-10-24 | 1 | -0/+76 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/chikeichan/metamask-plugin into firsttimeflow | ||||
| | * | | | | | | | | | | | | Add ShapeShift UI | Chi Kei Chan | 2017-10-21 | 1 | -0/+76 |
| | |/ / / / / / / / / / / | |||||
| * | | | | | | | | | | | | Try to fix intermittent test failure in NonceTracker tests | Dan Finlay | 2017-10-23 | 1 | -0/+4 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Version 3.11.2v3.11.2 | Dan Finlay | 2017-10-22 | 1 | -1/+1 |
| |/ / / / / / / / / / / | |||||
| * | | | | | | | | | / | Version 3.11.1v3.11.1 | Dan Finlay | 2017-10-21 | 1 | -1/+1 |
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |||||
| * | | | | | | | | | | 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 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We were doing a lot of conditional observation & updating. Pulled out a bunch of that for generic observer/syncers. |