Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1741 from MetaMask/ReEnableTokenList | kumavis | 2017-07-06 | 2 | -2/+3 |
|\ | |||||
| * | Reenable Default Token List | Dan Finlay | 2017-07-06 | 2 | -2/+3 |
|/ | |||||
* | Merge pull request #1739 from MetaMask/origin-header | Dan Finlay | 2017-07-06 | 2 | -4/+11 |
|\ | |||||
| * | metamask - append dapp origin domain to rpc request | kumavis | 2017-07-05 | 2 | -4/+11 |
|/ | |||||
* | Merge pull request #1733 from MetaMask/Version-3.8.2 | Thomas Huang | 2017-07-04 | 2 | -1/+3 |
|\ | |||||
| * | Version 3.8.2v3.8.2 | Dan Finlay | 2017-07-04 | 2 | -1/+3 |
|/ | |||||
* | Merge pull request #1727 from MetaMask/i1720-NoSpinnerOnConfig | Kevin Serrano | 2017-07-04 | 2 | -1/+2 |
|\ | |||||
| * | Merge branch 'master' into i1720-NoSpinnerOnConfig | Kevin Serrano | 2017-07-04 | 3 | -23/+49 |
| |\ | |/ |/| | |||||
* | | Merge pull request #1729 from MetaMask/i1707-ClarifySearchingIndication | Kevin Serrano | 2017-07-04 | 3 | -23/+50 |
|\ \ | |||||
| * | | Bump changelog | Dan Finlay | 2017-07-04 | 1 | -0/+3 |
| * | | Indicate which network is being searched for | Dan Finlay | 2017-07-04 | 1 | -1/+22 |
| * | | Add menu carrat next to network searching indicator | Dan Finlay | 2017-07-04 | 2 | -22/+25 |
|/ / | |||||
| * | No longer show network spinner on config screen | Dan Finlay | 2017-07-04 | 2 | -1/+3 |
|/ | |||||
* | Merge pull request #1714 from MetaMask/Version-3.8.1 | Thomas Huang | 2017-07-01 | 2 | -1/+3 |
|\ | |||||
| * | Version 3.8.1v3.8.1 | Dan Finlay | 2017-07-01 | 2 | -1/+3 |
|/ | |||||
* | Merge pull request #1711 from MetaMask/NoPopularTOkens | Thomas Huang | 2017-07-01 | 2 | -1/+4 |
|\ | |||||
| * | Merge branch 'master' into NoPopularTOkens | Thomas Huang | 2017-07-01 | 3 | -1/+7 |
| |\ | |/ |/| | |||||
* | | Merge pull request #1712 from MetaMask/RemoveTokenSending | Thomas Huang | 2017-07-01 | 2 | -0/+3 |
|\ \ | |||||
| * \ | Merge branch 'master' into RemoveTokenSending | Thomas Huang | 2017-07-01 | 2 | -1/+4 |
| |\ \ | |/ / |/| | | |||||
* | | | Merge pull request #1710 from MetaMask/BumpTokenTracker | Thomas Huang | 2017-07-01 | 2 | -1/+5 |
|\ \ \ | |||||
| * | | | Bump token-tracker to 1.1.2 | Dan Finlay | 2017-07-01 | 2 | -1/+2 |
| * | | | Bump token-tracker to 1.1.1 | Dan Finlay | 2017-07-01 | 2 | -1/+4 |
|/ / / | |||||
| * / | Remove send button | Dan Finlay | 2017-07-01 | 2 | -0/+4 |
|/ / | |||||
| * | Stop loading popular tokens by default | Dan Finlay | 2017-07-01 | 2 | -1/+5 |
|/ | |||||
* | Merge pull request #1703 from MetaMask/deps-dedupe | Kevin Serrano | 2017-06-30 | 1 | -3/+1 |
|\ | |||||
| * | deps - remove duplicated dev-dependencies | kumavis | 2017-06-30 | 1 | -3/+1 |
|/ | |||||
* | Merge pull request #1701 from MetaMask/BumpWeb3 | Kevin Serrano | 2017-06-30 | 1 | -1/+1 |
|\ | |||||
| * | Bump web3 version to 0.9.1 | Dan Finlay | 2017-06-30 | 1 | -1/+1 |
* | | Merge pull request #1700 from MetaMask/StyleImprovements | Kevin Serrano | 2017-06-30 | 1 | -0/+1 |
|\ \ | |/ |/| | |||||
| * | Add padding to token messages | Dan Finlay | 2017-06-29 | 1 | -0/+1 |
* | | Merge pull request #1699 from MetaMask/change-send-wording | Thomas Huang | 2017-06-30 | 1 | -1/+1 |
|\ \ | |/ |/| | |||||
| * | change “ACCEPT” to “SUBMIT” | frankiebee | 2017-06-30 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #1691 from MetaMask/Version-3.8.0 | Kevin Serrano | 2017-06-29 | 2 | -1/+3 |
|\ | |||||
| * | Version 3.8.0v3.8.0 | Dan Finlay | 2017-06-29 | 2 | -1/+3 |
|/ | |||||
* | Merge pull request #1690 from MetaMask/i1669-StateCopyButton | Thomas Huang | 2017-06-29 | 2 | -0/+29 |
|\ | |||||
| * | Add copy state logs button | Dan Finlay | 2017-06-29 | 2 | -0/+29 |
* | | Merge pull request #1634 from MetaMask/i784-SendTokenButton | Thomas Huang | 2017-06-29 | 2 | -7/+30 |
|\ \ | |||||
| * \ | Merge branch 'i1616-AddTokenAdding' into i784-SendTokenButton | Dan Finlay | 2017-06-28 | 5 | -22/+45 |
| |\ \ | |||||
| * \ \ | Merge branch 'i1616-AddTokenAdding' into i784-SendTokenButton | Dan Finlay | 2017-06-24 | 1 | -7/+4 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'master' into i784-SendTokenButton | Dan Finlay | 2017-06-23 | 7 | -18/+34 |
| |\ \ \ \ | |||||
| * | | | | | 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 |
| |\ \ \ \ \ | |||||
| * | | | | | | Add send button to TokenFactory | Dan Finlay | 2017-06-20 | 2 | -7/+30 |
* | | | | | | | Merge pull request #1620 from MetaMask/i1616-AddTokenAdding | Thomas Huang | 2017-06-29 | 12 | -57/+397 |
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | |||||
| * | | | | | | Remove token contract validation step | Dan Finlay | 2017-06-28 | 1 | -13/+1 |
| | |_|_|_|/ | |/| | | | | |||||
| * | | | | | Merge branch 'i1616-AddTokenAdding' of github.com:MetaMask/metamask-plugin in... | Dan Finlay | 2017-06-28 | 0 | -0/+0 |
| |\ \ \ \ \ | |||||
| | * | | | | | Support other network links | Dan Finlay | 2017-06-28 | 3 | -19/+27 |
| * | | | | | | Do not allow adding non token addresses | Dan Finlay | 2017-06-28 | 1 | -1/+13 |
| * | | | | | | Support other network links | Dan Finlay | 2017-06-28 | 3 | -19/+27 |
| |/ / / / / | |||||
| * | | | | | Merge branch 'i1616-AddTokenAdding' of github.com:MetaMask/metamask-plugin in... | Dan Finlay | 2017-06-28 | 1 | -1/+2 |
| |\ \ \ \ \ | |||||
| | * | | | | | Fix Back Button on Add Token View | Thomas Huang | 2017-06-27 | 1 | -1/+2 |
| | | |_|_|/ | | |/| | | | |||||
| * / | | | | Fix token adding bug | Dan Finlay | 2017-06-28 | 1 | -1/+3 |
| |/ / / / | |||||
| * | | | | 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 'AddTokenList' into i1616-AddTokenAdding | Dan Finlay | 2017-06-20 | 7 | -49/+95 |
| |\ \ \ | | |_|/ | |/| | | |||||
| * | | | 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 |
| |\ \ \ | |||||
| * | | | | 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 |
* | | | | | Merge pull request #1509 from MetaMask/i1473-dappDefaultGasPrice | Dan Finlay | 2017-06-28 | 2 | -7/+10 |
|\ \ \ \ \ | |||||
| * | | | | | Update change log | Thomas Huang | 2017-06-28 | 1 | -0/+1 |
| * | | | | | Merge branch 'master' into i1473-dappDefaultGasPrice | Thomas Huang | 2017-06-28 | 28 | -64/+514 |
| |\ \ \ \ \ | |||||
| * | | | | | | Keeps dapp gas price if set | Thomas Huang | 2017-06-20 | 1 | -7/+9 |
* | | | | | | | Merge pull request #1681 from MetaMask/AddressStripping | Dan Finlay | 2017-06-28 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Remove trailing periods and white space | Thomas Huang | 2017-06-28 | 1 | -1/+1 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge pull request #1688 from MetaMask/i1687-BackButtonImportScreen | Dan Finlay | 2017-06-28 | 1 | -0/+9 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Add Back Button for Import Screen | Thomas Huang | 2017-06-28 | 1 | -0/+9 |
|/ / / / / / / | |||||
* | | | | | | | Merge pull request #1685 from MetaMask/setFailed | Dan Finlay | 2017-06-28 | 2 | -0/+39 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Create a migration for setting tx's with the message 'Gave up submitting tx.'... | frankiebee | 2017-06-28 | 2 | -0/+39 |
| |/ / / / / / | |||||
* | | | | | | | Merge pull request #1675 from MetaMask/warning-fixes | Dan Finlay | 2017-06-28 | 2 | -2/+2 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Fix react warning for keys on ens address book | Kevin Serrano | 2017-06-27 | 1 | -1/+1 |
| * | | | | | | | Fix react warning on create-vault-complete | Kevin Serrano | 2017-06-27 | 1 | -1/+1 |
* | | | | | | | | Merge pull request #1683 from MetaMask/RenameSendToNext | Dan Finlay | 2017-06-28 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Rename Send to Next | Thomas Huang | 2017-06-28 | 1 | -1/+1 |
| | |/ / / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge pull request #1684 from MetaMask/neverGiveUp | Thomas Huang | 2017-06-28 | 2 | -4/+1 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
| * | | | | | | | dont stop retrying brodcasting txs | frankiebee | 2017-06-28 | 2 | -4/+1 |
|/ / / / / / / | |||||
* | | | | | | | Merge pull request #1678 from MetaMask/i1584-seederror | Thomas Huang | 2017-06-27 | 2 | -1/+2 |
|\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'master' into i1584-seederror | Thomas Huang | 2017-06-27 | 2 | -2/+5 |
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
* | | | | | | | | Merge pull request #1677 from MetaMask/i1676-quickclick | Thomas Huang | 2017-06-27 | 2 | -2/+5 |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | |||||
| * | | | | | | | Change disabling button as state property. | Kevin Serrano | 2017-06-27 | 1 | -5/+4 |
| * | | | | | | | Bump changelog. | Kevin Serrano | 2017-06-27 | 1 | -0/+1 |
| * | | | | | | | Prevent users from accidentally submitting two transactions by disabling button. | Kevin Serrano | 2017-06-27 | 1 | -0/+3 |
|/ / / / / / / | |||||
| * | | | | | | Bump changelog. | Kevin Serrano | 2017-06-27 | 1 | -0/+1 |
| * | | | | | | Fix error message for invalid seed words. | Kevin Serrano | 2017-06-27 | 1 | -1/+1 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #1663 from MetaMask/infura-status | Thomas Huang | 2017-06-27 | 3 | -1/+90 |
|\ \ \ \ \ \ | |||||
| * | | | | | | remove option fetch | frankiebee | 2017-06-23 | 1 | -2/+1 |
| * | | | | | | add `done` and stub fetch | frankiebee | 2017-06-23 | 1 | -8/+9 |
| * | | | | | | Add test for infura controller. | Kevin Serrano | 2017-06-23 | 1 | -0/+34 |
| * | | | | | | Add infura network status to our UI state. | Kevin Serrano | 2017-06-23 | 1 | -1/+1 |
| * | | | | | | Add infura network status to our UI state. | Kevin Serrano | 2017-06-23 | 2 | -1/+56 |
* | | | | | | | Merge pull request #1674 from MetaMask/remove-maps | Thomas Huang | 2017-06-27 | 2 | -8/+8 |
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | |||||
| * | | | | | | Simplify build variables. Remove maps from production. | Kevin Serrano | 2017-06-27 | 2 | -8/+8 |
|/ / / / / / | |||||
* | | | | | | 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 |
| | |_|_|/ | |/| | | | |||||
| * | | | | 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 branch 'AddTokenList' of github.com:MetaMask/metamask-plugin into AddTo... | Kevin Serrano | 2017-06-20 | 20 | -38/+379 |
| | |\ \ \ \ | | | | |_|/ | | | |/| | | |||||
| * | / | | | Add MetaMark support | Dan Finlay | 2017-06-20 | 1 | -1/+1 |
| | |/ / / | |/| | | | |||||
| * | | | | Merge remote-tracking branch 'origin/master' into AddTokenList | Dan Finlay | 2017-06-16 | 5 | -27/+20 |
| |\ \ \ \ | | |_|_|/ | |/| | | | |||||
| * | | | | 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 |
| |\ \ \ \ | |||||
| * | | | | | Add missing tx manager state | Dan Finlay | 2017-04-25 | 1 | -0/+1 |
| * | | | | | Add placeholder etherscan token icons | Dan Finlay | 2017-04-25 | 3 | -3/+35 |
| * | | | | | Get token list looking ok | Dan Finlay | 2017-04-22 | 5 | -12/+136 |
| * | | | | | Add token-list dev state | Dan Finlay | 2017-04-22 | 1 | -0/+93 |
| * | | | | | Add functional but ugly and hard-coded token list | Dan Finlay | 2017-04-21 | 7 | -15/+119 |
* | | | | | | 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 |
|/ / / / / | |||||
* | | | | | 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 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 |
|/ / / | |||||
* | | | 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 |
|/ / / | |||||
* | | | 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 |