Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add exit flag to mocha to exit after tests run | Thomas Huang | 2017-12-16 | 1 | -1/+1 |
* | Merge pull request #2747 from MetaMask/Version-3.13.3 | Thomas Huang | 2017-12-15 | 2 | -1/+4 |
|\ | |||||
| * | Version 3.13.3v3.13.3 | Dan Finlay | 2017-12-15 | 2 | -1/+4 |
* | | Merge pull request #2706 from danjm/MM-fix-buy-cancel-button | Thomas Huang | 2017-12-15 | 1 | -1/+1 |
|\ \ | |||||
| * | | Fixes the cancel button in the buy screen to take the user home. | Dan | 2017-12-09 | 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 | William Chong | 2017-12-05 | 1 | -2/+10 |
* | | | Merge pull request #2733 from MetaMask/i2380-ShowNoBalance | Thomas Huang | 2017-12-15 | 2 | -4/+3 |
|\ \ \ | |||||
| * | | | Bump changelog | Dan Finlay | 2017-12-13 | 1 | -0/+2 |
| * | | | Show watched tokens with no balance | Dan Finlay | 2017-12-13 | 1 | -4/+1 |
* | | | | Merge pull request #2744 from MetaMask/infura-block-tracker | Frankie | 2017-12-14 | 2 | -8/+52 |
|\ \ \ \ | |||||
| * | | | | Revert "Revert "network - for infura networks use the infura block tracker pr... | kumavis | 2017-12-14 | 2 | -8/+51 |
| * | | | | Merge branch 'master' of github.com:MetaMask/metamask-plugin into infura-bloc... | kumavis | 2017-12-14 | 3 | -53/+8 |
| |\ \ \ \ | |/ / / / |/| | | | | |||||
* | | | | | Merge pull request #2743 from MetaMask/revert-2741-infura-block-tracker | Thomas Huang | 2017-12-14 | 2 | -52/+8 |
|\ \ \ \ \ | |||||
| * | | | | | Revert "network - for infura networks use the infura block tracker provider" | Frankie | 2017-12-14 | 2 | -52/+8 |
|/ / / / / | |||||
* | | | | | Merge pull request #2741 from MetaMask/infura-block-tracker | Frankie | 2017-12-14 | 2 | -8/+52 |
|\ \ \ \ \ | |||||
* \ \ \ \ \ | Merge pull request #2740 from MetaMask/i#2729infura-chill-out | kumavis | 2017-12-14 | 1 | -2/+0 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | |||||
| * | | | | | dont aggresively query account data | frankiebee | 2017-12-14 | 1 | -2/+0 |
|/ / / / / | |||||
| | * / / | deps - bump eth-json-rpc-infura | kumavis | 2017-12-14 | 1 | -1/+1 |
| |/ / / | |||||
| * / / | network - for infura networks use the infura block tracker provider | kumavis | 2017-12-14 | 2 | -8/+52 |
|/ / / | |||||
* | | | Merge pull request #2718 from MetaMask/ReducePollingInterval | kumavis | 2017-12-10 | 4 | -3/+11 |
|\ \ \ | |_|/ |/| | | |||||
| * | | Version 3.13.2v3.13.2 | Dan Finlay | 2017-12-10 | 3 | -2/+4 |
| * | | Bump changelog | Dan Finlay | 2017-12-10 | 1 | -0/+2 |
| * | | Pass polling interval to zero client provider | Dan Finlay | 2017-12-10 | 1 | -1/+5 |
|/ / | |||||
* | | Merge pull request #2699 from MetaMask/patch-2v3.13.1 | kumavis | 2017-12-08 | 4 | -9/+21 |
|\ \ | |||||
| * | | tx-controller - failed state is a finished state | kumavis | 2017-12-08 | 2 | -7/+9 |
| * | | Version 3.13.1 | Dan Finlay | 2017-12-08 | 2 | -1/+3 |
| * | | Bump changelog | Dan Finlay | 2017-12-08 | 1 | -0/+2 |
| * | | 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 | 10 | -37/+885 |
| |\ \ | |||||
| * | | | 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 |
* | | | | Merge pull request #2654 from abitrolly/patch-2 | Kevin Serrano | 2017-12-07 | 1 | -1/+1 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | Download State Logs with .json extension | Anatoli Babenia | 2017-12-05 | 1 | -1/+1 |
| | |/ | |/| | |||||
* | | | Merge pull request #2688 from MetaMask/AddPriceBumpv3.13.0 | Kevin Serrano | 2017-12-07 | 1 | -1/+3 |
|\ \ \ | |||||
| * | | | Add 10% price bump to retry attempts. | Dan Finlay | 2017-12-07 | 1 | -1/+3 |
|/ / / | |||||
* | | | Merge pull request #2684 from MetaMask/RetryTransaction | Dan Finlay | 2017-12-07 | 10 | -37/+883 |
|\ \ \ | |_|/ |/| | | |||||
| * | | Merge branch 'RetryTransaction' of github.com:MetaMask/metamask-plugin into R... | Dan Finlay | 2017-12-07 | 2 | -1/+11 |
| |\ \ | |||||
| | * | | Show retry button on submitted transactions greater than 30 seconds, add hove... | Alexander Tseung | 2017-12-07 | 2 | -1/+11 |
| * | | | Version 3.13.0 | Dan Finlay | 2017-12-07 | 2 | -1/+3 |
| |/ / | |||||
| * | | Bump changelog | Dan Finlay | 2017-12-07 | 1 | -0/+2 |
| * | | Merge branch 'RetryTransaction' of github.com:MetaMask/metamask-plugin into R... | Dan Finlay | 2017-12-07 | 1 | -4/+4 |
| |\ \ | |||||
| | * | | Fix styling of Retry buton | Alexander Tseung | 2017-12-07 | 1 | -4/+4 |
| * | | | Enforce retry tx at minimum gas of previous tx | Dan Finlay | 2017-12-07 | 2 | -2/+13 |
| |/ / | |||||
| * | | Fix retry action | Dan Finlay | 2017-12-07 | 2 | -3/+11 |
| * | | View tx after editing state to unconfirmed | Dan Finlay | 2017-12-07 | 1 | -1/+9 |
| * | | Fix action | Dan Finlay | 2017-12-07 | 1 | -2/+2 |
| * | | Add development state | Dan Finlay | 2017-12-07 | 1 | -0/+739 |
| * | | Connect to redux for retryTransaction | Alexander Tseung | 2017-12-07 | 1 | -2/+10 |
| * | | Add button to retry transaction | Alexander Tseung | 2017-12-07 | 1 | -34/+69 |
| * | | Add retry background method and action | Dan Finlay | 2017-12-07 | 5 | -1/+24 |
|/ / | |||||
* | | Merge pull request #2670 from danjm/MM-2669-tx-retry-exponential-backoff | Frankie | 2017-12-07 | 3 | -23/+88 |
|\ \ | |/ |/| | |||||
| * | Add tests for exponential backoff code in _resubmitTx | Dan | 2017-12-07 | 1 | -17/+63 |
| * | Update resubmitPendingTxs tests. | Dan | 2017-12-07 | 1 | -3/+4 |
| * | 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 | 12 | -54/+127 |
|\ | |||||
| * | Bump changelog | Dan Finlay | 2017-11-30 | 1 | -0/+2 |
| * | Remove debugger | Dan Finlay | 2017-11-30 | 1 | -1/+0 |
| * | Add markdown class to mascara ui markdown field | Dan Finlay | 2017-11-30 | 2 | -4/+5 |
| * | Bump version to 3.12.1 | Dan Finlay | 2017-11-30 | 1 | -1/+1 |
| * | Fix test reference | Dan Finlay | 2017-11-30 | 1 | -3/+3 |
| * | Make notice skipping async | Dan Finlay | 2017-11-30 | 1 | -3/+3 |
| * | Redundantly skip notices | Dan Finlay | 2017-11-30 | 1 | -25/+22 |
| * | Make test more resilient | Dan Finlay | 2017-11-30 | 1 | -3/+3 |
| * | Remove duplicate button declaration | Dan Finlay | 2017-11-30 | 1 | -2/+2 |
| * | Fix test selector | Dan Finlay | 2017-11-30 | 1 | -0/+1 |
| * | Fix migration comment | Dan Finlay | 2017-11-30 | 1 | -2/+3 |
| * | Accept all notices in integration tests | Dan Finlay | 2017-11-30 | 1 | -18/+3 |
| * | Fix test to skip screens before privacy notice | Dan Finlay | 2017-11-29 | 1 | -1/+7 |
| * | Migrate old data to include firstVersion info | Dan Finlay | 2017-11-29 | 3 | -1/+42 |
| * | Bump changelog | Dan Finlay | 2017-11-29 | 1 | -0/+1 |
| * | Linted | Dan Finlay | 2017-11-29 | 2 | -2/+2 |
| * | Add seed phrase bounty award notice | Dan Finlay | 2017-11-29 | 4 | -3/+4 |
| * | Get notice version filtering working nicely | Dan Finlay | 2017-11-29 | 4 | -24/+38 |
| * | 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 | 3 | -1/+21 |
* | | Merge pull request #2627 from MetaMask/reload-fix | kumavis | 2017-11-30 | 4 | -7/+11 |
|\ \ | |/ |/| | |||||
| * | Merge branch 'master' of github.com:MetaMask/metamask-plugin into reload-fix | kumavis | 2017-11-30 | 2 | -8/+8 |
| |\ | |/ |/| | |||||
* | | Merge pull request #2620 from MetaMask/update-deps | Dan Finlay | 2017-11-29 | 1 | -7/+7 |
|\ \ | |||||
| * | | Update greenkeeper deps for master | Thomas Huang | 2017-11-28 | 1 | -7/+7 |
* | | | 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 | 4 | -7/+11 |
| |_|/ |/| | | |||||
* | | | Merge pull request #2605 from MetaMask/i2577-SeedPhraseBug | Thomas Huang | 2017-11-28 | 4 | -5/+68 |
|\ \ \ | |_|/ |/| | | |||||
| * | | Bump changelog | Dan Finlay | 2017-11-21 | 1 | -0/+1 |
| * | | Remove logs | Dan Finlay | 2017-11-21 | 1 | -6/+0 |
| * | | Get test passing | Dan Finlay | 2017-11-21 | 1 | -4/+25 |
| * | | Merge branch 'i2577-SeedPhraseBug' into i2577-SeedPhraseBug-Test | Dan Finlay | 2017-11-21 | 2 | -5/+34 |
| |\ \ | |||||
| | * | | Prevent multiple submissions of first time form | Dan Finlay | 2017-11-21 | 1 | -1/+6 |
| | * | | 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 |
| * | | | Add failing test for #2577 Seed Phrase Bug | Dan Finlay | 2017-11-21 | 1 | -0/+18 |
| |/ / | |||||
* | | | Merge pull request #2607 from MetaMask/i2504-OperaFix | Thomas Huang | 2017-11-28 | 1 | -1/+7 |
|\ \ \ | |||||
| * | | | Ensure Opera build excludes chromereload file | Dan Finlay | 2017-11-22 | 1 | -1/+7 |
| |/ / | |||||
* | | | Merge pull request #2603 from MetaMask/greenkeeper/react-markdown-3.0.0 | Thomas Huang | 2017-11-25 | 1 | -1/+1 |
|\ \ \ | |/ / |/| | | |||||
| * | | fix(package): update react-markdown to version 3.0.0 | greenkeeper[bot] | 2017-11-20 | 1 | -1/+1 |
* | | | Merge pull request #2516 from MetaMask/i2507-DoubleWeb3Error | Thomas Huang | 2017-11-21 | 2 | -0/+9 |
|\ \ \ | |||||
| * | | | Add useful error when duplicate web3 is detected. | Dan Finlay | 2017-11-01 | 2 | -0/+9 |
* | | | | Merge pull request #2596 from MetaMask/issue-template-support-link | Thomas Huang | 2017-11-21 | 1 | -3/+3 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | Point issue template at new support center | Dan Finlay | 2017-11-18 | 1 | -3/+3 |
|/ / / | |||||
* | | | Merge pull request #2540 from doraemondrian/master | Thomas Huang | 2017-11-15 | 3 | -6/+6 |
|\ \ \ | |/ / |/| | | |||||
| * | | newUnaprovedTx => newUnapprovedTx | Dora E. Mondrian | 2017-11-06 | 3 | -6/+6 |
|/ / | |||||
* | | Merge pull request #2508 from watilde/fixes-1192 | Thomas Huang | 2017-10-31 | 3 | -2/+4 |
|\ \ | |||||
| * | | Use const and fix lint warnings | Daijiro Wachi | 2017-10-31 | 1 | -2/+2 |
| * | | Remove warning message when show import page | Daijiro Wachi | 2017-10-31 | 2 | -0/+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 |
* | | | Merge pull request #2275 from MetaMask/version-debugging | Kevin Serrano | 2017-10-27 | 4 | -12/+45 |
|\ \ \ | |||||
| * | | | Add option to copy directly to clipboard. | Kevin Serrano | 2017-10-27 | 1 | -3/+11 |
| * | | | Correct changelog. | Kevin Serrano | 2017-10-27 | 1 | -1/+0 |
| * | | | Bump Changelog | Kevin Serrano | 2017-10-27 | 1 | -0/+1 |
| * | | | Resolve merge conflicts | Kevin Serrano | 2017-10-27 | 72 | -232/+12470 |
| |\ \ \ | |/ / / |/| | | | |||||
* | | | | Merge pull request #2489 from MetaMask/3.12.0 | Frankie | 2017-10-26 | 2 | -1/+3 |
|\ \ \ \ | |||||
| * | | | | 3.12.0v3.12.0 | kumavis | 2017-10-26 | 2 | -1/+3 |
|/ / / / | |||||
* | | | | Merge pull request #2100 from ChainsawBaby/patch-1 | Kevin Serrano | 2017-10-26 | 2 | -3/+8 |
|\ \ \ \ | |||||
| * | | | | Bump Changelog | Kevin Serrano | 2017-10-26 | 1 | -0/+1 |
| * | | | | Resolving that ugly merge. | Kevin Serrano | 2017-10-26 | 1 | -3/+7 |
|/ / / / | |||||
* | | | | Merge pull request #2476 from MetaMask/100MweiMinGasPrice | Dan Finlay | 2017-10-26 | 3 | -12/+16 |
|\ \ \ \ | |||||
| * | | | | Add labels to clarify warning. | Kevin Serrano | 2017-10-26 | 1 | -4/+4 |
| * | | | | Account for non-submitted mins and max | Kevin Serrano | 2017-10-26 | 1 | -2/+2 |
| * | | | | Add clarifying comment about wei conversion. | Kevin Serrano | 2017-10-26 | 1 | -0/+1 |
| * | | | | Cut out intermediary wei steps. | Kevin Serrano | 2017-10-26 | 1 | -4/+2 |
| * | | | | Remove unneeded toString conversions. | Kevin Serrano | 2017-10-26 | 1 | -2/+2 |
| * | | | | Move upsize conversions for input warning at front of fn. | Kevin Serrano | 2017-10-26 | 1 | -3/+5 |
| * | | | | Fix mismatched decimal/hex conversion in pending-tx | Kevin Serrano | 2017-10-26 | 1 | -1/+1 |
| * | | | | Remove css build bundle from uat | Dan Finlay | 2017-10-26 | 1 | -4491/+0 |
| * | | | | Update changelog | Dan Finlay | 2017-10-26 | 1 | -1/+1 |
| * | | | | Resolve merge conflict. | Kevin Serrano | 2017-10-25 | 3 | -1/+4493 |
| |\ \ \ \ | |||||
| | * | | | | Reduce minimum gas price to 100 MWEI | Dan Finlay | 2017-10-25 | 3 | -7/+4499 |
| * | | | | | Fix for gas price to be lowered. | Kevin Serrano | 2017-10-25 | 2 | -11/+13 |
| |/ / / / | |||||
* | | | | | Merge pull request #2478 from MetaMask/mascaraHeadersFix | Frankie | 2017-10-26 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Fix X-Frame-Options for mascara | tmashuang | 2017-10-25 | 1 | -1/+1 |
|/ / / / / | |||||
* | | | | | Merge pull request #2422 from watilde/fixes-lint | Kevin Serrano | 2017-10-25 | 22 | -49/+55 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Fix lint warnings | Daijiro Wachi | 2017-10-22 | 20 | -49/+47 |
| * | | | | Add lint:fix command to gulp and npm-scripts | Daijiro Wachi | 2017-10-22 | 2 | -0/+8 |
* | | | | | Merge pull request #1990 from chikeichan/firsttimeflow | Thomas Huang | 2017-10-25 | 36 | -64/+12257 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | |||||
| * | | | | Add error messages when importing an account | tmashuang | 2017-10-24 | 2 | -17/+24 |
| * | | | | Merge branch 'firsttimeflow' of https://github.com/chikeichan/metamask-plugin... | tmashuang | 2017-10-24 | 35 | -63/+12249 |
|/| | | | | |||||
| * | | | | Add Import With Seed Phrase | Chi Kei Chan | 2017-10-21 | 6 | -19/+156 |
| * | | | | Add mobile responsiveness | Chi Kei Chan | 2017-10-21 | 2 | -177/+192 |
| * | | | | Remove import option | Chi Kei Chan | 2017-10-21 | 1 | -1/+3 |
| * | | | | Fix import | Chi Kei Chan | 2017-10-21 | 1 | -21/+31 |
| * | | | | Fix capitialization | Chi Kei Chan | 2017-10-21 | 1 | -1/+1 |
| * | | | | Add Integration Tests | Chi Kei Chan | 2017-10-21 | 4 | -15/+61 |
| * | | | | Fixing integraiton test | Chi Kei Chan | 2017-10-21 | 2 | -3/+130 |
| * | | | | Fix unit test | Chi Kei Chan | 2017-10-21 | 2 | -2/+3 |
| * | | | | Fix linter | Chi Kei Chan | 2017-10-21 | 10 | -123/+245 |
| * | | | | ShapeShift Integration | Chi Kei Chan | 2017-10-21 | 6 | -90/+287 |
| * | | | | Add ShapeShift UI | Chi Kei Chan | 2017-10-21 | 6 | -80/+353 |
| * | | | | Fix merge conflict; separate onboarding buy screen | Chi Kei Chan | 2017-10-21 | 8 | -29/+9558 |
| * | | | | Add missing presets | Chi Kei Chan | 2017-10-21 | 1 | -0/+1 |
| * | | | | Move "Skip this step" to side panel | Jacky Chan | 2017-10-21 | 2 | -12/+17 |
| * | | | | Disable CTA unless notice is scrolled to bottom | Jacky Chan | 2017-10-21 | 2 | -4/+29 |
| * | | | | Fix Buy Ether flow | Jacky Chan | 2017-10-21 | 2 | -2/+5 |
| * | | | | Shuffle tokens | Jacky Chan | 2017-10-21 | 4 | -25/+44 |
| * | | | | Add Go to Coinbase; Show Buy Ether after signup | Jacky Chan | 2017-10-21 | 10 | -74/+125 |
| * | | | | Hide Warning after changing import options | Jacky Chan | 2017-10-21 | 2 | -5/+10 |
| * | | | | Implement Buy Ether Screen UI | Jacky Chan | 2017-10-21 | 3 | -8/+318 |
| * | | | | Implement Import Account Screen | Jacky Chan | 2017-10-21 | 5 | -16/+328 |
| * | | | | Add BackupPhraseScreen | Jacky Chan | 2017-10-21 | 6 | -14/+406 |
| * | | | | Add NoticeScreen | Jacky Chan | 2017-10-21 | 4 | -20/+119 |
| * | | | | Add UniqueImageScreen | Jacky Chan | 2017-10-21 | 10 | -64/+329 |
| * | | | | Add Breadcrumbs | Jacky Chan | 2017-10-21 | 3 | -2/+47 |
| * | | | | CreatePasswordScreen | Jacky Chan | 2017-10-21 | 4 | -3/+105 |
| * | | | | Adding CreatePasswordScreen | Jacky Chan | 2017-10-21 | 6 | -2/+95 |
| |/ / / | |||||
* | | | | Merge pull request #2429 from MetaMask/i2428-AltEnsTlds | Frankie | 2017-10-24 | 4 | -2/+13 |
|\ \ \ \ | |||||
| * | | | | Try to fix intermittent test failure in NonceTracker tests | Dan Finlay | 2017-10-23 | 1 | -0/+4 |
| * | | | | Add support for alternative ENS TLDs | Dan Finlay | 2017-10-23 | 2 | -1/+3 |
| * | | | | Version 3.11.2v3.11.2 | Dan Finlay | 2017-10-22 | 2 | -1/+6 |
|/ / / / | |||||
* | | | | Merge pull request #2423 from MetaMask/json-rpc-fix | Thomas Huang | 2017-10-22 | 1 | -1/+1 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Temporarily reversal of json-rpc-engine | Kevin Serrano | 2017-10-22 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge pull request #2419 from MetaMask/Version-3.11.1 | Thomas Huang | 2017-10-21 | 2 | -1/+3 |
|\ \ \ | |||||
| * | | | Version 3.11.1v3.11.1 | Dan Finlay | 2017-10-21 | 2 | -1/+3 |
|/ / / | |||||
* | | | Merge pull request #2401 from MetaMask/filter-fix-maybe | Frankie | 2017-10-21 | 2 | -1/+2 |
|\ \ \ | |||||
| * | | | changelog entry for filter fix | kumavis | 2017-10-21 | 1 | -0/+1 |
| * | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into filter-f... | kumavis | 2017-10-21 | 8 | -32/+99 |
| |\ \ \ | |/ / / |/| | | | |||||
* | | | | Merge pull request #2412 from MetaMask/x-frame-options | kumavis | 2017-10-21 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | mascara - set x-frame-options header to DENY | frankiebee | 2017-10-20 | 1 | -1/+1 |
* | | | | | Merge pull request #2389 from MetaMask/i2348-SelectAccountOnNewVault | Thomas Huang | 2017-10-21 | 7 | -29/+96 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Merge branch 'master' into i2348-SelectAccountOnNewVault | Thomas Huang | 2017-10-20 | 1 | -2/+2 |
| |\ \ \ \ | |/ / / / |/| | | | | |||||
* | | | | | Merge pull request #2409 from chikeichan/fix-account-creation | kumavis | 2017-10-20 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Update eth-keyring-controller dependency | Chi Kei Chan | 2017-10-20 | 1 | -1/+1 |
|/ / / / / | |||||
* | | | | | Merge pull request #2368 from MetaMask/greenkeeper/react-simple-file-input-2.0.0 | Kevin Serrano | 2017-10-19 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | fix(package): update react-simple-file-input to version 2.0.0 | greenkeeper[bot] | 2017-10-14 | 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 |
| | * | | | | Patch sandwich-expando for security update | Dan Finlay | 2017-10-20 | 1 | -1/+1 |
| | * | | | | Fix bug that breaks ui dev mode | Dan Finlay | 2017-10-19 | 1 | -1/+6 |
| | * | | | | Remove account-tracker from keyringController | Dan Finlay | 2017-10-19 | 2 | -2/+1 |
| | * | | | | Merge remote-tracking branch 'origin/master' into i2348-SelectAccountOnNewVault | Dan Finlay | 2017-10-19 | 12 | -105/+97 |
| | |\ \ \ \ | |_|/ / / / |/| | | | | | |||||
| | * | | | | 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 |
| | * | | | | Merge branch 'master' into i2348-SelectAccountOnNewVault | Dan Finlay | 2017-10-18 | 9 | -66/+6 |
| | |\ \ \ \ | |||||
| | * | | | | | Bump changelog | Dan Finlay | 2017-10-18 | 1 | -0/+1 |
| | * | | | | | 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 |
| |/ / / / / | |||||
| | | * | | | deps - bump eth-json-rpc-filters for log filter fix | kumavis | 2017-10-21 | 1 | -1/+1 |
| | | * | | | deps - bump eth-json-rpc-filters | kumavis | 2017-10-19 | 1 | -1/+1 |
| |_|/ / / |/| | | | | |||||
* | | | | | Merge pull request #2396 from MetaMask/revert-2318-network-controller-client | Kevin Serrano | 2017-10-19 | 11 | -105/+96 |
|\ \ \ \ \ | |||||
| * | | | | | Revert "NetworkController refactor for new EthClient interface" | kumavis | 2017-10-19 | 11 | -105/+96 |
|/ / / / / | |||||
* | | | | | Merge pull request #2387 from watilde/fixes-2208 | Kevin Serrano | 2017-10-19 | 1 | -0/+1 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | Increase line-height for account nicknames | Daijiro Wachi | 2017-10-18 | 1 | -0/+1 |
|/ / / / | |||||
* | | | | Merge pull request #2370 from MetaMask/MoveOutEtherscanLinkGeneration | Kevin Serrano | 2017-10-17 | 8 | -65/+4 |
|\ \ \ \ | |||||
| * | | | | Move etherscan link logic into module | Dan Finlay | 2017-10-14 | 8 | -65/+4 |
| |/ / / | |||||
* | | | | Merge pull request #2379 from MetaMask/FixImportedTypedDataSigning | Kevin Serrano | 2017-10-17 | 2 | -1/+2 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Bump changelog | Dan Finlay | 2017-10-16 | 1 | -0/+1 |
| * | | | Bump version on eth-simple-keyring | Dan Finlay | 2017-10-16 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge pull request #2352 from MetaMask/i1340-SynchronousInjection | kumavis | 2017-10-13 | 3 | -5/+13 |
|\ \ \ | |||||
| * | | | 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 |
| * | | | Increase build readability | Dan Finlay | 2017-10-13 | 1 | -2/+7 |
| * | | | Merge branch 'master' into i1340-SynchronousInjection | Dan Finlay | 2017-10-13 | 41 | -217/+742 |
| |\ \ \ | |/ / / |/| | | | |||||
* | | | | Merge pull request #2345 from MetaMask/Version-3.11.0 | Thomas Huang | 2017-10-13 | 2 | -2/+4 |
|\ \ \ \ | |||||
| * | | | | Version 3.11.0v3.11.0 | Dan Finlay | 2017-10-12 | 2 | -2/+4 |
* | | | | | Merge pull request #2318 from MetaMask/network-controller-client | Frankie | 2017-10-12 | 11 | -96/+105 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | deps - bump eth-rpc-client for fix | kumavis | 2017-10-12 | 1 | -1/+1 |
| * | | | | nonce-tracker - use blockTracker directly | kumavis | 2017-10-12 | 3 | -10/+8 |
| * | | | | ui - network - fix localhost active status | kumavis | 2017-10-11 | 1 | -1/+1 |
| * | | | | network - convert localhost from custom rpc to network type | kumavis | 2017-10-11 | 0 | -0/+0 |
| * | | | | test - integration - intercept reload attempts | kumavis | 2017-10-11 | 1 | -0/+3 |
| * | | | | deps - bump eth-json-rpc-middleware for fix | kumavis | 2017-10-11 | 1 | -1/+1 |
| * | | | | network-controller - use obj-proxy for providerProxy | kumavis | 2017-10-11 | 3 | -25/+11 |
| * | | | | 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 | 3 | -29/+36 |
| * | | | | 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 |
* | | | | | Merge pull request #2344 from MetaMask/FixTokenHelpLink | Dan Finlay | 2017-10-12 | 2 | -1/+2 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Fix link to token support page | Dan Finlay | 2017-10-12 | 2 | -1/+2 |
|/ / / / | |||||
| * | | | Begin implementing sync injection idea | Dan Finlay | 2017-10-05 | 2 | -4/+3 |
| | * | | Changelog addition. | Kevin Serrano | 2017-10-10 | 1 | -0/+1 |
| | * | | Merge branch 'master' into version-debugging | Kevin Serrano | 2017-10-10 | 21 | -24/+539 |
| | |\ \ | |_|/ / |/| | | | |||||
* | | | | Merge pull request #2296 from MetaMask/precision-fix | Dan Finlay | 2017-10-10 | 2 | -4/+45 |
|\ \ \ \ | |||||
| * | | | | Make modification | Kevin Serrano | 2017-10-10 | 1 | -1/+1 |
| * | | | | Fix to actually fail in earlier versions. | Kevin Serrano | 2017-10-10 | 1 | -5/+7 |
| * | | | | Add test to look for wei precision. | Kevin Serrano | 2017-10-10 | 1 | -0/+36 |
| * | | | | Merge branch 'master' into precision-fix | Kevin Serrano | 2017-10-10 | 7 | -8/+97 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'master' into precision-fix | Kevin Serrano | 2017-10-06 | 2 | -1/+4 |
| |\ \ \ \ \ | |||||
| * | | | | | | Fix precision to account for small wei increase. | Kevin Serrano | 2017-10-06 | 1 | -4/+7 |