Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add computed balance to account detail view | Dan Finlay | 2017-09-14 | 6 | -10/+20 |
* | Use computed balance for tx confirmation | Dan Finlay | 2017-09-14 | 2 | -4/+6 |
* | Got pending balance updating correctly | Dan Finlay | 2017-09-14 | 3 | -81/+69 |
* | Add state-labeled events to allow subscribing to any transaction's state change | Dan Finlay | 2017-09-14 | 1 | -0/+1 |
* | Some progress | Dan Finlay | 2017-09-13 | 4 | -1/+144 |
* | Merge branch 'i1746-BalanceBasedOnPending' into AddBalanceController | Dan Finlay | 2017-09-12 | 2 | -0/+149 |
|\ | |||||
| * | Linted | Dan Finlay | 2017-09-08 | 1 | -2/+1 |
| * | Improve test name | Dan Finlay | 2017-09-08 | 1 | -1/+1 |
| * | Make tx calculations account for gas prices | Dan Finlay | 2017-09-08 | 1 | -2/+8 |
| * | Add test for computing gas price | Dan Finlay | 2017-09-08 | 1 | -0/+16 |
| * | Remove logs | Dan Finlay | 2017-09-08 | 2 | -13/+0 |
| * | Fix balance calc test | Dan Finlay | 2017-09-08 | 2 | -1/+3 |
| * | Add constructor comment | Dan Finlay | 2017-09-08 | 1 | -0/+5 |
| * | Fix valueFor test | Dan Finlay | 2017-09-08 | 2 | -11/+13 |
| * | Add basic test for valueFor | Dan Finlay | 2017-09-08 | 2 | -7/+31 |
| * | test not passing | Dan Finlay | 2017-09-08 | 2 | -4/+49 |
| * | Check balances in parallel | Dan Finlay | 2017-09-07 | 1 | -1/+8 |
| * | Add first passing balance calc test | Dan Finlay | 2017-09-07 | 2 | -7/+26 |
| * | Add test template | Dan Finlay | 2017-09-07 | 1 | -0/+37 |
* | | Merge pull request #2065 from MetaMask/Version-3.10.0 | Kevin Serrano | 2017-09-12 | 2 | -1/+4 |
|\ \ | |||||
| * | | Version 3.10.0v3.10.0 | Dan Finlay | 2017-09-12 | 2 | -1/+4 |
|/ / | |||||
* | | Merge pull request #2045 from MetaMask/rejectallunapproved | Dan Finlay | 2017-09-12 | 4 | -15/+43 |
|\ \ | |||||
| * | | Show reject all only when tx count is > 1 | Kevin Serrano | 2017-09-12 | 2 | -2/+6 |
| * | | Remove markdown from changelog. | Kevin Serrano | 2017-09-12 | 1 | -1/+1 |
| * | | Merge github.com:MetaMask/metamask-extension into rejectallunapproved | Kevin Serrano | 2017-09-12 | 8 | -43/+90 |
| |\ \ | |/ / |/| | | |||||
* | | | Merge pull request #2051 from MetaMask/ci-speedup | Dan Finlay | 2017-09-12 | 1 | -4/+0 |
|\ \ \ | |||||
| * | | | ci - dont need global install of test utils | kumavis | 2017-09-08 | 1 | -4/+0 |
* | | | | Merge pull request #2049 from MetaMask/i1938-removecryptopermissions | Kevin Serrano | 2017-09-11 | 2 | -3/+3 |
|\ \ \ \ | |||||
| * | | | | Merge branch 'master' into i1938-removecryptopermissions | kumavis | 2017-09-08 | 2 | -6/+27 |
| |\| | | | |||||
| * | | | | Add to changelog. | Kevin Serrano | 2017-09-08 | 1 | -0/+1 |
| * | | | | Remove cryptonator from chrome permissions. | Kevin Serrano | 2017-09-08 | 1 | -3/+2 |
* | | | | | Merge pull request #2047 from MetaMask/i1997-networkindicate | Thomas Huang | 2017-09-09 | 1 | -3/+8 |
|\ \ \ \ \ | |||||
| * | | | | | Add cursor on hover on loading. Change some wording. | Kevin Serrano | 2017-09-08 | 1 | -3/+3 |
| * | | | | | Add caret to indicate network is dropdown. | Kevin Serrano | 2017-09-08 | 1 | -0/+5 |
* | | | | | | Merge pull request #2057 from MetaMask/Version-3.9.13 | kumavis | 2017-09-09 | 3 | -26/+32 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | |||||
| * | | | | | Version 3.9.13v3.9.13 | Dan Finlay | 2017-09-09 | 2 | -1/+5 |
| * | | | | | inpage provider - define sendAsync on the prototype | kumavis | 2017-09-09 | 1 | -25/+27 |
* | | | | | | Merge pull request #2048 from MetaMask/i1984-tokenvalidations | Dan Finlay | 2017-09-08 | 2 | -6/+27 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | |||||
| * | | | | | Fix typo. | Kevin Serrano | 2017-09-08 | 1 | -1/+1 |
| * | | | | | Fix link to open new tab. | Kevin Serrano | 2017-09-08 | 1 | -0/+1 |
| * | | | | | Bump changelog. | Kevin Serrano | 2017-09-08 | 1 | -0/+2 |
| * | | | | | Add front-end validation for own adddresses as a token contract address. Add ... | Kevin Serrano | 2017-09-08 | 1 | -6/+24 |
|/ / / / / | |||||
* | | | | | Merge pull request #2046 from MetaMask/RewordSeedRestore | Kevin Serrano | 2017-09-08 | 1 | -1/+1 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | Reword forgot password to restore seed phrase | Dan Finlay | 2017-09-08 | 1 | -1/+1 |
|/ / / / | |||||
* | | | | Merge pull request #1987 from MetaMask/CheckFaq67 | Kevin Serrano | 2017-09-08 | 1 | -0/+19 |
|\ \ \ \ | |||||
| * | | | | Add test for trying to reproduce faq#67 | Dan Finlay | 2017-08-30 | 1 | -0/+19 |
| | | * | | Changelog and attribution. | Kevin Serrano | 2017-09-08 | 1 | -0/+1 |
| | | * | | Convert icon to button. | Kevin Serrano | 2017-09-08 | 2 | -12/+18 |
| | | * | | Fold submit and buy ether into one button slot | Kevin Serrano | 2017-09-08 | 1 | -15/+9 |
| | | * | | Merge branch 'master' of github.com:davidp94/metamask-extension into rejectal... | Kevin Serrano | 2017-09-08 | 2 | -0/+23 |
| |_|/| | |/| | | | | |||||
| | | * | | fix goHome | davidp94 | 2017-08-15 | 1 | -2/+6 |
| | | * | | remove unused action type | davidp94 | 2017-08-15 | 1 | -1/+0 |
| | | * | | cancel all txs | DavidNinja | 2017-08-15 | 2 | -0/+20 |
* | | | | | Merge pull request #1893 from MetaMask/readd-loose | Thomas Huang | 2017-09-08 | 6 | -5/+30 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | |||||
| * | | | | Place object property retrieval inside try-catch | Kevin Serrano | 2017-09-08 | 1 | -2/+3 |
| * | | | | Change expected type to array. | Kevin Serrano | 2017-09-08 | 1 | -1/+1 |
| * | | | | Changelog bump | Kevin Serrano | 2017-09-07 | 1 | -0/+1 |
| * | | | | Merge branch 'master' into readd-loose | Kevin Serrano | 2017-09-07 | 5 | -7/+11 |
| |\ \ \ \ | |/ / / / |/| | | | | |||||
* | | | | | Merge pull request #2033 from MetaMask/Version-3.9.12 | kumavis | 2017-09-07 | 2 | -1/+4 |
|\ \ \ \ \ | | |_|/ / | |/| | | | |||||
| * | | | | Version 3.9.12v3.9.12 | Dan Finlay | 2017-09-07 | 2 | -1/+4 |
|/ / / / | |||||
* | | | | Merge pull request #2017 from MetaMask/DevEnviornment | kumavis | 2017-09-07 | 2 | -4/+4 |
|\ \ \ \ | |||||
| * | | | | Update mock-store dependency | tmashuang | 2017-09-07 | 1 | -2/+2 |
| * | | | | Update development store | tmashuang | 2017-09-05 | 1 | -2/+2 |
* | | | | | Merge pull request #2023 from MetaMask/web3-1.0-fix | Dan Finlay | 2017-09-07 | 1 | -2/+3 |
|\ \ \ \ \ | |||||
| * | | | | | inpage - bug fix | kumavis | 2017-09-06 | 1 | -2/+3 |
|/ / / / / | |||||
| | * | | | Properly update keyring state on new account addition. | Kevin Serrano | 2017-09-07 | 1 | -1/+2 |
| | * | | | Merge branch 'master' into readd-loose | Kevin Serrano | 2017-09-06 | 3 | -3/+16 |
| | |\ \ \ | |_|/ / / |/| | | | | |||||
* | | | | | Merge pull request #2019 from MetaMask/i2016-ImproveSignDeprecationWarning | Kevin Serrano | 2017-09-06 | 2 | -2/+14 |
|\ \ \ \ \ | |||||
| * | | | | | Make eth_sign deprecation warning more useful | Dan Finlay | 2017-09-06 | 2 | -2/+14 |
| |/ / / / | |||||
* | | | | | Merge pull request #2018 from MetaMask/i2014-BetterWeb3DeprecationWarning | Kevin Serrano | 2017-09-06 | 2 | -1/+2 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Make web3 deprecation notice more useful | Dan Finlay | 2017-09-06 | 2 | -1/+2 |
|/ / / / | |||||
| * | | | Resolve merge conflict from master | Kevin Serrano | 2017-09-06 | 32 | -270/+3791 |
| |\ \ \ | |/ / / |/| | | | |||||
* | | | | Merge pull request #2008 from MetaMask/mascara-fix | kumavis | 2017-09-02 | 2 | -4/+4 |
|\ \ \ \ | |||||
| * | | | | mascara - fix iframe stream constructor | kumavis | 2017-09-02 | 2 | -4/+4 |
* | | | | | Merge pull request #1897 from MetaMask/greenkeeper/sinon-3.2.0 | Thomas Huang | 2017-09-02 | 1 | -1/+1 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | chore(package): update sinon to version 3.2.0 | greenkeeper[bot] | 2017-08-10 | 1 | -1/+1 |
* | | | | | Merge pull request #2007 from MetaMask/i2005-HttpsLinjs | Kevin Serrano | 2017-09-02 | 3 | -6/+8 |
|\ \ \ \ \ | |||||
| * | | | | | Bump changelog | Dan Finlay | 2017-09-02 | 1 | -0/+2 |
| * | | | | | Update etherscan links to https | Dan Finlay | 2017-09-02 | 1 | -5/+5 |
| * | | | | | Update support link | Dan Finlay | 2017-09-02 | 1 | -1/+1 |
|/ / / / / | |||||
* | | | | | Merge pull request #1988 from MetaMask/i1986-AddVersionToStateLogs | Kevin Serrano | 2017-08-30 | 2 | -1/+5 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'master' into i1986-AddVersionToStateLogs | Kevin Serrano | 2017-08-30 | 2 | -1/+2 |
| |\ \ \ \ \ | |/ / / / / |/| | | | | | |||||
* | | | | | | Merge pull request #1992 from MetaMask/MultipleTokensText | Kevin Serrano | 2017-08-30 | 2 | -1/+2 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | |||||
| * | | | | | Update changelog | Thomas Huang | 2017-08-30 | 1 | -0/+1 |
| * | | | | | Multiple tokens shows the amount when greater than 1 | Thomas Huang | 2017-08-30 | 1 | -1/+1 |
|/ / / / / | |||||
| * / / / | Add version to state logs | Dan Finlay | 2017-08-30 | 2 | -1/+5 |
|/ / / / | |||||
* | | | | Merge pull request #1985 from MetaMask/i1974-EnsureDeepCloneHistory | kumavis | 2017-08-29 | 1 | -0/+26 |
|\ \ \ \ | |||||
| * | | | | Add some tests to tx-state-history-helper | Dan Finlay | 2017-08-29 | 1 | -0/+26 |
* | | | | | Merge pull request #1965 from MetaMask/inpage-provider-fixes | Kevin Serrano | 2017-08-29 | 3 | -22/+47 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Merge branch 'master' into inpage-provider-fixes | kumavis | 2017-08-29 | 8 | -41/+189 |
| |\ \ \ \ | |/ / / / |/| | | | | |||||
* | | | | | Merge pull request #1977 from MetaMask/Version-3.9.11 | Dan Finlay | 2017-08-24 | 2 | -1/+3 |
|\ \ \ \ \ | |||||
| * | | | | | Version 3.9.11v3.9.11 | Dan Finlay | 2017-08-24 | 2 | -1/+3 |
|/ / / / / | |||||
* | | | | | Merge pull request #1973 from MetaMask/hotfix-migration019 | kumavis | 2017-08-24 | 3 | -1/+85 |
|\ \ \ \ \ | |||||
| * | | | | | fall back to `latest` if blockNumber is null | frankiebee | 2017-08-24 | 1 | -1/+1 |
| * | | | | | Make method return a number | Dan Finlay | 2017-08-24 | 1 | -1/+1 |
| * | | | | | Only cancel pending txs with non continuously high nonces | Dan Finlay | 2017-08-24 | 1 | -1/+24 |
| * | | | | | fix description | frankiebee | 2017-08-24 | 1 | -2/+2 |
| * | | | | | hotfix - fail submitted txs whos nonce is out of bound | frankiebee | 2017-08-24 | 2 | -0/+61 |
* | | | | | | Merge pull request #1971 from MetaMask/SetMaxRetryLimit | kumavis | 2017-08-24 | 3 | -2/+13 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Bump changelog | Dan Finlay | 2017-08-24 | 1 | -0/+1 |
| * | | | | | Fail transactions after a day of retries | Dan Finlay | 2017-08-24 | 2 | -2/+12 |
|/ / / / / | |||||
* | | | | | Merge pull request #1969 from MetaMask/i1966-IgnoreInvalidPendingNonces | Dan Finlay | 2017-08-24 | 3 | -38/+89 |
|\ \ \ \ \ | |||||
| * | | | | | Bump changelog | Dan Finlay | 2017-08-24 | 1 | -0/+2 |
| * | | | | | Enforce nonces as type string | Dan Finlay | 2017-08-24 | 1 | -2/+10 |
| * | | | | | Use toNumber method | Dan Finlay | 2017-08-24 | 1 | -2/+1 |
| * | | | | | Fix network nonce parsing | Dan Finlay | 2017-08-24 | 1 | -4/+11 |
| * | | | | | Corrected test constraints | Dan Finlay | 2017-08-24 | 1 | -2/+2 |
| * | | | | | Add mysterious failing test | Dan Finlay | 2017-08-24 | 1 | -0/+20 |
| * | | | | | Pass nonce tests | Dan Finlay | 2017-08-24 | 2 | -12/+11 |
| * | | | | | Got all tests but one passing | Dan Finlay | 2017-08-24 | 1 | -0/+1 |
| * | | | | | Fix new test, break an older maybe wrong one | Dan Finlay | 2017-08-24 | 2 | -29/+27 |
| * | | | | | Linted | Dan Finlay | 2017-08-24 | 1 | -1/+0 |
| * | | | | | Add failing test for newly identified error state | Dan Finlay | 2017-08-24 | 1 | -0/+17 |
| * | | | | | Simplify nonce calculation | Dan Finlay | 2017-08-24 | 1 | -4/+5 |
|/ / / / / | |||||
| * | | | | inpage - add changelog note | kumavis | 2017-08-29 | 1 | -0/+3 |
| * | | | | inpage - lint fix | kumavis | 2017-08-29 | 1 | -1/+1 |
| * | | | | inpage provider - autoreload - improve readability | kumavis | 2017-08-24 | 1 | -15/+32 |
| * | | | | inpage provider - only warn web3 usage once per session | kumavis | 2017-08-24 | 1 | -6/+11 |
| * | | | | inpage provider - sync rpc - default to null values | kumavis | 2017-08-24 | 1 | -3/+3 |
|/ / / / | |||||
* | | | | Merge pull request #1963 from MetaMask/Version-3.9.10v3.9.10 | Dan Finlay | 2017-08-24 | 2 | -1/+3 |
|\ \ \ \ | |||||
| * | | | | Version 3.9.10 | Dan Finlay | 2017-08-24 | 2 | -1/+3 |
|/ / / / | |||||
* | | | | Merge pull request #1945 from MetaMask/useLocalNonce | Dan Finlay | 2017-08-24 | 5 | -58/+255 |
|\ \ \ \ | |||||
| * \ \ \ | Merge branch 'master' into useLocalNonce | Dan Finlay | 2017-08-24 | 2 | -10/+2 |
| |\ \ \ \ | |/ / / / |/| | | | | |||||
* | | | | | Merge pull request #1960 from MetaMask/RemoveTxViz | Kevin Serrano | 2017-08-24 | 2 | -10/+3 |
|\ \ \ \ \ | |||||
| * | | | | | Remove eth-tx-viz link from tx history icons | Dan Finlay | 2017-08-24 | 2 | -10/+3 |
|/ / / / / | |||||
| * | | | | Bump changelog | Dan Finlay | 2017-08-24 | 1 | -0/+2 |
| * | | | | Merge branch 'master' into useLocalNonce | Dan Finlay | 2017-08-24 | 10 | -27/+3214 |
| |\ \ \ \ | |/ / / / |/| | | | | |||||
* | | | | | Merge pull request #1946 from MetaMask/Version-3.9.9 | Thomas Huang | 2017-08-19 | 2 | -2/+3 |
|\ \ \ \ \ | |||||
| * | | | | | Version 3.9.9v3.9.9 | Dan Finlay | 2017-08-19 | 2 | -2/+3 |
|/ / / / / | |||||
* | | | | | Merge pull request #1914 from MetaMask/history-diff | Dan Finlay | 2017-08-19 | 8 | -26/+3211 |
|\ \ \ \ \ | |||||
| * | | | | | clean - remove unused test data | kumavis | 2017-08-15 | 1 | -13634/+0 |
| * | | | | | migration 18 - activate | kumavis | 2017-08-15 | 1 | -0/+1 |
| * | | | | | migration 18 - fix an oops | kumavis | 2017-08-15 | 1 | -1/+1 |
| * | | | | | tx controller - test - fix typo from moved test | kumavis | 2017-08-15 | 1 | -3/+3 |
| * | | | | | tx controller - tx state history various small fixes | kumavis | 2017-08-15 | 5 | -4/+13637 |
| * | | | | | tx controller - test - test tx state history in updateTx | kumavis | 2017-08-15 | 1 | -6/+18 |
| * | | | | | migration 18 - move to diff-based history | kumavis | 2017-08-15 | 1 | -0/+52 |
| * | | | | | introduce tx-state-history-helper and diff-based history | kumavis | 2017-08-15 | 6 | -20/+3141 |
| | |_|_|/ | |/| | | | |||||
| | * | | | Fix format of changelog | Dan Finlay | 2017-08-24 | 1 | -1/+0 |
| | * | | | nonce-tracker - more debugging numbers for nonceDetails | kumavis | 2017-08-23 | 1 | -10/+8 |
| | * | | | remove unused code | kumavis | 2017-08-23 | 1 | -15/+0 |
| | * | | | nonce-tracker - use ethjs-query | kumavis | 2017-08-23 | 1 | -11/+2 |
| | * | | | nonce-tracker - fix var name | kumavis | 2017-08-23 | 1 | -4/+4 |
| | * | | | nonce-tracker - getlocalNextNonce - add entry to nonceDetails | kumavis | 2017-08-23 | 1 | -1/+1 |
| | * | | | nonce-tracker - simplify _getlocalNextNonce | kumavis | 2017-08-23 | 1 | -20/+29 |
| | * | | | nonce-tracker - simplify getHighestNonce | kumavis | 2017-08-23 | 1 | -5/+3 |
| | * | | | nonce-tracker - getHighestNonce doesnt need uniqued input | kumavis | 2017-08-23 | 1 | -4/+4 |
| | * | | | nonce-tracker - make nonce strategy api and naming more symmetical | kumavis | 2017-08-23 | 1 | -19/+21 |
| | * | | | nonce-tracker - pass tests | frankiebee | 2017-08-22 | 1 | -5/+4 |
| | * | | | Refer to pending nonces, not just their count | Dan Finlay | 2017-08-22 | 1 | -0/+15 |
| | * | | | clean up code | frankiebee | 2017-08-22 | 1 | -39/+43 |
| | * | | | nonce-tracker - pass tests | frankiebee | 2017-08-22 | 1 | -11/+38 |
| | * | | | fix test | frankiebee | 2017-08-22 | 1 | -9/+9 |
| | * | | | When network nonce is highest, it should be used. | Dan Finlay | 2017-08-22 | 1 | -4/+15 |
| | * | | | Fix test | Dan Finlay | 2017-08-22 | 1 | -5/+5 |
| | * | | | Add new assertions and de-duplicate nonce tracker generation | Dan Finlay | 2017-08-22 | 1 | -29/+73 |
| | * | | | Add test for no previous txs | Dan Finlay | 2017-08-22 | 1 | -4/+25 |
| | * | | | Confine mock strategy to describe block | Dan Finlay | 2017-08-22 | 1 | -35/+39 |
| | * | | | Move mock txs to tx mocking class | Dan Finlay | 2017-08-22 | 2 | -35/+48 |
| | * | | | break out network nonce calc. | frankiebee | 2017-08-19 | 1 | -17/+21 |
| | * | | | fix 0x0 nonce calc. | frankiebee | 2017-08-19 | 1 | -8/+18 |
| | * | | | include pendingTxs in localNonce | frankiebee | 2017-08-19 | 1 | -10/+9 |
| | * | | | use "localNonce" when the network returns a nonce that is lower then a known ... | frankiebee | 2017-08-19 | 2 | -3/+27 |
| | * | | | add test for using localNonce | frankiebee | 2017-08-19 | 1 | -4/+42 |
| |/ / / |/| | | | |||||
* | | | | Merge pull request #1941 from MetaMask/i1912-TokenPrecisionFix | Kevin Serrano | 2017-08-19 | 2 | -1/+3 |
|\ \ \ \ | |||||
| * \ \ \ | Merge branch 'master' into i1912-TokenPrecisionFix | Kevin Serrano | 2017-08-19 | 3 | -2/+8 |
| |\ \ \ \ | |/ / / / |/| | | | | |||||
* | | | | | Merge pull request #1942 from MetaMask/i1903-EthSignFormat | Thomas Huang | 2017-08-18 | 3 | -2/+7 |
|\ \ \ \ \ | |||||
| * | | | | | Bump changelog | Dan Finlay | 2017-08-18 | 1 | -0/+2 |
| * | | | | | Fix eth sign formatting | Dan Finlay | 2017-08-18 | 2 | -2/+5 |
|/ / / / / | |||||
| * / / / | Fix token balance precision rendering | Dan Finlay | 2017-08-18 | 2 | -1/+2 |
|/ / / / | |||||
* | | | | Merge pull request #1935 from MetaMask/i1091-ShowTxErrors | Frankie | 2017-08-18 | 3 | -104/+8 |
|\ \ \ \ | |||||
| * | | | | Remove dead tests | Dan Finlay | 2017-08-17 | 1 | -86/+1 |
| * | | | | Bump changelog | Dan Finlay | 2017-08-17 | 1 | -0/+2 |
| * | | | | Transition to home view after tx error | Dan Finlay | 2017-08-17 | 1 | -18/+5 |
* | | | | | Merge pull request #1933 from MetaMask/Version-3.9.8 | Thomas Huang | 2017-08-17 | 2 | -1/+3 |
|\| | | | | |||||
| * | | | | Version 3.9.8v3.9.8 | Dan Finlay | 2017-08-17 | 2 | -1/+3 |
|/ / / / | |||||
* | | | | Merge pull request #1928 from MetaMask/RemoveDefaultTokens | Kevin Serrano | 2017-08-17 | 3 | -52/+31 |
|\ \ \ \ | |||||
| * | | | | Fallback to ethplorer link | Dan Finlay | 2017-08-17 | 1 | -1/+18 |
| * | | | | Remove dead code | Dan Finlay | 2017-08-17 | 1 | -14/+0 |
| * | | | | Bump changelog | Dan Finlay | 2017-08-17 | 1 | -0/+3 |
| * | | | | Remove default tokens | Dan Finlay | 2017-08-17 | 1 | -11/+1 |
| * | | | | ReEnable Token List | Dan Finlay | 2017-08-17 | 1 | -26/+9 |
|/ / / / | |||||
* | | | | Merge pull request #1921 from MetaMask/v3.9.7 | Kevin Serrano | 2017-08-16 | 2 | -1/+3 |
|\ \ \ \ | |||||
| * | | | | v3.9.7 update changelogv3.9.7 | kumavis | 2017-08-16 | 1 | -0/+2 |
| * | | | | v3.9.7 | kumavis | 2017-08-16 | 1 | -1/+1 |
* | | | | | Merge pull request #1916 from MetaMask/fix/account-name-scroll | Kevin Serrano | 2017-08-16 | 1 | -1/+1 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Fix overflow issue on QubesOS, flagged by @kumavis | sdtsui | 2017-08-15 | 1 | -1/+1 |
| |/ / / | |||||
* | | | | Merge pull request #1918 from MetaMask/token-hotfix | Kevin Serrano | 2017-08-16 | 2 | -9/+27 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Change cursor type to indicate link. | Kevin Serrano | 2017-08-16 | 1 | -0/+1 |
| * | | | fix spelling | frankiebee | 2017-08-16 | 1 | -4/+3 |
| * | | | Add to CHANGELOG | frankiebee | 2017-08-16 | 1 | -0/+1 |
| * | | | Disable token list | frankiebee | 2017-08-16 | 1 | -9/+26 |
|/ / / | |||||
* | | | Merge pull request #1904 from MetaMask/web3-depreciation | kumavis | 2017-08-13 | 2 | -1/+6 |
|\ \ \ | |||||
| * | | | fix wording | frankiebee | 2017-08-12 | 1 | -1/+1 |
| * | | | Add to CHANGELOG | frankiebee | 2017-08-12 | 1 | -0/+2 |
| * | | | add deprecation warning for web3 | frankiebee | 2017-08-12 | 1 | -1/+4 |
| |/ / | |||||
* | | | Merge pull request #1899 from sdtsui/fix/acct-name-lengths | Frankie | 2017-08-12 | 3 | -4/+22 |
|\ \ \ | |/ / |/| | | |||||
| * | | Cleanup stray logs and lint | sdtsui | 2017-08-11 | 2 | -6/+1 |
| * | | Add overflow support for all account names in account details | sdtsui | 2017-08-11 | 1 | -2/+11 |
| * | | Fix logic for dropdown components attaching checkmark to correct account | sdtsui | 2017-08-11 | 1 | -1/+2 |
| * | | Fix text overflow for dropdown components flagged by @frankiebee | sdtsui | 2017-08-11 | 1 | -1/+14 |
|/ / | |||||
* | | Merge pull request #1894 from MetaMask/3.9.6v3.9.6 | Thomas Huang | 2017-08-10 | 2 | -3/+5 |
|\ \ | |||||
| * | | 3.9.6 | kumavis | 2017-08-10 | 2 | -3/+5 |
|/ / | |||||
* | | Merge pull request #1892 from MetaMask/deps-query | Thomas Huang | 2017-08-10 | 1 | -1/+1 |
|\ \ | |||||
| * | | deps - bump ethjs-query | kumavis | 2017-08-10 | 1 | -1/+1 |
|/ / | |||||
| * | Readd loose label onto accounts. | Kevin Serrano | 2017-08-10 | 4 | -4/+26 |
|/ | |||||
* | Merge pull request #1883 from MetaMask/estimateGas-fix | Thomas Huang | 2017-08-10 | 1 | -3/+11 |
|\ | |||||
| * | tx utils - detect estimateGas err and set simulationFailed | kumavis | 2017-08-09 | 1 | -3/+11 |
* | | Merge pull request #1885 from MetaMask/dharma | kumavis | 2017-08-10 | 2 | -46/+115 |
|\ \ | |||||
| * | | ui - buy eth - formatting and moved network names to config | kumavis | 2017-08-10 | 2 | -23/+24 |
| * | | lint fix | kumavis | 2017-08-09 | 1 | -1/+1 |
| * | | ui - buy eth - add dharma beta to kovan | kumavis | 2017-08-09 | 1 | -12/+22 |
| * | | ui - buy button view - refactor | kumavis | 2017-08-09 | 1 | -46/+104 |
| |/ | |||||
* | | Merge pull request #1884 from MetaMask/waffle-badge | Frankie | 2017-08-09 | 1 | -1/+2 |
|\ \ | |/ |/| | |||||
| * | readme - add waffle.io badge | kumavis | 2017-08-09 | 1 | -1/+2 |
|/ | |||||
* | Merge pull request #1882 from MetaMask/tx-cont-fixes | Frankie | 2017-08-09 | 2 | -4/+12 |
|\ | |||||
| * | tx controller - fix error serialization | kumavis | 2017-08-09 | 1 | -2/+5 |
| * | tx controller - fix getBalance fn | kumavis | 2017-08-09 | 1 | -1/+1 |
| * | util - sufficientBalance - validate input | kumavis | 2017-08-09 | 1 | -1/+6 |
|/ | |||||
* | Merge pull request #1880 from MetaMask/pendingFix | Frankie | 2017-08-09 | 2 | -3/+4 |
|\ | |||||
| * | filter by network for pending txs | frankiebee | 2017-08-09 | 1 | -0/+2 |
| * | fix getPendingTransactions function for pendingTxTracker | frankiebee | 2017-08-09 | 2 | -3/+2 |
* | | Merge pull request #1879 from MetaMask/build-err-fix | Thomas Huang | 2017-08-09 | 2 | -19/+28 |
|\ \ | |||||
| * | | build - factor watcify into bundler generation | kumavis | 2017-08-09 | 1 | -17/+11 |
| * | | build - fix error swallowing on dev | kumavis | 2017-08-09 | 1 | -1/+16 |
| * | | deps - bump watchify | kumavis | 2017-08-09 | 1 | -2/+2 |
|/ / | |||||
* | | Merge pull request #1854 from MetaMask/greenkeeper/initial | Thomas Huang | 2017-08-09 | 9 | -46/+49 |
|\ \ | |||||
| * \ | Merge branch 'master' into greenkeeper/initial | kumavis | 2017-08-09 | 14 | -380/+680 |
| |\ \ | |/ / |/| | | |||||
* | | | Merge pull request #1877 from MetaMask/hotfix/mobile-buy-layout | kumavis | 2017-08-09 | 2 | -70/+80 |
|\ \ \ | |_|/ |/| | | |||||
| * | | Fix layout issues flagged by @tmashuang | sdtsui | 2017-08-09 | 1 | -69/+79 |
| * | | Make buy ui more central to the screen | sdtsui | 2017-08-09 | 1 | -1/+1 |
* | | | Merge pull request #1861 from MetaMask/transactionControllerRefractor | kumavis | 2017-08-09 | 12 | -310/+600 |
|\ \ \ | |/ / |/| | | |||||
| * | | add json-rpc-engine && eth-json-rpc-middleware to devDependencies | frankiebee | 2017-08-09 | 1 | -0/+2 |
| * | | fix class names | frankiebee | 2017-08-09 | 3 | -18/+25 |
| * | | use provider stub | frankiebee | 2017-08-09 | 2 | -88/+65 |
| * | | create a provider stub | frankiebee | 2017-08-09 | 1 | -0/+25 |
| * | | fix the bind on pending tx watchers | frankiebee | 2017-08-08 | 1 | -3/+3 |
| * | | remove .only | frankiebee | 2017-08-08 | 1 | -1/+1 |
| * | | Merge branch 'master' into transactionControllerRefractor | frankiebee | 2017-08-08 | 36 | -737/+1151 |
| |\ \ | |/ / |/| | | |||||
| * | | fix test | frankiebee | 2017-08-08 | 1 | -3/+3 |
| * | | remove logging of the message and log the error | frankiebee | 2017-08-08 | 1 | -1/+1 |
| * | | remove unnecessary if statment for error message | frankiebee | 2017-08-08 | 1 | -1/+0 |
| * | | fix spelling | frankiebee | 2017-08-08 | 2 | -15/+12 |
| * | | rename PendingTransactionUtils -> PendingTransactionWatchers | frankiebee | 2017-08-05 | 1 | -8/+8 |
| * | | Merge branch 'master' into transactionControllerRefractor | frankiebee | 2017-08-05 | 20 | -160/+188 |
| |\ \ | |||||
| * | | | fixed: showing tx-s as errors vs. warning | frankiebee | 2017-08-05 | 1 | -3/+12 |
| * | | | bring your own BN | frankiebee | 2017-08-05 | 1 | -0/+1 |
| * | | | break out tx status pendding watchers | frankiebee | 2017-08-05 | 2 | -145/+192 |
| * | | | test for pending tx watcher | frankiebee | 2017-08-05 | 4 | -100/+280 |
| * | | | test for SufficientBalance | frankiebee | 2017-08-05 | 1 | -0/+41 |