Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'i1616-AddTokenAdding' into i784-SendTokenButton | Dan Finlay | 2017-06-24 | 1 | -7/+4 |
|\ | |||||
| * | Merge branch 'master' into i1616-AddTokenAdding | Dan Finlay | 2017-06-23 | 7 | -18/+34 |
| |\ | |||||
| * | | Reduce token list clutter by only showing held tokens | Dan Finlay | 2017-06-20 | 1 | -7/+4 |
* | | | Merge branch 'master' into i784-SendTokenButton | Dan Finlay | 2017-06-23 | 7 | -18/+34 |
|\ \ \ | | |/ | |/| | |||||
| * | | Merge pull request #1603 from MetaMask/AddTokenList | Kevin Serrano | 2017-06-23 | 22 | -45/+402 |
| |\ \ | |||||
| | * | | Print integration build errors | Dan Finlay | 2017-06-22 | 1 | -6/+8 |
| | * | | Bump circleCI node version to 8.0.0 | Dan Finlay | 2017-06-21 | 1 | -1/+1 |
| | * | | Add better event lifecycle management to token list. | Dan Finlay | 2017-06-20 | 1 | -4/+18 |
| * | | | Merge pull request #1655 from MetaMask/fix-malito | Thomas Huang | 2017-06-22 | 1 | -5/+1 |
| |\ \ \ | |||||
| | * | | | Fix broken malito link. | Kevin Serrano | 2017-06-22 | 1 | -5/+1 |
| * | | | | Merge pull request #1646 from MetaMask/ScarierSeedWording | Frankie | 2017-06-22 | 2 | -1/+2 |
| |\ \ \ \ | | |/ / / | |/| | | | |||||
| | * | | | Bump changelog | Dan Finlay | 2017-06-21 | 1 | -0/+1 |
| | * | | | Make seed confirmation wording scarier | Dan Finlay | 2017-06-21 | 1 | -1/+1 |
| |/ / / | |||||
| * | | | Merge pull request #1644 from MetaMask/i1630-badgefix | Frankie | 2017-06-21 | 2 | -1/+4 |
| |\ \ \ | |||||
| | * | | | Bump changelog. | Kevin Serrano | 2017-06-21 | 1 | -0/+1 |
| | * | | | Fix badge number to include personal_sign | Kevin Serrano | 2017-06-21 | 1 | -1/+3 |
| |/ / / | |||||
* | | | | Fix propagation | Dan Finlay | 2017-06-20 | 1 | -1/+1 |
* | | | | Merge branch 'i1616-AddTokenAdding' into i784-SendTokenButton | Dan Finlay | 2017-06-20 | 7 | -49/+95 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | Merge branch 'AddTokenList' into i1616-AddTokenAdding | Dan Finlay | 2017-06-20 | 7 | -49/+95 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | Fix token balance rendering | Dan Finlay | 2017-06-20 | 1 | -1/+1 |
| | * | | Merge branch 'AddTokenList' of github.com:MetaMask/metamask-plugin into AddTo... | Dan Finlay | 2017-06-20 | 7 | -47/+93 |
| | |\ \ | |||||
| | | * | | Merge branch 'master' into AddTokenList | Kevin Serrano | 2017-06-20 | 1 | -9/+0 |
| | | |\| | |||||
| | | | * | Merge pull request #1624 from MetaMask/TestLinting | Kevin Serrano | 2017-06-20 | 1 | -9/+0 |
| | | | |\ | |||||
| | | | | * | Remove second linting script for tests | Thomas Huang | 2017-06-18 | 1 | -9/+0 |
| | | * | | | Merge branch 'AddTokenList' of github.com:MetaMask/metamask-plugin into AddTo... | Kevin Serrano | 2017-06-20 | 20 | -38/+379 |
| | | |\ \ \ | | | | |/ / | | | |/| | | |||||
| | | * | | | Merge pull request #1607 from MetaMask/i1567-FixInaccurateError | Frankie | 2017-06-17 | 4 | -20/+20 |
| | | |\ \ \ | |||||
| | | | * \ \ | Merge branch 'master' into i1567-FixInaccurateError | Frankie | 2017-06-17 | 2 | -4/+3 |
| | | | |\ \ \ | | | | |/ / / | | | |/| | | | |||||
| | | * | | | | Merge pull request #1623 from MetaMask/checkTxs | Frankie | 2017-06-17 | 2 | -4/+3 |
| | | |\ \ \ \ | | | | |_|_|/ | | | |/| | | | |||||
| | | | * | | | put the block listeners back on the provider | frankiebee | 2017-06-17 | 1 | -3/+2 |
| | | | * | | | bump provider engine | frankiebee | 2017-06-17 | 1 | -1/+1 |
| | | | | * | | put event back on the "blockTracker:/provider" | frankiebee | 2017-06-17 | 1 | -1/+1 |
| | | | | * | | Merge branch 'master' into i1567-FixInaccurateError | frankiebee | 2017-06-17 | 2 | -1/+20 |
| | | | | |\ \ | | | | |_|/ / | | | |/| | | | |||||
| | | * | | | | Merge pull request #1622 from MetaMask/i1621-DebounceBackgroundUpdates | Thomas Huang | 2017-06-16 | 1 | -1/+5 |
| | | |\ \ \ \ | |||||
| | | | * | | | | Debounce background updates | Dan Finlay | 2017-06-16 | 1 | -1/+5 |
| | | |/ / / / | |||||
| | | * | | | | Merge pull request #1619 from MetaMask/privacy-patch | Frankie | 2017-06-16 | 1 | -2/+0 |
| | | |\ \ \ \ | | | | |/ / / | | | |/| | | | |||||
| | | | * | | | Do not recommend posting logs publicly on github. | Dan Finlay | 2017-06-16 | 1 | -2/+0 |
| | | |/ / / | |||||
| | | * | | | Merge pull request #1609 from MetaMask/issue-template | Frankie | 2017-06-16 | 1 | -0/+17 |
| | | |\ \ \ | |||||
| | | | * | | | Add issue template. | Kevin Serrano | 2017-06-15 | 1 | -0/+17 |
| | | | | * | | Merge branch 'master' into i1567-FixInaccurateError | frankiebee | 2017-06-16 | 3 | -18/+54 |
| | | | | |\ \ | | | | |_|/ / | | | |/| | | | |||||
| | | * | | | | Merge pull request #1611 from MetaMask/checkTxsOnSync | kumavis | 2017-06-16 | 2 | -0/+47 |
| | | |\ \ \ \ | |||||
| | | | * | | | | transactions controller - add comments | kumavis | 2017-06-16 | 1 | -0/+5 |
| | | | * | | | | add a check for weather a tx is included in a block when jumping blocks | frankiebee | 2017-06-15 | 2 | -0/+42 |
| | | | |/ / / | |||||
| | | * | | | | Merge pull request #1610 from MetaMask/bumpProvider | kumavis | 2017-06-16 | 2 | -16/+6 |
| | | |\ \ \ \ | | | | |/ / / | | | |/| | | | |||||
| | | | * | | | check for the tx in the block that provider engine gives us | frankiebee | 2017-06-15 | 2 | -16/+6 |
| | | | * | | | Bump provider-engine | frankiebee | 2017-06-15 | 1 | -1/+1 |
| | | |/ / / | |||||
| | | | * | | check nonce and balance when resubmiting tx | frankiebee | 2017-06-16 | 3 | -11/+18 |
| | | | * | | remove unnecessary log | frankiebee | 2017-06-15 | 1 | -4/+1 |
| | | | * | | bump eth-query for quiter logs | frankiebee | 2017-06-15 | 1 | -1/+1 |
| | | | * | | Do not mark slowly mined txs as failed. | Dan Finlay | 2017-06-15 | 2 | -8/+5 |
| | | |/ / | |||||
| | * | / | Add MetaMark support | Dan Finlay | 2017-06-20 | 1 | -1/+1 |
| | | |/ | | |/| | |||||
* | / | | Add send button to TokenFactory | Dan Finlay | 2017-06-20 | 2 | -7/+30 |
|/ / / | |||||
* | | | Add ability to add tokens to token list | Dan Finlay | 2017-06-16 | 7 | -21/+78 |
* | | | Make add token screen a fully working form | Dan Finlay | 2017-06-16 | 1 | -11/+141 |
* | | | Merge branch 'AddTokenList' into AddingTokens | Dan Finlay | 2017-06-16 | 5 | -27/+20 |
|\| | | |||||
| * | | Merge remote-tracking branch 'origin/master' into AddTokenList | Dan Finlay | 2017-06-16 | 5 | -27/+20 |
| |\| | |||||
| | * | Merge pull request #1606 from MetaMask/ubuntu-warning | Thomas Huang | 2017-06-15 | 2 | -0/+5 |
| | |\ | |||||
| | | * | Bump changelog. | Kevin Serrano | 2017-06-15 | 1 | -0/+2 |
| | | * | Add a new warning for file import JSON | Kevin Serrano | 2017-06-15 | 1 | -0/+3 |
| | |/ | |||||
| | * | Merge pull request #1600 from MetaMask/i1554-ensSymFix | Kevin Serrano | 2017-06-14 | 2 | -15/+8 |
| | |\ | |||||
| | | * | Cleanup zero addresses. | Kevin Serrano | 2017-06-14 | 1 | -5/+6 |
| | | * | Bump changelog. | Kevin Serrano | 2017-06-13 | 1 | -0/+1 |
| | | * | Fix check icon appearing in inappropriate situations. | Kevin Serrano | 2017-06-13 | 1 | -13/+4 |
| | * | | Merge pull request #1598 from MetaMask/txRetry | Dan Finlay | 2017-06-14 | 1 | -9/+4 |
| | |\ \ | |||||
| | | * | | rename continuallyResubmitPendingTxs to resubmitPendingTxs | frankiebee | 2017-06-14 | 1 | -2/+2 |
| | | * | | put tx resubmission on the block event | frankiebee | 2017-06-13 | 1 | -8/+3 |
| | | |/ | |||||
| | * | | Merge pull request #1601 from MetaMask/ChainIdErrorTest | Frankie | 2017-06-13 | 2 | -3/+4 |
| | |\ \ | |||||
| | | * | | Finish async when failing async test | Thomas Huang | 2017-06-13 | 1 | -1/+1 |
| | | * | | Fix networkState in chain id | Thomas Huang | 2017-06-13 | 1 | -1/+1 |
| | | * | | Make test Async | Thomas Huang | 2017-06-13 | 1 | -1/+2 |
| | |/ / | |||||
* | | | | Remove log | Dan Finlay | 2017-06-16 | 1 | -1/+0 |
* | | | | Create add token button and template view | Dan Finlay | 2017-06-15 | 6 | -24/+170 |
|/ / / | |||||
* | | | Hide message on normal loading | Dan Finlay | 2017-06-15 | 1 | -1/+3 |
* | | | Multiple loading style improvements | Dan Finlay | 2017-06-15 | 2 | -8/+16 |
* | | | Remove excessive log | Dan Finlay | 2017-06-15 | 1 | -1/+0 |
* | | | Add no tokens message | Dan Finlay | 2017-06-15 | 1 | -9/+13 |
* | | | Bump token-tracker version | Dan Finlay | 2017-06-15 | 1 | -1/+1 |
* | | | Vertically center loading indication | Dan Finlay | 2017-06-15 | 1 | -2/+10 |
* | | | Refresh token balance on network change | Dan Finlay | 2017-06-15 | 3 | -7/+23 |
* | | | Persist selected account tab | Dan Finlay | 2017-06-15 | 6 | -14/+52 |
* | | | Rename history to sent | Dan Finlay | 2017-06-14 | 1 | -1/+1 |
* | | | Remove bad state file | Dan Finlay | 2017-06-14 | 1 | -93/+0 |
* | | | Add token list note to changelog | Dan Finlay | 2017-06-14 | 1 | -0/+2 |
* | | | Auto populate token list with popular token balances | Dan Finlay | 2017-06-14 | 7 | -32/+68 |
* | | | Fix build for eth-contract-metadata | Dan Finlay | 2017-06-14 | 2 | -2/+2 |
* | | | Merge branch 'master' into AddTokenList | Dan Finlay | 2017-06-13 | 160 | -7504/+3175 |
|\| | | |||||
| * | | Merge pull request #1597 from MetaMask/Version-3.7.8 | kumavis | 2017-06-13 | 2 | -1/+3 |
| |\ \ | |||||
| | * | | Version 3.7.8v3.7.8 | Dan Finlay | 2017-06-13 | 2 | -1/+3 |
| |/ / | |||||
| * | | Merge pull request #1592 from MetaMask/qrPrefix | kumavis | 2017-06-13 | 2 | -6/+7 |
| |\ \ | | |/ | |/| | |||||
| | * | Merge branch 'master' into qrPrefix | Frankie | 2017-06-13 | 14 | -7390/+47 |
| | |\ | | |/ | |/| | |||||
| * | | Merge pull request #1594 from MetaMask/prov-eng-bump | Frankie | 2017-06-13 | 1 | -1/+1 |
| |\ \ | |||||
| | * | | deps - prov-eng 12.2.4 | kumavis | 2017-06-13 | 1 | -1/+1 |
| * | | | Merge pull request #1208 from MetaMask/i#1203MainNetSwitch | kumavis | 2017-06-13 | 2 | -2/+6 |
| |\ \ \ | |||||
| | * | | | default testnet - fix typo | kumavis | 2017-06-13 | 1 | -1/+0 |
| | * | | | Merge branch 'master' into i#1203MainNetSwitch | kumavis | 2017-06-13 | 206 | -9535/+12275 |
| | |\| | | |||||
| | * | | | Merge branch 'master' into i#1203MainNetSwitch | Frankie | 2017-03-17 | 10 | -6/+211 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge branch 'master' into i#1203MainNetSwitch | kumavis | 2017-03-15 | 31 | -43/+40 |
| | |\ \ \ \ | |||||
| | * | | | | | Add to CHANGELOG | frankiebee | 2017-03-14 | 1 | -0/+1 |
| | * | | | | | Swithch the default network to mainnet | frankiebee | 2017-03-14 | 1 | -3/+6 |
| * | | | | | | Merge pull request #1591 from MetaMask/ignore-package-lock | Frankie | 2017-06-13 | 2 | -7356/+14 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | gitignore - remove cached package-lock | kumavis | 2017-06-13 | 1 | -7348/+0 |
| | * | | | | | | gitignore - add package-lock and re-arrange by category | kumavis | 2017-06-13 | 1 | -8/+14 |
| | | |_|_|/ / | | |/| | | | | |||||
| * | | | | | | Merge pull request #1585 from MetaMask/t-lint | Frankie | 2017-06-13 | 9 | -31/+26 |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| | * | | | | | Linting | Thomas Huang | 2017-06-13 | 9 | -31/+26 |
| |/ / / / / | |||||
| | | | | * | add to CHANGELOG | frankiebee | 2017-06-13 | 1 | -0/+1 |
| | | | | * | only prefix ethereum address | frankiebee | 2017-06-13 | 1 | -5/+6 |
| | | | | * | prefix the address with "ethereum:" | frankiebee | 2017-06-13 | 1 | -2/+1 |
| | |_|_|/ | |/| | | | |||||
| * | | | | Merge pull request #1574 from MetaMask/internfix | Dan Finlay | 2017-06-13 | 3 | -3/+3 |
| |\ \ \ \ | |||||
| | * | | | | Modify wording to new accept. | Kevin Serrano | 2017-06-10 | 3 | -3/+3 |
| | * | | | | Merge branch 'master' of github.com:nihar97/metamask-plugin into internfix | Kevin Serrano | 2017-06-09 | 3 | -3/+3 |
| | |\ \ \ \ | |||||
| | | * | | | | continue button changed to agree | Nihar | 2017-05-17 | 3 | -3/+3 |
| * | | | | | | Merge pull request #1572 from MetaMask/mascaraUpkeep | kumavis | 2017-06-13 | 4 | -11/+9 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | reload page if ui is not present | frankiebee | 2017-06-09 | 1 | -2/+6 |
| | * | | | | | | reload the page when switching networks | frankiebee | 2017-06-09 | 1 | -3/+2 |
| | * | | | | | | bump cswready event | frankiebee | 2017-06-09 | 1 | -1/+1 |
| | * | | | | | | clean up code | frankiebee | 2017-06-09 | 1 | -5/+0 |
| | |/ / / / / | |||||
| * | | | | | | Merge pull request #1552 from MetaMask/currency-fix | Dan Finlay | 2017-06-13 | 4 | -4/+5 |
| |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge branch 'master' into currency-fix | Dan Finlay | 2017-06-13 | 7 | -14/+21 |
| | |\ \ \ \ \ \ | |||||
| | * | | | | | | | Resolve changelog merging. | Kevin Serrano | 2017-06-06 | 1 | -0/+1 |
| | * | | | | | | | Merge branch 'master' into currency-fix | Kevin Serrano | 2017-06-06 | 16 | -150/+193 |
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | | | |||||
| | * | | | | | | | Bump changelog. | Kevin Serrano | 2017-06-06 | 1 | -0/+2 |
| | * | | | | | | | Modify tests for new api mock.' | Kevin Serrano | 2017-06-06 | 1 | -2/+2 |
| | * | | | | | | | Use new URL for currency API from cryptonator. | Kevin Serrano | 2017-06-06 | 2 | -2/+2 |
| * | | | | | | | | Merge pull request #1570 from MetaMask/addfaq | Dan Finlay | 2017-06-13 | 2 | -11/+10 |
| |\ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | | |||||
| | * | | | | | | | Modify FAQ to be more visible. | Kevin Serrano | 2017-06-09 | 2 | -11/+10 |
| | | |/ / / / / | | |/| | | | | | |||||
| * | | | | | | | Merge pull request #1535 from MetaMask/gasupdater | Dan Finlay | 2017-06-13 | 5 | -12/+16 |
| |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | Merge branch 'master' into gasupdater | Dan Finlay | 2017-06-13 | 18 | -161/+268 |
| | |\ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | |||||
| * | | | | | | | | Merge pull request #1571 from MetaMask/tracker-warpv3.7.7 | Dan Finlay | 2017-06-09 | 3 | -2/+6 |
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | |||||
| | * | | | | | | | Version bump changelog | Dan Finlay | 2017-06-09 | 1 | -0/+2 |
| | * | | | | | | | 3.7.7 | kumavis | 2017-06-09 | 1 | -1/+1 |
| | * | | | | | | | changelog - note on block-tracker warp | kumavis | 2017-06-09 | 1 | -0/+2 |
| | * | | | | | | | deps - bump provider engine for warp feature | kumavis | 2017-06-09 | 1 | -1/+1 |
| |/ / / / / / / | |||||
| * | | | | | | | Merge pull request #1551 from MetaMask/i1550-FixContractPublication | kumavis | 2017-06-06 | 3 | -2/+6 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Version 3.7.6v3.7.6 | Dan Finlay | 2017-06-06 | 2 | -1/+3 |
| | * | | | | | | | Fix bug that prevented publishing contracts | Dan Finlay | 2017-06-06 | 2 | -1/+3 |
| |/ / / / / / / | |||||
| * | | | | | | | Merge pull request #1547 from MetaMask/Version-3.7.5 | Dan Finlay | 2017-06-06 | 12 | -147/+170 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Break docs up into individual filesv3.7.5 | Dan Finlay | 2017-06-06 | 10 | -151/+153 |
| | * | | | | | | | Add publishing guide | Dan Finlay | 2017-06-06 | 1 | -0/+10 |
| | * | | | | | | | Add publishing guide to readme | Dan Finlay | 2017-06-06 | 1 | -0/+5 |
| | * | | | | | | | Version 3.7.5 | Dan Finlay | 2017-06-06 | 2 | -1/+7 |
| |/ / / / / / / | |||||
| * | | | | | | | Merge pull request #1545 from MetaMask/inValidAddressFix | kumavis | 2017-06-06 | 4 | -3/+20 |
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | |||||
| | * | | | | | | Fix for quick switch on ENS names | frankiebee | 2017-06-06 | 1 | -0/+2 |
| | * | | | | | | set the ensResolution to an invalid address if an error ocurs durring look up | frankiebee | 2017-06-06 | 1 | -0/+1 |
| | * | | | | | | Fix linting error | frankiebee | 2017-06-06 | 2 | -2/+1 |
| | * | | | | | | move address check to util.isValidAddress | frankiebee | 2017-06-06 | 3 | -3/+4 |
| | * | | | | | | Fix punctuation | frankiebee | 2017-06-06 | 1 | -1/+1 |
| | * | | | | | | Dissallow transactions to be sent to 0x0000000000000000000000000000000000000000 | frankiebee | 2017-06-06 | 4 | -2/+16 |
| * | | | | | | | Merge pull request #1542 from MetaMask/i1539-CopyAddresses | Kevin Serrano | 2017-06-06 | 2 | -10/+69 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||||
| | * | | | | | | Remove dead style code | Dan Finlay | 2017-06-05 | 1 | -3/+0 |
| | * | | | | | | Move address copying into reusable component | Dan Finlay | 2017-06-05 | 2 | -20/+54 |
| | * | | | | | | Add copy links to mini tx panels | Dan Finlay | 2017-06-05 | 1 | -10/+38 |
| |/ / / / / / | |||||
| | * | | | | | bump changelog | Kevin Serrano | 2017-06-03 | 1 | -0/+2 |
| | * | | | | | Update gasblocklimit params with every block. | Kevin Serrano | 2017-06-03 | 4 | -12/+14 |
| |/ / / / / | |||||
| * | | | | | Merge pull request #1534 from MetaMask/Version-3.7.4 | kumavis | 2017-06-03 | 2 | -1/+6 |
| |\ \ \ \ \ | |||||
| | * | | | | | Version 3.7.4v3.7.4 | Dan Finlay | 2017-06-03 | 2 | -1/+6 |
| |/ / / / / | |||||
| * | | | | | Merge pull request #1533 from MetaMask/i1528-gasLimitLow | kumavis | 2017-06-03 | 1 | -2/+8 |
| |\ \ \ \ \ | |||||
| | * | | | | | Convert gasLimit to not use muln in BN | Kevin Serrano | 2017-06-02 | 1 | -2/+8 |
| * | | | | | | Merge pull request #1527 from MetaMask/Version-3.7.3 | Thomas Huang | 2017-06-02 | 3 | -1/+7353 |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| | * | | | | | Version 3.7.3v3.7.3 | Dan Finlay | 2017-06-02 | 3 | -1/+7353 |
| |/ / / / / | |||||
| * | | | | | Merge pull request #1522 from MetaMask/Version-3.7.2 | Thomas Huang | 2017-06-01 | 2 | -1/+5 |
| |\ \ \ \ \ | |||||
| | * | | | | | Version 3.7.2v3.7.2 | Dan Finlay | 2017-06-01 | 2 | -1/+5 |
| |/ / / / / | |||||
| * | | | | | Merge pull request #1507 from MetaMask/AddContractIconMap | kumavis | 2017-05-27 | 4 | -8/+14 |
| |\ \ \ \ \ | |||||
| | * | | | | | remove more in operators | Dan Finlay | 2017-05-27 | 1 | -1/+1 |
| | * | | | | | Remove comment | Dan Finlay | 2017-05-27 | 1 | -1/+0 |
| | * | | | | | Fix contract map reference | Dan Finlay | 2017-05-27 | 1 | -1/+1 |
| | * | | | | | Move off in operator | Dan Finlay | 2017-05-27 | 1 | -1/+1 |
| | * | | | | | Add names to contract map & conf view | Dan Finlay | 2017-05-27 | 2 | -3/+9 |
| | * | | | | | Move to eth-contract-metadata | Dan Finlay | 2017-05-27 | 2 | -4/+5 |
| * | | | | | | Merge pull request #1505 from MetaMask/AddContractIconMap | Frankie | 2017-05-27 | 4 | -18/+33 |
| |\| | | | | | |||||
| | * | | | | | Revert inpage-provider | Dan Finlay | 2017-05-26 | 1 | -2/+0 |
| | * | | | | | Correct inpage to be not modified | Dan Finlay | 2017-05-26 | 1 | -2/+2 |
| | * | | | | | Bump changelog | Dan Finlay | 2017-05-26 | 1 | -0/+1 |
| | * | | | | | Add address image map to icon factory | Dan Finlay | 2017-05-26 | 5 | -20/+36 |
| |/ / / / / | |||||
| * | | | | | Merge pull request #1500 from MetaMask/RemoveStreamingSubprovider | Thomas Huang | 2017-05-26 | 2 | -17/+6 |
| |\ \ \ \ \ | |||||
| | * | | | | | Bump changelog | Dan Finlay | 2017-05-26 | 1 | -0/+1 |
| | * | | | | | Remove stream subprovider | Dan Finlay | 2017-05-26 | 1 | -17/+5 |
| * | | | | | | Merge pull request #1496 from MetaMask/reloadDapp | Dan Finlay | 2017-05-26 | 4 | -41/+29 |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| | * | | | | | fix spelling | frankiebee | 2017-05-25 | 1 | -2/+2 |
| | * | | | | | add to CHANGELOG | frankiebee | 2017-05-25 | 1 | -0/+1 |
| | * | | | | | Merge branch 'master' into reloadDapp | frankiebee | 2017-05-25 | 7 | -21/+271 |
| | |\ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| * | | | | | | Merge pull request #1494 from MetaMask/1472-gasceiling | Dan Finlay | 2017-05-25 | 3 | -1/+15 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | bump changelog | Kevin Serrano | 2017-05-25 | 1 | -0/+1 |
| | * | | | | | | Add max gas limit to UI | Kevin Serrano | 2017-05-25 | 1 | -0/+2 |
| | * | | | | | | Add new blockGasLimit property to txMeta object. | Kevin Serrano | 2017-05-25 | 1 | -1/+12 |
| * | | | | | | | Merge pull request #1491 from MetaMask/inpage-polling-fix | Dan Finlay | 2017-05-25 | 1 | -1/+2 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||||
| | * | | | | | | inpage-provider - disable polling after first block | kumavis | 2017-05-25 | 1 | -1/+2 |
| |/ / / / / / | |||||
| * | | | | | | Merge pull request #1443 from MetaMask/i1412-decimalizethegas | kumavis | 2017-05-25 | 5 | -19/+254 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Minor cleanup of lint | Kevin Serrano | 2017-05-25 | 1 | -1/+0 |
| | * | | | | | | Minor cleanup | Kevin Serrano | 2017-05-25 | 1 | -2/+2 |
| | * | | | | | | Modfiy test to ether standards. | Kevin Serrano | 2017-05-25 | 1 | -4/+4 |
| | * | | | | | | Fix bug where submit was enabled when invalid params were filled out. | Kevin Serrano | 2017-05-25 | 3 | -5/+12 |
| | * | | | | | | Bump changelog | Kevin Serrano | 2017-05-25 | 1 | -0/+1 |
| | * | | | | | | Merge branch 'master' into i1412-decimalizethegas | Kevin Serrano | 2017-05-25 | 14 | -124/+373 |
| | |\ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||||
| | * | | | | | | Cleanup code. | Kevin Serrano | 2017-05-25 | 1 | -7/+15 |
| | * | | | | | | Fix test, create new value for precision/scale | Kevin Serrano | 2017-05-24 | 3 | -5/+8 |
| | * | | | | | | Merge branch 'master' into i1412-decimalizethegas | Kevin Serrano | 2017-05-24 | 7 | -14/+60 |
| | |\ \ \ \ \ \ | |||||
| | * | | | | | | | Increase accuracy of our rounding schemes. | Kevin Serrano | 2017-05-24 | 1 | -3/+26 |
| | * | | | | | | | Modify test, replace clone package. | Kevin Serrano | 2017-05-18 | 2 | -9/+6 |
| | * | | | | | | | Merge branch 'i1412-decimalizethegas' of github.com:MetaMask/metamask-plugin ... | Kevin Serrano | 2017-05-18 | 2 | -1/+50 |
| | |\ \ \ \ \ \ \ | |||||
| | | * | | | | | | | Linted test | Dan Finlay | 2017-05-17 | 1 | -6/+4 |
| | | * | | | | | | | Clean up test | Dan Finlay | 2017-05-17 | 1 | -4/+1 |
| | | * | | | | | | | Simplify test to represent realistic use case | Dan Finlay | 2017-05-17 | 1 | -10/+6 |
| | | * | | | | | | | Merge branch 'master' into i1412-BrutalTests | Dan Finlay | 2017-05-17 | 5 | -21/+97 |
| | | |\ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ | Merge branch 'i1407-GasEditingBug' into i1412-BrutalTests | Dan Finlay | 2017-05-17 | 0 | -0/+0 |
| | | |\ \ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | Rename tx manager to tx controller | Dan Finlay | 2017-05-17 | 3 | -70/+70 |
| | | * | | | | | | | | | Add test requiring high precision | Dan Finlay | 2017-05-17 | 2 | -1/+60 |
| | * | | | | | | | | | | Merge branch 'master' into i1412-decimalizethegas | Kevin Serrano | 2017-05-18 | 5 | -21/+98 |
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | / / / / / / / | | | | |/ / / / / / / | | | |/| | | | | | | | |||||
| | * | | | | | | | | | Fix merge conflicts. | Kevin Serrano | 2017-05-17 | 34 | -211/+424 |
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / | | | |/| | | | | | | | |||||
| | * | | | | | | | | | Changelog bump | Kevin Serrano | 2017-05-17 | 1 | -0/+2 |
| | * | | | | | | | | | Fix reset button. | Kevin Serrano | 2017-05-17 | 2 | -8/+10 |
| | * | | | | | | | | | Complete transition into BN. | Kevin Serrano | 2017-05-17 | 2 | -13/+157 |
| | | | | | | * | | | | Reload the page when switching networks for sites that use web3 | frankiebee | 2017-05-25 | 3 | -41/+28 |
| | |_|_|_|_|/ / / / | |/| | | | | | | | | |||||
| * | | | | | | | | | Merge pull request #1481 from MetaMask/Version-3.7.0 | kumavis | 2017-05-25 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Update announcer wording | Dan Finlay | 2017-05-24 | 1 | -1/+1 |
| * | | | | | | | | | | Merge pull request #1487 from MetaMask/stopPolling | kumavis | 2017-05-25 | 2 | -2/+6 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | clean up test | frankiebee | 2017-05-24 | 1 | -2/+1 |
| | * | | | | | | | | | | stop polling when switching networks | frankiebee | 2017-05-24 | 2 | -1/+6 |
| * | | | | | | | | | | | Merge pull request #1486 from MetaMask/Version-3.7.1 | kumavis | 2017-05-24 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | | | |||||
| | * | | | | | | | | | | Merge branch 'master' into Version-3.7.1 | kumavis | 2017-05-24 | 16 | -134/+422 |
| | |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | Merge pull request #1455 from MetaMask/networkController | kumavis | 2017-05-24 | 12 | -118/+309 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into networkController | Frankie | 2017-05-24 | 7 | -17/+114 |
| | |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Merge pull request #1480 from MetaMask/Version-3.7.0 | kumavis | 2017-05-24 | 3 | -3/+6 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / | | |/| | | | | | | | | | | |||||
| | * | | | | | | | | | | | Version 3.7.0v3.7.0 | Dan Finlay | 2017-05-24 | 2 | -1/+3 |
| | * | | | | | | | | | | | Cleanup | Dan Finlay | 2017-05-24 | 1 | -2/+3 |
| |/ / / / / / / / / / / | |||||
| * | | | | | | | | | | | Merge pull request #1478 from MetaMask/i1409-StalledTxs | Thomas Huang | 2017-05-24 | 2 | -2/+53 |
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | |||||
| | * | | | | | | | | | | Merge branch 'master' into i1409-StalledTxs | Dan Finlay | 2017-05-24 | 2 | -1/+2 |
| | |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | Merge pull request #1475 from MetaMask/i1427-ThrowIfResolverNotSet | Frankie | 2017-05-24 | 2 | -1/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | Throw if ENS Resolver isn't set up | Dan Finlay | 2017-05-23 | 2 | -1/+2 |
| |/ / / / / / / / / / / | |||||
| | * / / / / / / / / / | Continually resubmit pending txs | Dan Finlay | 2017-05-24 | 2 | -2/+53 |
| |/ / / / / / / / / / | |||||
| * | | | | | | | | | | Merge pull request #1468 from MetaMask/HelpDebugStalledTxs | Dan Finlay | 2017-05-23 | 4 | -5/+33 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ | Merge branch 'master' into HelpDebugStalledTxs | kumavis | 2017-05-23 | 3 | -6/+19 |
| | |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | Merge pull request #1474 from MetaMask/i1458-StreamingSubprovider | kumavis | 2017-05-23 | 3 | -6/+20 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | clean - remove console logs | kumavis | 2017-05-23 | 1 | -2/+0 |
| | * | | | | | | | | | | | deps - use stream-subprovider from provider-engine | kumavis | 2017-05-23 | 3 | -5/+5 |
| | * | | | | | | | | | | | Rename stream to streamSubprovider | Dan Finlay | 2017-05-23 | 1 | -4/+4 |
| | * | | | | | | | | | | | Bump changelog | Dan Finlay | 2017-05-23 | 1 | -0/+2 |
| | * | | | | | | | | | | | Use filter subprovider in-page to avoid filter leaks | Dan Finlay | 2017-05-23 | 2 | -3/+7 |
| | * | | | | | | | | | | | Use stream-provider v3 api | Dan Finlay | 2017-05-23 | 1 | -2/+2 |
| | * | | | | | | | | | | | Add new streaming subprovider but getting a loop | Dan Finlay | 2017-05-21 | 1 | -5/+15 |
| |/ / / / / / / / / / / | |||||
| | * | | | | | | | | | | Tolerate nonces of any format | Dan Finlay | 2017-05-23 | 2 | -2/+3 |
| | * | | | | | | | | | | Render txs with no nonce | Dan Finlay | 2017-05-23 | 1 | -1/+1 |
| | * | | | | | | | | | | Lint | Dan Finlay | 2017-05-22 | 2 | -6/+3 |
| | * | | | | | | | | | | Label the pending tx icon with a tooltip | Dan Finlay | 2017-05-22 | 2 | -5/+13 |
| | * | | | | | | | | | | Add transaction number (nonce) to tx list | Dan Finlay | 2017-05-22 | 2 | -0/+23 |
| |/ / / / / / / / / / | |||||
| | * | | | | | | | | | add to CHANGELOG | frankiebee | 2017-05-24 | 1 | -0/+2 |
| | * | | | | | | | | | include ethQuery in txController | frankiebee | 2017-05-24 | 1 | -0/+1 |
| | * | | | | | | | | | Fix for tests | frankiebee | 2017-05-24 | 8 | -57/+150 |
| | * | | | | | | | | | Wrap the provider in a proxy | frankiebee | 2017-05-23 | 5 | -126/+64 |
| | * | | | | | | | | | Add a migration for the network controller | frankiebee | 2017-05-23 | 2 | -0/+35 |
| | * | | | | | | | | | Merge branch 'master' into networkController | frankiebee | 2017-05-23 | 43 | -5965/+823 |
| | |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | |||||
| * | | | | | | | | | | Merge pull request #1447 from MetaMask/Version-3.6.5 | Thomas Huang | 2017-05-18 | 2 | -1/+3 |
| |\ \ \ \ \ \ \ \ \ \ |