%.server.in: %.server.in.in sed -e 's|\@BINDIR\@|$(bindir)|' \ -e 's|\@LIBEXECDIR\@|$(privlibexecdir)|' \ -e 's|\@COMPONENTDIR\@|$(componentdir)|' \ -e 's|\@IMPORTERSDIR\@|$(importersdir)|' \ -e 's|\@VERSION\@|$(BASE_VERSION)|' \ -e 's|\@INTERFACE_VERSION\@|$(INTERFACE_VERSION)|' $< > $@ %_$(BASE_VERSION).server: %.server mv $< $@ it' href='https://www.tfcis.org/~lantw44/git/tangerine-wallet-browser' title='tangerine-wallet-browser Git repository'/>
aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #5923 from MetaMask/phishing-text-linkThomas Huang2018-12-131-2/+1
|\
| * Update the Phishing Warning notice text to not use inline URLsWhymarrh Whitby2018-12-131-2/+1
* | Make docs links consistent (#5920)Dan Finlay2018-12-132-22/+14
|/
* Merge pull request #5919 from MetaMask/gas-customization-fixesDan J Miller2018-12-1310-26/+60
|\
| * Show transaction fee instead of total fee in top left of gas customization mo...Dan Miller2018-12-134-9/+9
| * Fix width of gas customization model in notification viewDan Miller2018-12-132-3/+4
| * Add missing translation to the gas customization component.Dan Miller2018-12-136-14/+47
* | Version 5.2.1 RC1 (#5918)v5.2.1Dan J Miller2018-12-132-1/+5
|/
* Merge pull request #5917 from MetaMask/correct-gas-limit-from-external-txDan J Miller2018-12-126-11/+23
|\
| * Ensures that advanced tab gas limit reflects tx gas limitDan Miller2018-12-126-11/+23
|/
* Add submitDisabled prop to Modals. Disable submit button when creating a canc...Alexander Tseung2018-12-124-2/+44
* Merge pull request #5902 from MetaMask/i5846-ProviderCrashesThomas Huang2018-12-124-468/+1057
|\
| * Merge pull request #5908 from MetaMask/i5846-ProviderCrashes-changelogThomas Huang2018-12-122-2/+9
| |\
| | * Changelog and version bump for 5.2.0Dan Miller2018-12-122-2/+9
| |/
| * Merge branch 'develop' into i5846-ProviderCrashesDan Finlay2018-12-1115-68/+395
| |\
| * | Bump package lock, mostly to https linksDan Finlay2018-12-111-465/+1047
| * | Bump json-rpc-engine to v4.0.0Dan Finlay2018-12-111-1/+1
* | | Show Failed transaction in the browser notification for on-chain failures (#5...Alexander Tseung2018-12-111-4/+7
| |/ |/|
* | Improve ux for low gas price set (#5862)Dan J Miller2018-12-1115-68/+395
|/
* fix formatting of 32-byte strings in personal_sign (#5878)Noah Zinsmeister2018-12-102-1/+2
* Group transactions by nonce (#5886)Alexander Tseung2018-12-1047-373/+1208
* Merge pull request #5892 from MetaMask/fix-net-version-race-conditionThomas Huang2018-12-081-4/+10
|\
| * Fix race condition in network controller lookup() method.Dan Miller2018-12-071-4/+10
* | Merge pull request #5890 from whymarrh/pl-i18nWhymarrh Whitby2018-12-081-0/+9
|\ \
| * | Fill in more Polish message translationsWhymarrh Whitby2018-12-061-0/+9
* | | Merge pull request #5891 from whymarrh/npm-auditWhymarrh Whitby2018-12-075-2552/+2542
|\ \ \ | |/ / |/| |
| * | Deduplicate package.json fileWhymarrh Whitby2018-12-072-322/+1042
| * | Update ganache-core to mitigate vulnWhymarrh Whitby2018-12-072-1262/+1092
| * | npm uninstall openWhymarrh Whitby2018-12-072-7/+0
| * | Remove beefy dependency and its usagesWhymarrh Whitby2018-12-073-504/+14
| * | circleci: Replace nsp with npm auditWhymarrh Whitby2018-12-074-579/+253
| * | npm audit fixWhymarrh Whitby2018-12-062-452/+392
| * | circleci: Disable npm audit when installing packagesWhymarrh Whitby2018-12-061-1/+1
| * | Update lockfile to fix errorsWhymarrh Whitby2018-12-061-11/+334
|/ /
* | Merge pull request #5882 from whymarrh/fix-main-container-wrapper-heightWhymarrh Whitby2018-12-061-1/+2
|\ \ | |/ |/|
| * Replace height: 100% rule with workaround for flexbox quirksWhymarrh Whitby2018-12-061-1/+2
|/
* Merge pull request #5704 from MetaMask/new-gas-customize-feature-branch-dDan J Miller2018-12-05104-264/+7147
|\
| * Fix styling of send screen in extension view when hex data on.Dan Miller2018-12-044-12/+17
| * Final gas customization fixesDan Miller2018-12-0418-104/+198
| * Clear custom gas data on hiding of gas customization modal.Dan Miller2018-12-041-4/+12
| * Modify results of API data to better fit gas chart: remove outliers, pad dataDan Miller2018-12-045-44/+126
| * Add loading spinners when waiting for APIs in the gas customization modalDan Miller2018-12-049-6/+61
| * Uses more reliable api on main send screen; caches basic api results in modalDan Miller2018-12-0421-140/+309
| * Fix "fastest" translation message; change to sentence caseDan Miller2018-12-041-1/+1
| * Improve responsiveness of customize speed up slider.Dan Miller2018-12-043-6/+76
| * Make gas customization modal responsive.Dan Miller2018-12-047-1/+32
| * Add c3 and d3 to the separate dependencies bundle.Dan Miller2018-12-041-0/+2
| * Add gas data to integration test json data set.Dan Miller2018-12-043-3/+633
| * Remove gas customization integration tests (in favour of e2e tests)Dan Miller2018-12-043-36/+317
| * Fixes for components that break e2e gas customization tests, plus unit test u...Dan Miller2018-12-049-21/+102
| * Update e2e tests for new gas customization modal.Dan Miller2018-12-045-21/+62
| * Connect gas price chart to gas station api.Dan Miller2018-12-043-41/+204
| * Adds speed up slide-in gas customization sidebarDan Miller2018-12-0419-58/+306
| * Adds createSpeedUpTransaction to txControllerDan Miller2018-12-043-0/+97
| * Redesign of gas customization basic tab.Dan Miller2018-12-048-10/+134
| * Clean up for mmui-i11-custom-gas-price-chart branchDan Miller2018-12-044-33/+25
| * Improve data management and tests for gas-modal-page-container price estimates.Dan Miller2018-12-044-20/+67
| * Update tests, plus some lint fixes, for gas-price-chartDan Miller2018-12-043-53/+204
| * Clean up gas chart code.Dan Miller2018-12-043-362/+373
| * Add control arrows to advanced gas tab inputs.Dan Miller2018-12-043-1/+63
| * Complete integration of gas chart with redux.Dan Miller2018-12-049-14/+148
| * Read only connection of gas price chart to reduxDan Miller2018-12-0413-28/+245
| * Gas price chart improvements, redesign, bug fixes, and set up to receive exte...Dan Miller2018-12-045-88/+300
| * Adds not yet functional gas price chart.Dan Miller2018-12-0411-20/+290
| * Lint and unit test fixes.Dan Miller2018-12-043-5/+4
| * Clean up for advanced gas tab customization changes.Dan Miller2018-12-043-19/+16
| * Adds redesign for the customize gas advanced tab.Dan Miller2018-12-0419-152/+332
| * Test updates and additions for button integration with send screen.Dan Miller2018-12-0419-64/+465
| * Integrate gas buttons with the send screen.Dan Miller2018-12-0414-41/+301
| * Connects remained of the gas customization component to redux.Dan Miller2018-12-0422-194/+497
| * Adds gas-duck.test.js tests.Dan Miller2018-12-041-0/+300
| * Styling fixes for gas customization advanced tab content.Dan Miller2018-12-044-3/+2
| * Improvements to propdefaults in button-group.component and basic-tab-content....Dan Miller2018-12-042-2/+3
| * Connect the gas-button-group component to redux and a live api.Dan Miller2018-12-0415-111/+573
| * Adds basic tab content to gas customizer, with styled button group (static, f...Dan Miller2018-12-0416-15/+615
| * Improve styling of advanced-tab-content gasInput rowDan Miller2018-12-043-5/+11
| * Add tests for advanced-tab-component.js and subcomponents.Dan Miller2018-12-045-18/+282
| * Remove gas slider from advance-tab-content.componentDan Miller2018-12-043-19/+2
| * Split advanced-tab-content.component.js render() method into smaller pieces;...Dan Miller2018-12-043-31/+63
| * Adds the content of the advanced tab - w/o chart or dynamic content - to gas ...Dan Miller2018-12-0421-63/+538
| * Use BEM for css in gas-modal-page-containerDan Miller2018-12-043-26/+28
| * Use correct message key in gas-modal-page-container.component.jsDan Miller2018-12-041-1/+1
| * Adds new gas customization modal container (without content)Dan Miller2018-12-0411-29/+371
|/
* Merge pull request #5876 from MetaMask/Version-5.1.0v5.1.0Thomas Huang2018-12-042-1/+8
|\
| * Version 5.1.0: East BayDan Finlay2018-12-042-1/+8
|/
* Merge pull request #5875 from MetaMask/UpdatePhishingWarningThomas Huang2018-12-041-5/+4
|\
| * Update phishing warning copyDan Finlay2018-12-041-5/+4
* | Add docs link (#5870)Dan Finlay2018-12-041-1/+3
|/
* Hide link for phishing-detect page (#5864)Michael - Blurpesec2018-12-021-1/+1
* Merge pull request #5865 from MetaMask/mmc-fixBruno Barbieri2018-12-011-1/+0
|\
| * fix visibilityBruno Barbieri2018-12-011-1/+0
|/
* Save recent network balances in local storage (#5843)Dan J Miller2018-12-0115-28/+290
* bugfix: normalize contract addresss when fetching exchange rates (#5863)Paul Bouchon2018-12-011-1/+3
* Fixed Vivek's bug (#5860)Dan Finlay2018-11-301-2/+10
* Version 5.0.4 RC1 (#5859)v5.0.4Dan Finlay2018-11-302-2/+24
* transactions/tx-gas-utils - add the acctual response for eth_getCode for NO_C...Frankie2018-11-301-0/+9
* Merge pull request #5848 from MetaMask/Less-Certain-LanguageWhymarrh Whitby2018-11-291-1/+1
|\
| * Soften accusatory language on phishing warningDan Finlay2018-11-291-1/+1
* | Merge pull request #5835 from MetaMask/revert-5412-after-install-stepsWhymarrh Whitby2018-11-275-9/+53
|\ \ | |/ |/|
| * Update e2e tests to handle any post-install window creationWhymarrh Whitby2018-11-273-9/+38
| * Add JSDoc to closeAllWindowHandlesExcept e2e helper fnWhymarrh Whitby2018-11-271-0/+7
| * Open full-screen UI on installWhymarrh Whitby2018-11-271-5/+4
| * Revert "Don't open MetaMask website after install"Whymarrh Whitby2018-11-271-0/+9
|/
* Pin two module versions to avoid flatmap-stream hack (#5839)Dan Finlay2018-11-271-2/+2
* Hide app-header when provider request pending (#5831)Whymarrh Whitby2018-11-272-5/+19
* Autofill gasPrice for retry attempts with either the recommended gasprice or ...Frankie2018-11-272-1/+13
* transactions - ensure err is defined when setting tx failed (#5801)Frankie2018-11-271-4/+6
* Merge pull request #5792 from MetaMask/signed-type-data-error-hw-walletBruno Barbieri2018-11-271-9/+16
|\
| * Use Array.includesBruno Barbieri2018-11-271-4/+4
| * remove extra semicolonbrunobar792018-11-211-1/+1
| * consider hw walletsbrunobar792018-11-211-9/+16
* | Show disabled cursor in .network-disabled state (#5829)Whymarrh Whitby2018-11-271-1/+1
* | Trim whitespace from seed phrase during import (#5827)Whymarrh Whitby2018-11-271-2/+4
* | Merge pull request #5832 from whymarrh/connect-request-notifsWhymarrh Whitby2018-11-272-4/+8
|\ \
| * | Show Connect Requests count in extension badgeWhymarrh Whitby2018-11-261-1/+3
| * | Use initState to avoid type-checking providerRequests in stateWhymarrh Whitby2018-11-261-3/+5
|/ /
* | Merge pull request #5816 from MetaMask/issue-5815Thomas Huang2018-11-2521-44/+44
|\ \
| * | Increase Token Symbol length to twelveThomas Huang2018-11-2321-44/+44
* | | change wording of phishing notice, due to EIP 1102 (#5819)Christopher Elwell2018-11-241-1/+1
|/ /
* | Merge pull request #5810 from whymarrh/bump-nvmrcWhymarrh Whitby2018-11-222-9/+10
|\ \
| * | Update local build instructionsWhymarrh Whitby2018-11-221-8/+9
| * | nvm: Bump Node version to 8.13Whymarrh Whitby2018-11-221-1/+1
* | | Merge pull request #5797 from MetaMask/trezor-v6Bruno Barbieri2018-11-2212-45/+167
|\ \ \ | |/ / |/| |
| * | bump eth-trezor-keyringbrunobar792018-11-222-7288/+7352
| * | update package-lockbrunobar792018-11-211-7313/+7277
| * | trezor v6brunobar792018-11-213-7419/+7441
| * | fix merge conflictsbrunobar792018-11-2172-8609/+8076
| |\ \
| * | | clean upbrunobar792018-11-152-3/+2
| * | | Merge branch 'trezor-v5' of github.com:MetaMask/metamask-extension into trezo...brunobar792018-11-152-8/+19
| |\ \ \
| | * | | testbrunobar792018-11-151-4/+0
| | * | | testbrunobar792018-11-151-1/+1
| | * | | testbrunobar792018-11-151-1/+1
| | * | | try with custom boxbrunobar792018-11-151-1/+1
| | * | | package-lock.jsonbrunobar792018-11-151-20/+41
| * | | | update package-lock.jsonbrunobar792018-11-151-17/+27
| * | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into trezor-v5brunobar792018-11-157-10/+45
| |\ \ \ \ | | |/ / / | |/| | |
| * | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into trezor-v5brunobar792018-11-153-1/+40
| |\ \ \ \
| * \ \ \ \ Merge branch 'develop' into trezor-v5brunobar792018-11-1446-479/+4603
| |\ \ \ \ \
| * \ \ \ \ \ fix merge conflictsbrunobar792018-11-07191-3748/+6145
| |\ \ \ \ \ \
| * \ \ \ \ \ \ fix merge conflictsbrunobar792018-10-21