| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | 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 |
| | | * | 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 | 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 |
| | | |\ \ \ \ | |||||
| | | | * | | | | 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 |
| | | | * | | | | | | | | | 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 #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 #2747 from MetaMask/Version-3.13.3 | Thomas Huang | 2017-12-15 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | | 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 | 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 |
| |/ / / / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | | | 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 |
| * | | | | | | | | | | | | | | | | | 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 |
| * | | | | | | | | | | | | | | | | | 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 | 5 | -17/+85 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | 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 |
| | * | | | | | | | | | | | | | | | 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 | 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 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | Fix lint warnings | Daijiro Wachi | 2017-10-22 | 13 | -31/+30 |
| | * | | | | | | | | | | | | | Merge branch 'firsttimeflow' of https://github.com/chikeichan/metamask-plugin... | tmashuang | 2017-10-24 | 1 | -0/+76 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | 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 |
| | * | | | | | | | | | | 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 | 12 | -80/+317 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ | Merge pull request #2345 from MetaMask/Version-3.11.0 | Thomas Huang | 2017-10-13 | 1 | -1/+1 |
| | | |\ \ \ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | | Version 3.11.0v3.11.0 | Dan Finlay | 2017-10-12 | 1 | -1/+1 |
| | | * | | | | | | | | | | 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 'Version-3.10.9' into SignTypedData | Dan Finlay | 2017-10-06 | 1 | -1/+1 |
| | | |\ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ | 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 | 9 | -80/+83 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | | | | Add eth_signTypedData handler | Sergey Ukustov | 2017-09-30 | 3 | -1/+162 |
| | | | |_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Merge pull request #2305 from MetaMask/nodeify | Frankie | 2017-10-07 | 1 | -2/+10 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | lint fix - nodeify | kumavis | 2017-10-07 | 1 | -1/+1 |
| | | * | | | | | | | | | | | | nodeify - allow callback to be optional | kumavis | 2017-10-07 | 1 | -2/+10 |
| | | | |_|/ / / / / / / / / | | |/| | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Merge pull request #2304 from MetaMask/i1531-UpdateTxStatesOnInit | kumavis | 2017-10-07 | 1 | -0/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | | | Check status of pending transactions on startup | Dan Finlay | 2017-10-07 | 1 | -0/+1 |
| | | | |_|_|_|/ / / / / / / | | |/| | | | | | | | | | | |||||
| | * | | | | | | | | | | | | When checking pending txs, check for successful txs with same nonce. | Dan Finlay | 2017-10-07 | 1 | -0/+20 |
| | * | | | | | | | | | | | | Provide method for tx tracker to refer to all txs | Dan Finlay | 2017-10-07 | 2 | -1/+8 |
| | |/ / / / / / / / / / / | |||||
| * | | | | | | | | | | | | Make the function callback friendly. | Kevin Serrano | 2017-10-10 | 1 | -4/+4 |
| * | | | | | | | | | | | | Simplify try catch | Kevin Serrano | 2017-10-06 | 1 | -4/+2 |
| * | | | | | | | | | | | | Catch an error if this is not defined. | Kevin Serrano | 2017-10-06 | 1 | -1/+8 |
| * | | | | | | | | | | | | Merge branch 'master' into version-debugging | Kevin Serrano | 2017-10-06 | 3 | -5/+7 |
| |\| | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Version 3.10.9v3.10.9 | Dan Finlay | 2017-10-06 | 1 | -1/+1 |
| | | |_|_|/ / / / / / / | |/| | | | | | | | | | |||||
| | * | | | | | | | | | | "fix" hours for message | frankiebee | 2017-10-06 | 1 | -1/+2 |
| | * | | | | | | | | | | pending-tx - check time stamp instead of block number for resubmit | frankiebee | 2017-10-06 | 2 | -4/+5 |
| | |/ / / / / / / / / | |||||
| * | | | | | | | | | | Configured for callback-required function.' | Kevin Serrano | 2017-10-05 | 1 | -2/+2 |
| * | | | | | | | | | | Include OS version | Kevin Serrano | 2017-10-05 | 1 | -0/+4 |
| |/ / / / / / / / / | |||||
| * | | | | | | | | | Merge pull request #2250 from interfect/master | Frankie | 2017-10-04 | 1 | -1/+0 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Don't pass origin as an HTTP header | Adam Novak | 2017-10-02 | 1 | -1/+0 |
| * | | | | | | | | | | pending tx tracker - on tx:warn append error message instead of error obj | kumavis | 2017-10-03 | 1 | -1/+1 |
| * | | | | | | | | | | pending tx tracker - tx:warning event includes err obj | kumavis | 2017-10-03 | 1 | -2/+2 |
| * | | | | | | | | | | pending tx tracker - resubmit - warn dont error on unknown error | kumavis | 2017-10-03 | 1 | -2/+5 |
| * | | | | | | | | | | pending tx tracker - dont throw on load failure | kumavis | 2017-10-03 | 1 | -1/+0 |
| | |_|/ / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | | Merge branch 'history-notes' of github.com:MetaMask/metamask-extension into h... | kumavis | 2017-10-03 | 2 | -2/+4 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ | Merge branch 'master' into history-notes | frankiebee | 2017-10-03 | 2 | -2/+4 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | tx state history - fix bug where initial snapshot was mutated on updateTx | kumavis | 2017-10-03 | 2 | -2/+3 |
| | | * | | | | | | | | | Merge pull request #2138 from sunify/fix-firefox-cors | Thomas Huang | 2017-10-03 | 1 | -1/+2 |
| | | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | | | |||||
| | | | * | | | | | | | | Update manifest.json | Kevin Serrano | 2017-10-03 | 1 | -2/+1 |
| | | | * | | | | | | | | Wildcard for infura.io permissions, added permission for cryptonator api | Alex Lunyov | 2017-09-22 | 1 | -4/+2 |
| | | | * | | | | | | | | Fix CORS issues in FireFox | Alex Lunyov | 2017-09-21 | 1 | -1/+5 |
| * | | | | | | | | | | | tx state history - append note to first op of diff | kumavis | 2017-10-03 | 1 | -2/+5 |
| |/ / / / / / / / / / | |||||
| * / / / / / / / / / | transaction - provide notes for history | frankiebee | 2017-10-03 | 2 | -12/+14 |
| |/ / / / / / / / / | |||||
| * | | | | | | | | | Version 3.10.8 - Fix Currency Conversionv3.10.8 | Dan Finlay | 2017-09-30 | 2 | -2/+2 |
| * | | | | | | | | | Merge pull request #2233 from MetaMask/remove-accountTracker-from-transactions | kumavis | 2017-09-30 | 3 | -26/+1 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | pending-tx - dont check the balance to rebrodcast | frankiebee | 2017-09-30 | 3 | -26/+1 |
| * | | | | | | | | | | Merge pull request #2239 from MetaMask/network-controller-contd | Frankie | 2017-09-30 | 1 | -2/+3 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | network - make network controller internal network switching explicit | kumavis | 2017-09-30 | 1 | -2/+3 |
| * | | | | | | | | | | | Merge pull request #2237 from MetaMask/network-controller-contd | Frankie | 2017-09-30 | 3 | -36/+47 |
| |\| | | | | | | | | | | |||||
| | * | | | | | | | | | | network - convert localhost from custom rpc to network type | kumavis | 2017-09-30 | 3 | -7/+3 |
| | * | | | | | | | | | | network controller - small refactor | kumavis | 2017-09-30 | 2 | -35/+50 |
| | |/ / / / / / / / / | |||||
| * / / / / / / / / / | Version 3.10.7v3.10.7 | Dan Finlay | 2017-09-30 | 1 | -1/+1 |
| |/ / / / / / / / / | |||||
| * | / / / / / / / | Ensure selected account is always set if possible | Dan Finlay | 2017-09-30 | 1 | -0/+9 |
| | |/ / / / / / / |/| | | | | | | | |||||
| * | | | | | | | | Merge pull request #2124 from MetaMask/breakout-mascara | kumavis | 2017-09-28 | 1 | -1/+0 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | re-enabled x-metamask-origin for mascara | frankiebee | 2017-09-28 | 2 | -5/+1 |
| | * | | | | | | | | platforms: put context for extension in platform extension class | frankiebee | 2017-09-22 | 3 | -2/+4 |
| | * | | | | | | | | Merge branch 'master' into breakout-mascara | frankiebee | 2017-09-20 | 2 | -4/+10 |
| | |\| | | | | | | | |||||
| | * | | | | | | | | add context to platform to not have X-Metamask-Origin in mascara | frankiebee | 2017-09-20 | 2 | -1/+2 |
| * | | | | | | | | | Merge branch 'master' into new-currency-test | kumavis | 2017-09-28 | 18 | -1114/+746 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ | Merge pull request #2194 from MetaMask/network-controller-refactor | kumavis | 2017-09-28 | 2 | -33/+34 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | network controller - move _setProvider to bottom | kumavis | 2017-09-28 | 1 | -18/+18 |
| | | * | | | | | | | | | network controller - refactor to use _setProvider | kumavis | 2017-09-28 | 1 | -17/+28 |
| | | * | | | | | | | | | network - remove getter/setter | kumavis | 2017-09-28 | 1 | -23/+14 |
| | | * | | | | | | | | | metamask - improve comment | kumavis | 2017-09-28 | 1 | -2/+1 |
| | * | | | | | | | | | | Version 3.10.6 | Dan Finlay | 2017-09-28 | 1 | -1/+1 |
| | * | | | | | | | | | | Commit to the eth-keyring-controller module | Dan Finlay | 2017-09-28 | 1 | -599/+0 |
| | * | | | | | | | | | | Remove dead reference | Dan Finlay | 2017-09-28 | 1 | -1/+0 |
| | * | | | | | | | | | | Fix Account Selection | Dan Finlay | 2017-09-28 | 2 | -3/+7 |
| | * | | | | | | | | | | account-tracker - remove unused import | kumavis | 2017-09-28 | 1 | -1/+0 |
| | * | | | | | | | | | | Merge branch 'master' into direct-block-tracker | kumavis | 2017-09-28 | 9 | -323/+363 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ | Merge pull request #2035 from MetaMask/transactionControllerRefractorPt3 | kumavis | 2017-09-28 | 6 | -319/+356 |
| | | |\ \ \ \ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | | | pending-tx - move incrementing of the retryCount on the txMeta outside pendin... | frankiebee | 2017-09-27 | 2 | -2/+6 |
| | | | * | | | | | | | | | | transactions: reveal #getFilteredTxList from txStateManage and fix accountTra... | frankiebee | 2017-09-27 | 1 | -1/+5 |
| | | | * | | | | | | | | | | transactions: make evnt names pretty and eaiser to read | frankiebee | 2017-09-27 | 2 | -11/+11 |
| | | | * | | | | | | | | | | transactions: lint fixes and reveal status-update event for balance controller | frankiebee | 2017-09-27 | 5 | -13/+23 |
| | | | * | | | | | | | | | | Merge branch 'master' into transactionControllerRefractorPt3 | frankiebee | 2017-09-27 | 19 | -254/+430 |
| | | | |\ \ \ \ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | | | | ensure that values written to txParams are hex strings | frankiebee | 2017-09-14 | 2 | -1/+10 |
| | | | * | | | | | | | | | | | linting && format fixing | frankiebee | 2017-09-13 | 2 | -12/+7 |
| | | | * | | | | | | | | | | | match other controller patterns | frankiebee | 2017-09-13 | 3 | -23/+22 |
| | | | * | | | | | | | | | | | fix miss type | frankiebee | 2017-09-09 | 1 | -1/+1 |
| | | | * | | | | | | | | | | | more tests and craete a getPendingTransactions function | frankiebee | 2017-09-09 | 2 | -11/+10 |
| | | | * | | | | | | | | | | | fix messy merge | frankiebee | 2017-09-07 | 1 | -4/+4 |
| | | | * | | | | | | | | | | | remove unused variable | frankiebee | 2017-09-07 | 1 | -1/+0 |
| | | | * | | | | | | | | | | | fix merge and errors disaperaing on update | frankiebee | 2017-09-07 | 2 | -3/+6 |
| | | | * | | | | | | | | | | | Merge branch 'master' into transactionControllerRefractorPt3 | frankiebee | 2017-09-07 | 8 | -54/+233 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | | | | | add better comments | frankiebee | 2017-09-06 | 2 | -32/+41 |
| | | | * | | | | | | | | | | | | rename tx-utils.js -> tx-gas-utils.js | frankiebee | 2017-09-06 | 1 | -4/+0 |
| | | | * | | | | | | | | | | | | remove #buildEthTxFromParams | frankiebee | 2017-09-06 | 1 | -17/+0 |
| | | | * | | | | | | | | | | | | Merge branch 'master' into transactionControllerRefractorPt3 | frankiebee | 2017-08-22 | 7 | -14/+111 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
 |
index : tangerine-wallet-browser | |
| Tangerine fork of MetaMask browser extension (https://github.com/tangerine-network/tangerine-wallet-browser) | LAN-TW |
| aboutsummaryrefslogtreecommitdiffstats |