aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | Merge pull request #1677 from MetaMask/i1676-quickclickThomas Huang2017-06-272-2/+5
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | 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.Kevin Serrano2017-06-272-8/+8
|/ / / / / / / /
* | | | | | | | Merge pull request #1603 from MetaMask/AddTokenListKevin Serrano2017-06-2322-45/+402
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | 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
| | |_|_|/ / / | |/| | | | |
| * | | | | | Fix token balance renderingDan Finlay2017-06-201-1/+1
| * | | | | | Merge branch 'AddTokenList' of github.com:MetaMask/metamask-plugin into AddTo...Dan Finlay2017-06-207-47/+93
| |\ \ \ \ \ \
| | * | | | | | Merge branch 'master' into AddTokenListKevin Serrano2017-06-201-9/+0
| | |\| | | | |
| | * | | | | | Merge branch 'AddTokenList' of github.com:MetaMask/metamask-plugin into AddTo...Kevin Serrano2017-06-2020-38/+379
| | |\ \ \ \ \ \ | | | | |_|/ / / | | | |/| | | / | | | |_|_|_|/ | | |/| | | |
| * | | | | | 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
| * | | | 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
| * | | | 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
| * | | | 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.Kevin Serrano2017-06-221-5/+1
* | | | | | | Merge pull request #1646 from MetaMask/ScarierSeedWordingFrankie2017-06-222-1/+2
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | 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
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | 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 testsThomas Huang2017-06-181-9/+0
* | | | | Merge pull request #1607 from MetaMask/i1567-FixInaccurateErrorFrankie2017-06-174-20/+20
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' into i1567-FixInaccurateErrorFrankie2017-06-172-4/+3
| |\ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | Merge pull request #1623 from MetaMask/checkTxsFrankie2017-06-172-4/+3
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | 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 updatesDan Finlay2017-06-161-1/+5
|/ / / / / /
* | | | | | Merge pull request #1619 from MetaMask/privacy-patchFrankie2017-06-161-2/+0
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Do not recommend posting logs publicly on github.Dan Finlay2017-06-161-2/+0
|/ / / / /
* | | | | Merge pull request #1609 from MetaMask/issue-templateFrankie2017-06-161-0/+17
|\ \ \ \ \
| * | | | | 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
|\ \ \ \ \
| * | | | | 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
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | 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
|/ / /
* | | Merge pull request #1606 from MetaMask/ubuntu-warningThomas Huang2017-06-152-0/+5
|\ \ \
| * | | 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
|\ \ \
| * | | 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
|\ \ \ \
| * | | | 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
|\ \ \ \ | |_|_|/ |/| | |
| * | | 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.8v3.7.8Dan Finlay2017-06-132-1/+3
|/ / /
* | | Merge pull request #1592 from MetaMask/qrPrefixkumavis2017-06-132-6/+7
|\ \ \ | |/ / |/| |
| * | 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.4kumavis2017-06-131-1/+1
* | | | Merge pull request #1208 from MetaMask/i#1203MainNetSwitchkumavis2017-06-132-2/+6
|\ \ \ \
| * | | | 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 - 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
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | 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
|\ \ \ \ \
| * | | | | 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
|\ \ \ \ \ \ \
| * | | | | | | 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
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ 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.Kevin Serrano2017-06-092-11/+10
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge pull request #1535 from MetaMask/gasupdaterDan Finlay2017-06-135-12/+16
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ 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
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | 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
|\ \ \ \ \ \ \ \
| * | | | | | | | 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
|\ \ \ \ \ \ \ \
| * | | | | | | | 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
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | 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
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Remove dead style codeDan Finlay2017-06-051-3/+0
| * | | | | | | Move address copying into reusable componentDan Finlay2017-06-052-20/+54
| * | | | | | | 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.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 BNKevin Serrano2017-06-021-2/+8
* | | | | | | Merge pull request #1527 from MetaMask/Version-3.7.3Thomas Huang2017-06-023-1/+7353
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | 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.2v3.7.2Dan Finlay2017-06-012-1/+5
|/ / / / / /
* | | | | | Merge pull request #1507 from MetaMask/AddContractIconMapkumavis2017-05-274-8/+14
|\ \ \ \ \ \
| * | | | | | 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
|\| | | | | |
| * | | | | | 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
|/ / / / / /
* | | | | | Merge pull request #1500 from MetaMask/RemoveStreamingSubproviderThomas Huang2017-05-262-17/+6
|\ \ \ \ \ \
| * | | | | | Bump changelogDan Finlay2017-05-261-0/+1
| * | | | | | Remove stream subproviderDan Finlay2017-05-261-17/+5
* | | | | | | Merge pull request #1496 from MetaMask/reloadDappDan Finlay2017-05-264-41/+29
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | fix spellingfrankiebee2017-05-251-2/+2
| * | | | | | add to CHANGELOGfrankiebee2017-05-251-0/+1
| * | | | | | Merge branch 'master' into reloadDappfrankiebee2017-05-257-21/+271
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | |
* | | | | | | Merge pull request #1494 from MetaMask/1472-gasceilingDan Finlay2017-05-253-1/+15
|\ \ \ \ \ \ \
| * | | | | | | bump changelogKevin Serrano2017-05-251-0/+1
| * | | | | | | Add max gas limit to UIKevin Serrano2017-05-251-0/+2
| * | | | | | | Add new blockGasLimit property to txMeta object.Kevin Serrano2017-05-251-1/+12
* | | | | | | | Merge pull request #1491 from MetaMask/inpage-polling-fixDan Finlay2017-05-251-1/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | inpage-provider - disable polling after first blockkumavis2017-05-251-1/+2
|/ / / / / / /
* | | | | | | Merge pull request #1443 from MetaMask/i1412-decimalizethegaskumavis2017-05-255-19/+254
|\ \ \ \ \ \ \
| * | | | | | | Minor cleanup of lintKevin Serrano2017-05-251-1/+0
| * | | | | | | Minor cleanupKevin Serrano2017-05-251-2/+2
| * | | | | | | Modfiy test to ether standards.Kevin Serrano2017-05-251-4/+4
| * | | | | | | Fix bug where submit was enabled when invalid params were filled out.Kevin Serrano2017-05-253-5/+12
| * | | | | | | Bump changelogKevin Serrano2017-05-251-0/+1
| * | | | | | | Merge branch 'master' into i1412-decimalizethegasKevin Serrano2017-05-2514-124/+373
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Cleanup code.Kevin Serrano2017-05-251-7/+15
| * | | | | | | Fix test, create new value for precision/scaleKevin Serrano2017-05-243-5/+8
| * | | | | | | Merge branch 'master' into i1412-decimalizethegasKevin Serrano2017-05-247-14/+60
| |\ \ \ \ \ \ \
| * | | | | | | | Increase accuracy of our rounding schemes.Kevin Serrano2017-05-241-3/+26
| * | | | | | | | Modify test, replace clone package.Kevin Serrano2017-05-182-9/+6
| * | | | | | | | Merge branch 'i1412-decimalizethegas' of github.com:MetaMask/metamask-plugin ...Kevin Serrano2017-05-182-1/+50
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Linted testDan Finlay2017-05-171-6/+4
| | * | | | | | | | Clean up testDan Finlay2017-05-171-4/+1
| | * | | | | | | | Simplify test to represent realistic use caseDan Finlay2017-05-171-10/+6
| | * | | | | | | | Merge branch 'master' into i1412-BrutalTestsDan Finlay2017-05-175-21/+97
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch 'i1407-GasEditingBug' into i1412-BrutalTestsDan Finlay2017-05-170-0/+0
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Rename tx manager to tx controllerDan Finlay2017-05-173-70/+70
| | * | | | | | | | | | Add test requiring high precisionDan Finlay2017-05-172-1/+60
| * | | | | | | | | | | Merge branch 'master' into i1412-decimalizethegasKevin Serrano2017-05-185-21/+98
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | / / / / / / / / | | | |/ / / / / / / / | | |/| | | | | | | |
| * | | | | | | | | | Fix merge conflicts.Kevin Serrano2017-05-1734-211/+424
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / | | |/| | | | | | | |
| * | | | | | | | | | Changelog bumpKevin Serrano2017-05-171-0/+2
| * | | | | | | | | | Fix reset button.Kevin Serrano2017-05-172-8/+10
| * | | | | | | | | | Complete transition into BN.Kevin Serrano2017-05-172-13/+157
| | | | | | * | | | | Reload the page when switching networks for sites that use web3frankiebee2017-05-253-41/+28
| |_|_|_|_|/ / / / / |/| | | | | | | | |
* | | | | | | | | | Merge pull request #1481 from MetaMask/Version-3.7.0kumavis2017-05-251-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Update announcer wordingDan Finlay2017-05-241-1/+1
* | | | | | | | | | | Merge pull request #1487 from MetaMask/stopPollingkumavis2017-05-252-2/+6
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | clean up testfrankiebee2017-05-241-2/+1
| * | | | | | | | | | | stop polling when switching networksfrankiebee2017-05-242-1/+6
* | | | | | | | | | | | Merge pull request #1486 from MetaMask/Version-3.7.1kumavis2017-05-241-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Merge branch 'master' into Version-3.7.1kumavis2017-05-2416-134/+422
| |\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #1455 from MetaMask/networkControllerkumavis2017-05-2412-118/+309
|\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into networkControllerFrankie2017-05-247-17/+114
| |\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #1480 from MetaMask/Version-3.7.0kumavis2017-05-243-3/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Version 3.7.0v3.7.0Dan Finlay2017-05-242-1/+3
| * | | | | | | | | | | | CleanupDan Finlay2017-05-241-2/+3
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #1478 from MetaMask/i1409-StalledTxsThomas Huang2017-05-242-2/+53
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Merge branch 'master' into i1409-StalledTxsDan Finlay2017-05-242-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #1475 from MetaMask/i1427-ThrowIfResolverNotSetFrankie2017-05-242-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Throw if ENS Resolver isn't set upDan Finlay2017-05-232-1/+2
|/ / / / / / / / / / / /
| * / / / / / / / / / / Continually resubmit pending txsDan Finlay2017-05-242-2/+53
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #1468 from MetaMask/HelpDebugStalledTxsDan Finlay2017-05-234-5/+33
|\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into HelpDebugStalledTxskumavis2017-05-233-6/+19
| |\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #1474 from MetaMask/i1458-StreamingSubproviderkumavis2017-05-233-6/+20
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | clean - remove console logskumavis2017-05-231-2/+0
| * | | | | | | | | | | | deps - use stream-subprovider from provider-enginekumavis2017-05-233-5/+5
| * | | | | | | | | | | | Rename stream to streamSubproviderDan Finlay2017-05-231-4/+4
| * | | | | | | | | | | | Bump changelogDan Finlay2017-05-231-0/+2
| * | | | | | | | | | | | Use filter subprovider in-page to avoid filter leaksDan Finlay2017-05-232-3/+7
| * | | | | | | | | | | | Use stream-provider v3 apiDan Finlay2017-05-231-2/+2
| * | | | | | | | | | | | Add new streaming subprovider but getting a loopDan Finlay2017-05-211-5/+15
|/ / / / / / / / / / / /
| * | | | | | | | | | | Tolerate nonces of any formatDan Finlay2017-05-232-2/+3
| * | | | | | | | | | | Render txs with no nonceDan Finlay2017-05-231-1/+1
| * | | | | | | | | | | LintDan Finlay2017-05-222-6/+3
| * | | | | | | | | | | Label the pending tx icon with a tooltipDan Finlay2017-05-222-5/+13
| * | | | | | | | | | | Add transaction number (nonce) to tx listDan Finlay2017-05-222-0/+23
|/ / / / / / / / / / /
| * | | | | | | | | | add to CHANGELOGfrankiebee2017-05-241-0/+2
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 20:34:37 +0800