aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Version 3.8.1v3.8.1Dan Finlay2017-07-012-1/+3
|
* Merge pull request #1711 from MetaMask/NoPopularTOkensThomas Huang2017-07-012-1/+4
|\ | | | | Stop loading popular tokens by default
| * Merge branch 'master' into NoPopularTOkensThomas Huang2017-07-013-1/+7
| |\ | |/ |/|
* | Merge pull request #1712 from MetaMask/RemoveTokenSendingThomas Huang2017-07-012-0/+3
|\ \ | | | | | | Remove send button
| * \ Merge branch 'master' into RemoveTokenSendingThomas Huang2017-07-012-1/+4
| |\ \ | |/ / |/| |
* | | Merge pull request #1710 from MetaMask/BumpTokenTrackerThomas Huang2017-07-012-1/+5
|\ \ \ | | | | | | | | Bump token-tracker to 1.1.1
| * | | Bump token-tracker to 1.1.2Dan Finlay2017-07-012-1/+2
| | | | | | | | | | | | | | | | | | | | To restore older firefox compatibility. Fixes #1696
| * | | Bump token-tracker to 1.1.1Dan Finlay2017-07-012-1/+4
|/ / / | | | | | | | | | | | | Includes a critical decimal-handling fix. Also reduces number of symbol and precision queries after initial load.
| * / Remove send buttonDan Finlay2017-07-012-0/+4
|/ / | | | | | | Some token precisions are not respected by TokenFactory, so it's not sufficient for a default send form. Removing for now.
| * Stop loading popular tokens by defaultDan Finlay2017-07-012-1/+5
|/ | | | Improves performance when loading the token tab.
* Merge pull request #1703 from MetaMask/deps-dedupeKevin Serrano2017-06-301-3/+1
|\ | | | | deps - remove duplicated dev-dependencies
| * deps - remove duplicated dev-dependencieskumavis2017-06-301-3/+1
|/ | | | | | ``` npm WARN The package clone is included as both a dev and production dependency. npm WARN The package react-dom is included as both a dev and production dependency. ```
* Merge pull request #1701 from MetaMask/BumpWeb3Kevin Serrano2017-06-301-1/+1
|\ | | | | Bump web3 version to 0.19.1
| * Bump web3 version to 0.9.1Dan Finlay2017-06-301-1/+1
| |
* | Merge pull request #1700 from MetaMask/StyleImprovementsKevin Serrano2017-06-301-0/+1
|\ \ | |/ |/| Add padding to token messages
| * Add padding to token messagesDan Finlay2017-06-291-0/+1
| |
* | Merge pull request #1699 from MetaMask/change-send-wordingThomas Huang2017-06-301-1/+1
|\ \ | |/ |/| change “ACCEPT” to “SUBMIT”
| * change “ACCEPT” to “SUBMIT”frankiebee2017-06-301-1/+1
|/
* Merge pull request #1691 from MetaMask/Version-3.8.0Kevin Serrano2017-06-292-1/+3
|\ | | | | Version 3.8.0
| * Version 3.8.0v3.8.0Dan Finlay2017-06-292-1/+3
|/
* Merge pull request #1690 from MetaMask/i1669-StateCopyButtonThomas Huang2017-06-292-0/+29
|\ | | | | Add copy state logs button
| * Add copy state logs buttonDan Finlay2017-06-292-0/+29
| |
* | Merge pull request #1634 from MetaMask/i784-SendTokenButtonThomas Huang2017-06-292-7/+30
|\ \ | | | | | | Add send token button (link to TokenFactory)
| * \ Merge branch 'i1616-AddTokenAdding' into i784-SendTokenButtonDan Finlay2017-06-285-22/+45
| |\ \
| * \ \ Merge branch 'i1616-AddTokenAdding' into i784-SendTokenButtonDan Finlay2017-06-241-7/+4
| |\ \ \
| * \ \ \ Merge branch 'master' into i784-SendTokenButtonDan Finlay2017-06-237-18/+34
| |\ \ \ \
| * | | | | Fix propagationDan Finlay2017-06-201-1/+1
| | | | | |
| * | | | | Merge branch 'i1616-AddTokenAdding' into i784-SendTokenButtonDan Finlay2017-06-207-49/+95
| |\ \ \ \ \
| * | | | | | Add send button to TokenFactoryDan Finlay2017-06-202-7/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A simple solution to a temporary token send screen: Linking to EtherScan. Will hold us over until we make our own token send view.
* | | | | | | Merge pull request #1620 from MetaMask/i1616-AddTokenAddingThomas Huang2017-06-2912-57/+397
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | Add ability to add tokens to token list
| * | | | | | Remove token contract validation stepDan Finlay2017-06-281-13/+1
| | |_|_|_|/ | |/| | | |
| * | | | | Merge branch 'i1616-AddTokenAdding' of github.com:MetaMask/metamask-plugin ↵Dan Finlay2017-06-280-0/+0
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | into i1616-AddTokenAdding
| | * | | | | Support other network linksDan Finlay2017-06-283-19/+27
| | | | | | |
| * | | | | | Do not allow adding non token addressesDan Finlay2017-06-281-1/+13
| | | | | | |
| * | | | | | Support other network linksDan Finlay2017-06-283-19/+27
| |/ / / / /
| * | | | | Merge branch 'i1616-AddTokenAdding' of github.com:MetaMask/metamask-plugin ↵Dan Finlay2017-06-281-1/+2
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | into i1616-AddTokenAdding
| | * | | | | Fix Back Button on Add Token ViewThomas Huang2017-06-271-1/+2
| | | |_|_|/ | | |/| | |
| * / | | | Fix token adding bugDan Finlay2017-06-281-1/+3
| |/ / / /
| * | | | Merge branch 'master' into i1616-AddTokenAddingDan Finlay2017-06-237-18/+34
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Reduce token list clutter by only showing held tokensDan Finlay2017-06-201-7/+4
| | |_|/ | |/| | | | | | | | | | We could change this when we allow hiding/removing tokens, but for now, this is a simple and pleasant solution.
| * | | Merge branch 'AddTokenList' into i1616-AddTokenAddingDan Finlay2017-06-207-49/+95
| |\ \ \ | | |_|/ | |/| |
| * | | Add ability to add tokens to token listDan Finlay2017-06-167-21/+78
| | | | | | | | | | | | | | | | Fiex #1616
| * | | Make add token screen a fully working formDan Finlay2017-06-161-11/+141
| | | | | | | | | | | | | | | | Entering the address of a valid HumanStandardToken even auto-fills the other fields!
| * | | Merge branch 'AddTokenList' into AddingTokensDan Finlay2017-06-165-27/+20
| |\ \ \
| * | | | Remove logDan Finlay2017-06-161-1/+0
| | | | |
| * | | | Create add token button and template viewDan Finlay2017-06-156-24/+170
| | | | |
* | | | | Merge pull request #1509 from MetaMask/i1473-dappDefaultGasPriceDan Finlay2017-06-282-7/+10
|\ \ \ \ \ | | | | | | | | | | | | I1473 dapp default gas price
| * | | | | Update change logThomas Huang2017-06-281-0/+1
| | | | | |
| * | | | | Merge branch 'master' into i1473-dappDefaultGasPriceThomas Huang2017-06-2828-64/+514
| |\ \ \ \ \
| * | | | | | Keeps dapp gas price if setThomas Huang2017-06-201-7/+9
| | | | | | |
* | | | | | | Merge pull request #1681 from MetaMask/AddressStrippingDan Finlay2017-06-281-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Remove trailing periods and whitespace
| * | | | | | | Remove trailing periods and white spaceThomas Huang2017-06-281-1/+1
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #1688 from MetaMask/i1687-BackButtonImportScreenDan Finlay2017-06-281-0/+9
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Add Back Button for Import Screen
| * | | | | | | Add Back Button for Import ScreenThomas Huang2017-06-281-0/+9
|/ / / / / / /
* | | | | | | Merge pull request #1685 from MetaMask/setFailedDan Finlay2017-06-282-0/+39
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Migration #015 set txs Failed
| * | | | | | | Create a migration for setting tx's with the message 'Gave up submitting ↵frankiebee2017-06-282-0/+39
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | tx.' as failed
* | | | | | | Merge pull request #1675 from MetaMask/warning-fixesDan Finlay2017-06-282-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | React Warning Fixes
| * | | | | | | Fix react warning for keys on ens address bookKevin Serrano2017-06-271-1/+1
| | | | | | | |
| * | | | | | | Fix react warning on create-vault-completeKevin Serrano2017-06-271-1/+1
| | | | | | | |
* | | | | | | | Merge pull request #1683 from MetaMask/RenameSendToNextDan Finlay2017-06-281-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Rename Send to Next
| * | | | | | | | Rename Send to NextThomas Huang2017-06-281-1/+1
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge pull request #1684 from MetaMask/neverGiveUpThomas Huang2017-06-282-4/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | dont stop retrying brodcasting txs
| * | | | | | | dont stop retrying brodcasting txsfrankiebee2017-06-282-4/+1
|/ / / / / / /
* | | | | | | Merge pull request #1678 from MetaMask/i1584-seederrorThomas Huang2017-06-272-1/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Display error when seed phrase is invalid
| * \ \ \ \ \ \ Merge branch 'master' into i1584-seederrorThomas Huang2017-06-272-2/+5
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
* | | | | | | | Merge pull request #1677 from MetaMask/i1676-quickclickThomas Huang2017-06-272-2/+5
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | Prevent Duplicate Submission with Quick Clicking
| * | | | | | | Change disabling button as state property.Kevin Serrano2017-06-271-5/+4
| | | | | | | |
| * | | | | | | Bump changelog.Kevin Serrano2017-06-271-0/+1
| | | | | | | |
| * | | | | | | Prevent users from accidentally submitting two transactions by disabling button.Kevin Serrano2017-06-271-0/+3
|/ / / / / / /
| * | | | | | Bump changelog.Kevin Serrano2017-06-271-0/+1
| | | | | | |
| * | | | | | Fix error message for invalid seed words.Kevin Serrano2017-06-271-1/+1
|/ / / / / /
* | | | | | Merge pull request #1663 from MetaMask/infura-statusThomas Huang2017-06-273-1/+90
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add Infura Status Information to UI State
| * | | | | | remove option fetchfrankiebee2017-06-231-2/+1
| | | | | | |
| * | | | | | add `done` and stub fetchfrankiebee2017-06-231-8/+9
| | | | | | |
| * | | | | | Add test for infura controller.Kevin Serrano2017-06-231-0/+34
| | | | | | |
| * | | | | | Add infura network status to our UI state.Kevin Serrano2017-06-231-1/+1
| | | | | | |
| * | | | | | Add infura network status to our UI state.Kevin Serrano2017-06-232-1/+56
| | | | | | |
* | | | | | | Merge pull request #1674 from MetaMask/remove-mapsThomas Huang2017-06-272-8/+8
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | Simplify build variables. Remove maps from production.
| * | | | | | Simplify build variables. Remove maps from production.Kevin Serrano2017-06-272-8/+8
|/ / / / / /
* | | | | | Merge pull request #1603 from MetaMask/AddTokenListKevin Serrano2017-06-2322-45/+402
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Add popular token list
| * | | | | Print integration build errorsDan Finlay2017-06-221-6/+8
| | | | | |
| * | | | | Bump circleCI node version to 8.0.0Dan Finlay2017-06-211-1/+1
| | | | | |
| * | | | | Add better event lifecycle management to token list.Dan Finlay2017-06-201-4/+18
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | Token list now renders errors when a token lookup fails. Also now cleans up event listeners when re-initializing the token list.
| * | | | Fix token balance renderingDan Finlay2017-06-201-1/+1
| | | | |
| * | | | Merge branch 'AddTokenList' of github.com:MetaMask/metamask-plugin into ↵Dan Finlay2017-06-207-47/+93
| |\ \ \ \ | | | | | | | | | | | | | | | | | | AddTokenList
| | * | | | Merge branch 'master' into AddTokenListKevin Serrano2017-06-201-9/+0
| | |\| | |
| | * | | | Merge branch 'AddTokenList' of github.com:MetaMask/metamask-plugin into ↵Kevin Serrano2017-06-2020-38/+379
| | |\ \ \ \ | | | | |_|/ | | | |/| | | | | | | | AddTokenList
| * | / | | Add MetaMark supportDan Finlay2017-06-201-1/+1
| | |/ / / | |/| | |
| * | | | Merge remote-tracking branch 'origin/master' into AddTokenListDan Finlay2017-06-165-27/+20
| |\ \ \ \ | | |_|_|/ | |/| | |
| * | | | Hide message on normal loadingDan Finlay2017-06-151-1/+3
| | | | |
| * | | | Multiple loading style improvementsDan Finlay2017-06-152-8/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - When seeking network, show a full screen loading indication + message. - Network menu is still accessible "over" this indication. - Top Menu-Droppo components now slide *under* the menu bar like they should. - Loading indication opacity increased to increase message legibility.
| * | | | Remove excessive logDan Finlay2017-06-151-1/+0
| | | | |
| * | | | Add no tokens messageDan Finlay2017-06-151-9/+13
| | | | |
| * | | | Bump token-tracker versionDan Finlay2017-06-151-1/+1
| | | | |
| * | | | Vertically center loading indicationDan Finlay2017-06-151-2/+10
| | | | |
| * | | | Refresh token balance on network changeDan Finlay2017-06-153-7/+23
| | | | |
| * | | | Persist selected account tabDan Finlay2017-06-156-14/+52
| | | | | | | | | | | | | | | | | | | | Also improve error handling with token balances.
| * | | | Rename history to sentDan Finlay2017-06-141-1/+1
| | | | |
| * | | | Remove bad state fileDan Finlay2017-06-141-93/+0
| | | | |
| * | | | Add token list note to changelogDan Finlay2017-06-141-0/+2
| | | | |
| * | | | Auto populate token list with popular token balancesDan Finlay2017-06-147-32/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Half implements #175 Things to do: - Add ability to add tokens to the list. - Persist the token tab selection (so it is an implicit preference) - Check what's up with the token-tracker polling, it seems like it is not waiting the interval.
| * | | | Fix build for eth-contract-metadataDan Finlay2017-06-142-2/+2
| | | | |
| * | | | Merge branch 'master' into AddTokenListDan Finlay2017-06-13160-7504/+3175
| |\ \ \ \
| * | | | | Add missing tx manager stateDan Finlay2017-04-251-0/+1
| | | | | |
| * | | | | Add placeholder etherscan token iconsDan Finlay2017-04-253-3/+35
| | | | | |
| * | | | | Get token list looking okDan Finlay2017-04-225-12/+136
| | | | | |
| * | | | | Add token-list dev stateDan Finlay2017-04-221-0/+93
| | | | | |
| * | | | | Add functional but ugly and hard-coded token listDan Finlay2017-04-217-15/+119
| | | | | |
* | | | | | Merge pull request #1655 from MetaMask/fix-malitoThomas Huang2017-06-221-5/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix broken malito link.
| * | | | | | Fix broken malito link.Kevin Serrano2017-06-221-5/+1
| | | | | | |
* | | | | | | Merge pull request #1646 from MetaMask/ScarierSeedWordingFrankie2017-06-222-1/+2
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Make seed confirmation wording scarier
| * | | | | | Bump changelogDan Finlay2017-06-211-0/+1
| | | | | | |
| * | | | | | Make seed confirmation wording scarierDan Finlay2017-06-211-1/+1
|/ / / / / /
* | | | | | Merge pull request #1644 from MetaMask/i1630-badgefixFrankie2017-06-212-1/+4
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | Fix badge number to include personal_sign
| * | | | | Bump changelog.Kevin Serrano2017-06-211-0/+1
| | | | | |
| * | | | | Fix badge number to include personal_signKevin Serrano2017-06-211-1/+3
|/ / / / /
* | | | | Merge pull request #1624 from MetaMask/TestLintingKevin Serrano2017-06-201-9/+0
|\ \ \ \ \ | |_|_|_|/ |/| | | | Remove second linting script for tests
| * | | | Remove second linting script for testsThomas Huang2017-06-181-9/+0
| | | | |
* | | | | Merge pull request #1607 from MetaMask/i1567-FixInaccurateErrorFrankie2017-06-174-20/+20
|\ \ \ \ \ | | | | | | | | | | | | Do not mark slowly mined txs as failed.
| * \ \ \ \ Merge branch 'master' into i1567-FixInaccurateErrorFrankie2017-06-172-4/+3
| |\ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | Merge pull request #1623 from MetaMask/checkTxsFrankie2017-06-172-4/+3
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Check txs
| * | | | | put the block listeners back on the providerfrankiebee2017-06-171-3/+2
| | | | | |
| * | | | | bump provider enginefrankiebee2017-06-171-1/+1
| | | | | |
| | * | | | put event back on the "blockTracker:/provider"frankiebee2017-06-171-1/+1
| | | | | |
| | * | | | Merge branch 'master' into i1567-FixInaccurateErrorfrankiebee2017-06-172-1/+20
| | |\ \ \ \ | |_|/ / / / |/| | | | |
* | | | | | Merge pull request #1622 from MetaMask/i1621-DebounceBackgroundUpdatesThomas Huang2017-06-161-1/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | Debounce background updates
| * | | | | | Debounce background updatesDan Finlay2017-06-161-1/+5
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Our background sometimes emits absurd quantities of updates very quickly. This PR reduces the amount of inter-process traffic by ensuring the `sendUpdate` method does not fire more than every 200 ms. Fixes #1621
* | | | | | Merge pull request #1619 from MetaMask/privacy-patchFrankie2017-06-161-2/+0
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Do not recommend posting logs publicly on github.
| * | | | | Do not recommend posting logs publicly on github.Dan Finlay2017-06-161-2/+0
|/ / / / / | | | | | | | | | | This exposes all user accounts, and not all users will want to do this, so we should not recommend this.
* | | | | Merge pull request #1609 from MetaMask/issue-templateFrankie2017-06-161-0/+17
|\ \ \ \ \ | | | | | | | | | | | | Add issue template.
| * | | | | Add issue template.Kevin Serrano2017-06-151-0/+17
| | |_|_|/ | |/| | |
| | * | | Merge branch 'master' into i1567-FixInaccurateErrorfrankiebee2017-06-163-18/+54
| | |\ \ \ | |_|/ / / |/| | | |
* | | | | Merge pull request #1611 from MetaMask/checkTxsOnSynckumavis2017-06-162-0/+47
|\ \ \ \ \ | | | | | | | | | | | | add a check for weather a tx is included in a block when jumping blocks
| * | | | | transactions controller - add commentskumavis2017-06-161-0/+5
| | | | | |
| * | | | | add a check for weather a tx is included in a block when jumping blocksfrankiebee2017-06-152-0/+42
| |/ / / /
* | | | | Merge pull request #1610 from MetaMask/bumpProviderkumavis2017-06-162-16/+6
|\ \ \ \ \ | |/ / / / |/| | | | Bump provider and check for the tx in the block that provider engine gives us
| * | | | check for the tx in the block that provider engine gives usfrankiebee2017-06-152-16/+6
| | | | |
| * | | | Bump provider-enginefrankiebee2017-06-151-1/+1
|/ / / /
| * | | check nonce and balance when resubmiting txfrankiebee2017-06-163-11/+18
| | | |
| * | | remove unnecessary logfrankiebee2017-06-151-4/+1
| | | |
| * | | bump eth-query for quiter logsfrankiebee2017-06-151-1/+1
| | | |
| * | | Do not mark slowly mined txs as failed.Dan Finlay2017-06-152-8/+5
|/ / / | | | | | | | | | | | | | | | | | | | | | Fixes #1567 Also seems to fix #1556 Also improves resubmit performance by only resubmitting on `latest`.
* | | Merge pull request #1606 from MetaMask/ubuntu-warningThomas Huang2017-06-152-0/+5
|\ \ \ | | | | | | | | Warn Users about potential JSON import problems
| * | | Bump changelog.Kevin Serrano2017-06-151-0/+2
| | | |
| * | | Add a new warning for file import JSONKevin Serrano2017-06-151-0/+3
|/ / /
* | | Merge pull request #1600 from MetaMask/i1554-ensSymFixKevin Serrano2017-06-142-15/+8
|\ \ \ | | | | | | | | ENS symbol renders on proper networks
| * | | Cleanup zero addresses.Kevin Serrano2017-06-141-5/+6
| | | |
| * | | Bump changelog.Kevin Serrano2017-06-131-0/+1
| | | |
| * | | Fix check icon appearing in inappropriate situations.Kevin Serrano2017-06-131-13/+4
| | | |
* | | | Merge pull request #1598 from MetaMask/txRetryDan Finlay2017-06-141-9/+4
|\ \ \ \ | | | | | | | | | | put tx resubmission on the block event
| * | | | rename continuallyResubmitPendingTxs to resubmitPendingTxsfrankiebee2017-06-141-2/+2
| | | | |
| * | | | put tx resubmission on the block eventfrankiebee2017-06-131-8/+3
| |/ / /
* | | | Merge pull request #1601 from MetaMask/ChainIdErrorTestFrankie2017-06-132-3/+4
|\ \ \ \ | |_|_|/ |/| | | Chain id error test
| * | | Finish async when failing async testThomas Huang2017-06-131-1/+1
| | | |
| * | | Fix networkState in chain idThomas Huang2017-06-131-1/+1
| | | |
| * | | Make test AsyncThomas Huang2017-06-131-1/+2
|/ / /
* | | Merge pull request #1597 from MetaMask/Version-3.7.8kumavis2017-06-132-1/+3
|\ \ \ | | | | | | | | Version 3.7.8
| * | | Version 3.7.8v3.7.8Dan Finlay2017-06-132-1/+3
|/ / /
* | | Merge pull request #1592 from MetaMask/qrPrefixkumavis2017-06-132-6/+7
|\ \ \ | |/ / |/| | prefix the address with "ethereum:"
| * | Merge branch 'master' into qrPrefixFrankie2017-06-1314-7390/+47
| |\ \ | |/ / |/| |
* | | Merge pull request #1594 from MetaMask/prov-eng-bumpFrankie2017-06-131-1/+1
|\ \ \ | | | | | | | | deps - prov-eng 12.2.4
| * | | deps - prov-eng 12.2.4kumavis2017-06-131-1/+1
| | | |
* | | | Merge pull request #1208 from MetaMask/i#1203MainNetSwitchkumavis2017-06-132-2/+6
|\ \ \ \ | | | | | | | | | | Change default to mainnet
| * | | | default testnet - fix typokumavis2017-06-131-1/+0
| | | | |
| * | | | Merge branch 'master' into i#1203MainNetSwitchkumavis2017-06-13206-9535/+12275
| |\| | |
| * | | | Merge branch 'master' into i#1203MainNetSwitchFrankie2017-03-1710-6/+211
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into i#1203MainNetSwitchkumavis2017-03-1531-43/+40
| |\ \ \ \ \
| * | | | | | Add to CHANGELOGfrankiebee2017-03-141-0/+1
| | | | | | |
| * | | | | | Swithch the default network to mainnetfrankiebee2017-03-141-3/+6
| | | | | | |
* | | | | | | Merge pull request #1591 from MetaMask/ignore-package-lockFrankie2017-06-132-7356/+14
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | gitignore - add package-lock and re-arrange by category
| * | | | | | | gitignore - remove cached package-lockkumavis2017-06-131-7348/+0
| | | | | | | |
| * | | | | | | gitignore - add package-lock and re-arrange by categorykumavis2017-06-131-8/+14
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge pull request #1585 from MetaMask/t-lintFrankie2017-06-139-31/+26
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Lint Fixes
| * | | | | | LintingThomas Huang2017-06-139-31/+26
|/ / / / / /
| | | | * | add to CHANGELOGfrankiebee2017-06-131-0/+1
| | | | | |
| | | | * | only prefix ethereum addressfrankiebee2017-06-131-5/+6
| | | | | |
| | | | * | prefix the address with "ethereum:"frankiebee2017-06-131-2/+1
| |_|_|/ / |/| | | |
* | | | | Merge pull request #1574 from MetaMask/internfixDan Finlay2017-06-133-3/+3
|\ \ \ \ \ | | | | | | | | | | | | Wording fix for notice button
| * | | | | Modify wording to new accept.Kevin Serrano2017-06-103-3/+3
| | | | | |
| * | | | | Merge branch 'master' of github.com:nihar97/metamask-plugin into internfixKevin Serrano2017-06-093-3/+3
| |\ \ \ \ \
| | * | | | | continue button changed to agreeNihar2017-05-173-3/+3
| | | | | | |
* | | | | | | Merge pull request #1572 from MetaMask/mascaraUpkeepkumavis2017-06-134-11/+9
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Mascara upkeep
| * | | | | | | reload page if ui is not presentfrankiebee2017-06-091-2/+6
| | | | | | | |
| * | | | | | | reload the page when switching networksfrankiebee2017-06-091-3/+2
| | | | | | | |
| * | | | | | | bump cswready eventfrankiebee2017-06-091-1/+1
| | | | | | | |
| * | | | | | | clean up codefrankiebee2017-06-091-5/+0
| |/ / / / / /
* | | | | | | Merge pull request #1552 from MetaMask/currency-fixDan Finlay2017-06-134-4/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix Currency API
| * \ \ \ \ \ \ Merge branch 'master' into currency-fixDan Finlay2017-06-137-14/+21
| |\ \ \ \ \ \ \
| * | | | | | | | Resolve changelog merging.Kevin Serrano2017-06-061-0/+1
| | | | | | | | |
| * | | | | | | | Merge branch 'master' into currency-fixKevin Serrano2017-06-0616-150/+193
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| * | | | | | | | Bump changelog.Kevin Serrano2017-06-061-0/+2
| | | | | | | | |
| * | | | | | | | Modify tests for new api mock.'Kevin Serrano2017-06-061-2/+2
| | | | | | | | |
| * | | | | | | | Use new URL for currency API from cryptonator.Kevin Serrano2017-06-062-2/+2
| | | | | | | | |
* | | | | | | | | Merge pull request #1570 from MetaMask/addfaqDan Finlay2017-06-132-11/+10
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | Modify FAQ to be more visible.
| * | | | | | | | Modify FAQ to be more visible.Kevin Serrano2017-06-092-11/+10
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge pull request #1535 from MetaMask/gasupdaterDan Finlay2017-06-135-12/+16
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Update GasBlockLimits on every new block
| * \ \ \ \ \ \ \ Merge branch 'master' into gasupdaterDan Finlay2017-06-1318-161/+268
| |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | Merge pull request #1571 from MetaMask/tracker-warpv3.7.7Dan Finlay2017-06-093-2/+6
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | deps - bump provider engine for warp feature
| * | | | | | | | Version bump changelogDan Finlay2017-06-091-0/+2
| | | | | | | | |
| * | | | | | | | 3.7.7kumavis2017-06-091-1/+1
| | | | | | | | |
| * | | | | | | | changelog - note on block-tracker warpkumavis2017-06-091-0/+2
| | | | | | | | |
| * | | | | | | | deps - bump provider engine for warp featurekumavis2017-06-091-1/+1
|/ / / / / / / /
* | | | | | | | Merge pull request #1551 from MetaMask/i1550-FixContractPublicationkumavis2017-06-063-2/+6
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | I1550 fix contract publication
| * | | | | | | | Version 3.7.6v3.7.6Dan Finlay2017-06-062-1/+3
| | | | | | | | |
| * | | | | | | | Fix bug that prevented publishing contractsDan Finlay2017-06-062-1/+3
|/ / / / / / / /
* | | | | | | | Merge pull request #1547 from MetaMask/Version-3.7.5Dan Finlay2017-06-0612-147/+170
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Version 3.7.5
| * | | | | | | | Break docs up into individual filesv3.7.5Dan Finlay2017-06-0610-151/+153
| | | | | | | | |
| * | | | | | | | Add publishing guideDan Finlay2017-06-061-0/+10
| | | | | | | | |
| * | | | | | | | Add publishing guide to readmeDan Finlay2017-06-061-0/+5
| | | | | | | | |
| * | | | | | | | Version 3.7.5Dan Finlay2017-06-062-1/+7
|/ / / / / / / /
* | | | | | | | Merge pull request #1545 from MetaMask/inValidAddressFixkumavis2017-06-064-3/+20
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | Dissallow transactions to be sent to 0x000...
| * | | | | | | Fix for quick switch on ENS namesfrankiebee2017-06-061-0/+2
| | | | | | | |
| * | | | | | | set the ensResolution to an invalid address if an error ocurs durring look upfrankiebee2017-06-061-0/+1
| | | | | | | |
| * | | | | | | Fix linting errorfrankiebee2017-06-062-2/+1
| | | | | | | |
| * | | | | | | move address check to util.isValidAddressfrankiebee2017-06-063-3/+4
| | | | | | | |
| * | | | | | | Fix punctuationfrankiebee2017-06-061-1/+1
| | | | | | | |
| * | | | | | | Dissallow transactions to be sent to 0x0000000000000000000000000000000000000000frankiebee2017-06-064-2/+16
| | | | | | | |
* | | | | | | | Merge pull request #1542 from MetaMask/i1539-CopyAddressesKevin Serrano2017-06-062-10/+69
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Add ability to copy addresses from tx confirmation view
| * | | | | | | Remove dead style codeDan Finlay2017-06-051-3/+0
| | | | | | | |
| * | | | | | | Move address copying into reusable componentDan Finlay2017-06-052-20/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "copyable" component allows any elements to be wrapped to include: - a tool tip that changes/debounces its label when clicked. - a customizable copyable value. Fixes #1539
| * | | | | | | Add copy links to mini tx panelsDan Finlay2017-06-051-10/+38
|/ / / / / / /
| * | | | | | bump changelogKevin Serrano2017-06-031-0/+2
| | | | | | |
| * | | | | | Update gasblocklimit params with every block.Kevin Serrano2017-06-034-12/+14
|/ / / / / /
* | | | | | Merge pull request #1534 from MetaMask/Version-3.7.4kumavis2017-06-032-1/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | Version 3.7.4
| * | | | | | Version 3.7.4v3.7.4Dan Finlay2017-06-032-1/+6
|/ / / / / /
* | | | | | Merge pull request #1533 from MetaMask/i1528-gasLimitLowkumavis2017-06-031-2/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | Convert gasLimit to not use muln in BN
| * | | | | | Convert gasLimit to not use muln in BNKevin Serrano2017-06-021-2/+8
| | | | | | |
* | | | | | | Merge pull request #1527 from MetaMask/Version-3.7.3Thomas Huang2017-06-023-1/+7353
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Version 3.7.3
| * | | | | | Version 3.7.3v3.7.3Dan Finlay2017-06-023-1/+7353
|/ / / / / /
* | | | | | Merge pull request #1522 from MetaMask/Version-3.7.2Thomas Huang2017-06-012-1/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | Version 3.7.2
| * | | | | | Version 3.7.2v3.7.2Dan Finlay2017-06-012-1/+5
|/ / / / / /
* | | | | | Merge pull request #1507 from MetaMask/AddContractIconMapkumavis2017-05-274-8/+14
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add contract name map
| * | | | | | remove more in operatorsDan Finlay2017-05-271-1/+1
| | | | | | |
| * | | | | | Remove commentDan Finlay2017-05-271-1/+0
| | | | | | |
| * | | | | | Fix contract map referenceDan Finlay2017-05-271-1/+1
| | | | | | |
| * | | | | | Move off in operatorDan Finlay2017-05-271-1/+1
| | | | | | |
| * | | | | | Add names to contract map & conf viewDan Finlay2017-05-272-3/+9
| | | | | | |
| * | | | | | Move to eth-contract-metadataDan Finlay2017-05-272-4/+5
| | | | | | |
* | | | | | | Merge pull request #1505 from MetaMask/AddContractIconMapFrankie2017-05-274-18/+33
|\| | | | | | | | | | | | | | | | | | | | Add address image map to icon factory
| * | | | | | Revert inpage-providerDan Finlay2017-05-261-2/+0
| | | | | | |
| * | | | | | Correct inpage to be not modifiedDan Finlay2017-05-261-2/+2
| | | | | | |
| * | | | | | Bump changelogDan Finlay2017-05-261-0/+1
| | | | | | |
| * | | | | | Add address image map to icon factoryDan Finlay2017-05-265-20/+36
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Deriving from the new address image map repository I've added here: https://github.com/MetaMask/ethereum-contract-icons With this PR, images for addresses added to that repository will be shown instead of jazzicons in MetaMask.
* | | | | | Merge pull request #1500 from MetaMask/RemoveStreamingSubproviderThomas Huang2017-05-262-17/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | Remove streaming subprovider
| * | | | | | Bump changelogDan Finlay2017-05-261-0/+1
| | | | | | |
| * | | | | | Remove stream subproviderDan Finlay2017-05-261-17/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Since the polling leak seems to be coming from elsewhere, and new bugs came from this, I'm rolling back this change so that we can push the other improvements sooner and fix the bug at its true root.
* | | | | | | Merge pull request #1496 from MetaMask/reloadDappDan Finlay2017-05-264-41/+29
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Reload the page when switching networks for sites that use web3
| * | | | | | fix spellingfrankiebee2017-05-251-2/+2
| | | | | | |
| * | | | | | add to CHANGELOGfrankiebee2017-05-251-0/+1
| | | | | | |
| * | | | | | Merge branch 'master' into reloadDappfrankiebee2017-05-257-21/+271
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | |