aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* fix merge conflictsbrunobar792018-10-21104-8896/+12489
|\
| * Merge pull request #5555 from MetaMask/support-wallet-watch-assetkumavis2018-10-212-1/+6
| |\ | | | | | | Support for prefix wallet_watchAsset
| | * add support for wallet_watchAssetEsteban MIno2018-10-202-1/+6
| | |
| * | i18n - use localized names in language selectionBrandon Wissmann2018-10-212-22/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #4250 (#5559) * Added localized names for languages * Capital letter for Čeština * capital letter Русский * i18n - use localized names in language selection * fix build * package-lock.json build fix
| * | Merge pull request #5543 from MetaMask/shapeshift-list-itemThomas Huang2018-10-201-3/+2
| |\ \ | | | | | | | | Update Shapeshift logo url and adjust list item contents
| | * | Update Shapeshift logo url and adjust list item contentsThomas2018-10-181-3/+2
| | | |
| * | | Merge pull request #5561 from MetaMask/deps-fix-gulpThomas Huang2018-10-202-25/+384
| |\ \ \ | | | | | | | | | | deps - fix gulp ref to gulp#v4.0.0
| | * | | deps - fix gulp ref to gulp#v4.0.0kumavis2018-10-202-25/+384
| |/ / /
| * | / specific add and remove methods for frequentRpcList (#5554)Esteban Miño2018-10-203-28/+46
| | |/ | |/|
| * | Set `NODE_ENV` when generating bundler (#4983)William Chong2018-10-191-1/+3
| | |
| * | Merge pull request #5540 from MetaMask/masterkumavis2018-10-182-5/+22
| |\ \ | | |/ | |/| Merge master into develop
| | * Merge pull request #5539 from MetaMask/v4.16.0kumavis2018-10-18115-995/+4688
| | |\ | | | | | | | | Version 4.16.0
| | | * Update CHANGELOG.mdv4.16.0Kevin Serrano2018-10-181-1/+1
| | | |
| | | * Changelog - fix release dateskumavis2018-10-181-2/+2
| | | |
| | | * 4.16.0kumavis2018-10-182-5/+22
| | |/ | |/|
| * | Merge pull request #5537 from MetaMask/inpage-provider-maxlistenerskumavis2018-10-181-0/+2
| |\ \ | | | | | | | | inpage - increase provider max listeners to avoid warnings
| | * | inpage - increase provider max listeners to avoid warningskumavis2018-10-181-0/+2
| |/ /
| * | i18n - add polish (pl)Bartek2018-10-182-0/+1214
| | |
| * | Merge pull request #5127 from MetaMask/account-tracker-network-changekumavis2018-10-181-1/+7
| |\ \ | | | | | | | | Bug Fix: Force AccountTracker to update balances on network change
| | * \ Merge branch 'develop' into account-tracker-network-changekumavis2018-09-28337-4902/+14253
| | |\ \
| | * | | metamask controller - force account tracker to update balances on network changekumavis2018-08-231-0/+4
| | | | |
| * | | | Merge pull request #5536 from whymarrh/add-token-helpWhymarrh Whitby2018-10-189-165/+90
| |\ \ \ \ | | | | | | | | | | | | Add clarifying text to the "Add Token" button
| | * | | | Extract Add Token button into its own componentWhymarrh Whitby2018-10-188-25/+90
| | | | | |
| | * | | | Delete add-token integration testWhymarrh Whitby2018-10-181-140/+0
| | | | | |
| * | | | | Merge pull request #5522 from MetaMask/fetch-debuggingWhymarrh Whitby2018-10-182-0/+37
| |\ \ \ \ \ | | |/ / / / | |/| | | | debugging - enable fetch debugging
| | * | | | enable fetch debuggingkumavis2018-10-152-0/+37
| | | | | |
| * | | | | Adds toggle for primary currency (#5421)Alexander Tseung2018-10-1785-653/+2466
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add UnitInput component * Add CurrencyInput component * Add UserPreferencedCurrencyInput component * Add UserPreferencedCurrencyDisplay component * Add updatePreferences action * Add styles for CurrencyInput, CurrencyDisplay, and UnitInput * Update SettingsTab page with Primary Currency toggle * Refactor currency displays and inputs to use UserPreferenced displays and inputs * Add TokenInput component * Add UserPreferencedTokenInput component * Use TokenInput in the send screen * Fix unit tests * Fix e2e and integration tests * Remove send/CurrencyDisplay component * Replace diamond unicode character with Eth logo. Fix typos
| * | | | | Merge pull request #5534 from whymarrh/i18n-warningsWhymarrh Whitby2018-10-171-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | Lower i18n-helper#getMessage log level from error to warning
| | * | | | | Lower i18n-helper#getMessage log level from error to warningWhymarrh Whitby2018-10-171-1/+1
| | | | | | |
| * | | | | | Merge pull request #5535 from whymarrh/export-privkey-wordsWhymarrh Whitby2018-10-171-2/+2
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | Update wording on export private key modal
| | * | | | | Fix wording of private key warning shown during exportWhymarrh Whitby2018-10-171-1/+1
| | | | | | |
| | * | | | | Update wording on export privkey modalWhymarrh Whitby2018-10-171-1/+1
| |/ / / / /
| | | | | * Merge pull request #5512 from MetaMask/v4.14.0Kevin Serrano2018-10-15429-9291/+21575
| | | | | |\ | | | | | | | | | | | | | | Version 4.14.0
* | | | | | | fix conflictsbrunobar792018-10-17298-12054/+28334
|\| | | | | |
| * | | | | | Merge pull request #5530 from whymarrh/fix-web3-inject-checksWhymarrh Whitby2018-10-171-7/+12
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix document extension check when injecting web3
| | * | | | | | Fix document extension check when injecting web3Whymarrh Whitby2018-10-161-7/+12
| | | | | | | |
| * | | | | | | Merge pull request #5529 from whymarrh/max-btn-click-areaWhymarrh Whitby2018-10-162-19/+24
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Decrease click area for AmountMaxButton on send screen
| | * | | | | | | Decrease click area for AmountMaxButton on send screenWhymarrh Whitby2018-10-162-19/+24
| | |/ / / / / /
| * | | | | | | Merge pull request #5528 from MetaMask/remove-greenkeeper-badgeThomas Huang2018-10-161-1/+1
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | Remove greenkeeper badge from README
| | * | | | | | Remove greenkeeper badge from READMEThomas2018-10-161-1/+1
| | | | | | | |
| * | | | | | | add tooltip for view etherscan tx (#5518)Michael J. Cohen2018-10-161-7/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * add tooltip for view etherscan tx * run lint
| * | | | | | | Merge pull request #5521 from MetaMask/deps-old-ethjs-fixkumavis2018-10-162-92/+70
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | bug fix - bump eth-token-tracker for ethjs-rpc bug in deps
| | * | | | | | | deps - bump eth-token-tracker for ethjs-rpc bug in depskumavis2018-10-152-92/+70
| | | |/ / / / / | | |/| | | | |
| * | | | | | | Improve Korean translations (#5515)Noel Yoo2018-10-161-7/+85
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add more korean translation * Improve korean translation
| * | | | | | Fixed wrong Spanish translation of `key` (#5517)Pedro Gutiérrez2018-10-161-7/+7
| | | | | | |
| * | | | | | Add txReceipt data to transaction details (#5513)Alexander Tseung2018-10-169-6/+126
| | | | | | |
| * | | | | | Update Italian translations (#5502)matteopey2018-10-162-5/+481
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add new english messages * Update translation * Update changelog * Fix casing of MetaMask
| * | | | / deps - bump eth-json-rpc-middleware for pending blockRef bugfixkumavis2018-10-122-17/+31
| | |_|_|/ | |/| | |
| * | | | Merge pull request #5511 from MetaMask/merge-masterkumavis2018-10-122-1/+4
| |\ \ \ \ | | | | | | | | | | | | Merge master into develop (resolves merge conflict)
| | * | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into developkumavis2018-10-122-1/+4
| |/| | | | | | | |_|/ | | |/| |
| | * | | Merge pull request #5384 from MetaMask/Version-4.13.0Dan Finlay2018-10-052-2/+6
| | |\ \ \ | | | | | | | | | | | | Version 4.13.0
| | | * | | Version 4.13.0v4.13.0Dan Finlay2018-09-282-2/+6
| | |/ / /
| * | | | Correct 4.14.0 versionDan Finlay2018-10-122-2/+2
| | | | |
| * | | | Merge pull request #5503 from whymarrh/fix-zendesk-linksWhymarrh Whitby2018-10-124-4/+4
| |\ \ \ \ | | | | | | | | | | | | Update Zendesk links for new subdomain
| | * | | | Update Zendesk links for new subdomainWhymarrh Whitby2018-10-124-4/+4
| | | | | |
| * | | | | Merge pull request #5505 from MetaMask/Version-4.14.0Thomas Huang2018-10-122-1/+4
| |\ \ \ \ \ | | | | | | | | | | | | | | Version 4.14.0
| | * | | | | Version 4.14.0v4.14.0Dan Finlay2018-10-122-1/+4
| | | | | | |
| * | | | | | Fix en, ko locales (#5483)Noel Yoo2018-10-112-49/+49
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fix en typo * Fix ko typo * Remove unnecessary space * Fix ko typo * Improve translation in ko
| * | | | | Merge pull request #5494 from whymarrh/fix-seed-phrase-screenThomas Huang2018-10-111-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | Fix styling of first-time-flow container
| | * | | | | Fix styling of first-time-flow containerWhymarrh Whitby2018-10-111-1/+1
| |/ / / / /
| * | | | | Merge pull request #5491 from whymarrh/assert-new-tx-using-selected-addressWhymarrh Whitby2018-10-112-4/+30
| |\ \ \ \ \ | | | | | | | | | | | | | | Ensure that new transactions added are using the selected address
| | * | | | | Ensure that new transactions added are using the selected addressWhymarrh Whitby2018-10-112-4/+30
| |/ / / / /
| * | | | | Merge pull request #5490 from whymarrh/revert-5375Whymarrh Whitby2018-10-111-23/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | Revert txReceipt merge
| | * | | | | Revert "transactions - add txReceipt to the txMeta body for confirmed txs ↵Whymarrh Whitby2018-10-111-23/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (#5375)" This reverts commit ff67293a8ef61308d602d09f26b163b9b9ec90d3.
| * | | | | test - add actions unit tests (#5369)Thomas Huang2018-10-105-141/+1643
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Actions.spec.js * Error handling tests * Lint
| * | | | | Merge pull request #5480 from noelyoo/typokumavis2018-10-102-236/+236
| |\ \ \ \ \ | | | | | | | | | | | | | | Alphabetize locales keys
| | * | | | | Alphabetize ko locale json keysnoelyoo2018-10-101-224/+224
| | | | | | |
| | * | | | | Alphabetize en locale json keysnoelyoo2018-10-101-12/+12
| | | | | | |
| * | | | | | transactions - add txReceipt to the txMeta body for confirmed txs (#5375)Frankie2018-10-101-1/+23
| | | | | | |
| * | | | | | CI - Allow sourcemap uploads to sentry for empty version (#5403)Bruno Barbieri2018-10-101-13/+25
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Allow sourcemap uploads to sentry for empty version * Fix comments * fix console log msgs * fix console log msgs * clean up * fix linter errors
| * | | | | Make all addresses EIP-55 compliant (#5379)bakaoh2018-10-104-9/+15
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | * Make all addresses EIP-55 compliant * Checksum autocompleted address but not during input
| * | | | Fix formatting of locale files (#5479)Noel Yoo2018-10-1015-956/+956
| | | | |
| * | | | tests - integration - Add Drizzle tests (#5467)Bruno Barbieri2018-10-108-4/+330
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * added drizzle app for testing * working * clean up * clean up script * make build step required * add drizzle-tests to .eslintignore * clean up drizzle run script * lint * use truffle unbox * undo eslintignore changes * revert change * dont use global * dont need this steps * use the new account flow * restore package-lock.json
| * | | | i18n - fr - improvementsVincent2018-10-101-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * french locales: fix typos and improve wording * french locales: more fixes and rewording * fixed typo * fixed typo * added missing translations * fixed alphabetical order * fixed alphabetical order * added missing translations for FR * fixed verify-locale-strings.js * fixed indentation * fixed indentation * updated french locale * updated changelog with changes logs * a few fixes after receiving comments, mostly Caps removing and adding * translated 2 missing french locale words and also remove a caps * Update messages.json * Update messages.json
| * | | | Fixed lint errorsSantiago Gonzalez Toral2018-10-101-11/+11
| | | | |
| * | | | Added account options on home screenSantiago Gonzalez Toral2018-10-1010-4/+208
| | | | |
| * | | | Merge pull request #5465 from alextsg/fix-valuesAlexander Tseung2018-10-102-3/+8
| |\ \ \ \ | | | | | | | | | | | | Fix token values being undefined
| | * | | | Fix token values being undefinedAlexander Tseung2018-10-092-3/+8
| | | | | |
| * | | | | update package-lock.jsonbrunobar792018-10-101-28/+24
| | | | | |
| * | | | | bump eth-json-rpc-middlewarebrunobar792018-10-101-1/+1
| | | | | |
| * | | | | Fix Korean typos (#5472)Noel Yoo2018-10-101-7/+7
| | | | | |
| * | | | | Merge pull request #5458 from MetaMask/provider-subsBruno Barbieri2018-10-107-100/+239
| |\ \ \ \ \ | | | | | | | | | | | | | | Feature: Subscription support
| | * | | | | workaround - fix for drizzlekumavis2018-10-091-2/+11
| | | | | | |
| | * | | | | deps - bump inpage-provider for drizzle workaroundkumavis2018-10-092-4/+4
| | | | | | |
| | * | | | | deps - bump metamask-inpage-provider for bug fixkumavis2018-10-092-101/+4
| | | | | | |
| | * | | | | provider - network - restore block-ref-rewrite middleware referenceskumavis2018-10-094-8/+8
| | | | | | |
| | * | | | | provider - enable subscription support (newHeads, logs)kumavis2018-10-084-92/+303
| | | | | | |
| | * | | | | deps - bump eth-block-tracker for safe-event-emitterkumavis2018-10-042-9/+25
| | | | | | |
| * | | | | | 100% French locale, reordering of English locale, fixes #5457 (#5470)Vincent2018-10-094-126/+805
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * french locales: fix typos and improve wording * french locales: more fixes and rewording * fixed typo * fixed typo * added missing translations * fixed alphabetical order * fixed alphabetical order * added missing translations for FR * fixed verify-locale-strings.js * fixed indentation * fixed indentation * updated french locale * updated changelog with changes logs * a few fixes after receiving comments, mostly Caps removing and adding
| * | | | | | Refactor buffer constructor (#5468)Noel Yoo2018-10-094-4/+4
| | | | | | |
| * | | | | | Fix typos (#5471)Noel Yoo2018-10-094-5/+5
| | |/ / / / | |/| | | |
| * | | | | Merge pull request #5461 from eduadiez/developThomas Huang2018-10-091-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | Added webRequest.RequestFilter to filter main_frame .eth requests
| | * | | | | Added webRequest.RequestFilter to filter main_frame .eth requestsEduardo Antuña Díez2018-10-091-1/+1
| |/ / / / /
| * | | | | Merge pull request #5442 from whymarrh/fix-page-container-footerWhymarrh Whitby2018-10-063-64/+64
| |\ \ \ \ \ | | | | | | | | | | | | | | Fix markup for inline instances of PageContainers
| | * | | | | Fix markup for inline instances of `PageContainer`sWhymarrh Whitby2018-10-063-64/+64
| | | | | | |
| * | | | | | Merge pull request #5440 from alextsg/fix-translateAlexander Tseung2018-10-064-2/+14
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | Fix action translations edge cases
| | * | | | | Fix action translations edge casesAlexander Tseung2018-10-064-2/+14
| |/ / / / /
| * | | | | Merge pull request #5428 from alextsg/i5372-queue-orderDan Finlay2018-10-062-3/+3
| |\ \ \ \ \ | | | | | | | | | | | | | | Reverse pending transactions order
| | * | | | | Reverse pending transactions orderAlexander Tseung2018-10-052-3/+3
| | | | | | |
| * | | | | | Merge pull request #5438 from MetaMask/update-balance-on-unlockDan Finlay2018-10-061-0/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Update all balances on password unlock
| | * \ \ \ \ \ Merge branch 'develop' into update-balance-on-unlockDan Finlay2018-10-063-0/+4
| | |\ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Remove package-lock changesDan Finlay2018-10-061-163/+154
| | | | | | | |
| * | | | | | | Fix updating of pending transactionsDan Finlay2018-10-064-154/+167
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Transaction statuses were not being properly updated when: - MetaMask was unlocked - The network was changed This PR fixes both of those. Fixes #5174
| | * | | | | | Update all balances on password unlockDan Finlay2018-10-061-0/+1
| |/ / / / / /
| * | | | | | Merge pull request #5432 from alextsg/i5362-fix-translateDan Finlay2018-10-067-20/+111
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Translate method names in the transaction list only when applicable
| | * | | | | | Translate method names in the transaction list only when applicableAlexander Tseung2018-10-057-20/+111
| | |/ / / / /
| * | | | | | Merge pull request #5427 from alextsg/i5371-update-cancel-copyAlexander Tseung2018-10-051-1/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Update "cancel" copy
| | * | | | | | Update "cancel" copyAlexander Tseung2018-10-051-1/+1
| | |/ / / / /
| * / / / / / Increase suggested gas percentile to 65 (#5359)Dan Finlay2018-10-052-2/+2
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Increase suggested gas percentile to 65 I keep submitting transactions then waiting a long time. Apparently 50th percentile isn't enough. * Update test for getGasPrice
| * | | | | Merge pull request #5412 from whymarrh/after-install-stepsWhymarrh Whitby2018-10-041-9/+0
| |\ \ \ \ \ | | | | | | | | | | | | | | Don't open MetaMask website after install
| | * | | | | Don't open metamask.io after install anymoreWhymarrh Whitby2018-10-021-9/+0
| | | | | | |
| * | | | | | Merge pull request #5419 from whymarrh/remove-copy-contract-addressWhymarrh Whitby2018-10-045-23/+2
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | Remove "Copy Contract Address" from token options
| | * | | | | Remove "Copy Contract Address" from token optionsWhymarrh Whitby2018-10-045-23/+2
| | | | | | |
| * | | | | | fix typos (#5418)satboy782018-10-041-1/+1
| |/ / / / /
| * | | | | Merge pull request #5406 from whymarrh/bypass-phishing-warningDan Finlay2018-10-026-4/+116
| |\ \ \ \ \ | | |/ / / / | |/| | | | Allow users to bypass phishing warning
| | * | | | Style links on phishing page with an underlineWhymarrh Whitby2018-10-021-0/+1
| | | | | |
| | * | | | Style links on phishing page with cursor: pointer;Whymarrh Whitby2018-10-021-0/+1
| | | | | |
| | * | | | Hook MetaMaskController up with phishing detection pageWhymarrh Whitby2018-10-022-2/+60
| | | | | |
| | * | | | Add domain whitelist method to MetaMaskControllerWhymarrh Whitby2018-10-021-0/+11
| | | | | |
| | * | | | Add ability to whitelist a blacklisted domain at runtimeWhymarrh Whitby2018-10-022-0/+37
| | | | | |
| | * | | | Update title and copy of phishing warning pageWhymarrh Whitby2018-10-021-2/+6
| |/ / / /
| * | | | Merge pull request #5409 from MetaMask/provider-fix-url-authThomas Huang2018-10-022-189/+167
| |\ \ \ \ | | | | | | | | | | | | bugfix - bump provider for url auth support
| | * | | | bugfix - bump provider for url auth supportkumavis2018-10-022-189/+167
| |/ / / /
| * | | | Merge pull request #5329 from whymarrh/confirm-featuresWhymarrh Whitby2018-10-0213-25/+260
| |\ \ \ \ | | | | | | | | | | | | Add batch reject to confirm screen
| | * | | | Only use current network txs when calculating "Reject All"Whymarrh Whitby2018-10-021-1/+6
| | | | | |
| | * | | | Switch page-container__footer-* for header and footer tagsWhymarrh Whitby2018-10-023-27/+27
| | | | | |
| | * | | | Reword batch reject confirm as "Reject All"Whymarrh Whitby2018-10-022-1/+4
| | | | | |
| | * | | | Confirm rejecting multiple transactions with modalWhymarrh Whitby2018-10-028-4/+103
| | | | | |
| | * | | | s/Cancel/Reject/ on confirm screen for clarityWhymarrh Whitby2018-10-022-1/+8
| | | | | |
| | * | | | Add "Cancel All" button to confirm footerWhymarrh Whitby2018-10-025-4/+82
| | | | | |
| | * | | | Have PageContainerFooter take children nodeWhymarrh Whitby2018-10-023-21/+64
| | | | | |
| * | | | | Merge pull request #5380 from whymarrh/send-with-hex-dataWhymarrh Whitby2018-10-0215-29/+87
| |\ \ \ \ \ | | | | | | | | | | | | | | Allow sending transactions with hex data and no recipient
| | * | | | | Recipient not required on send screen when hex data presentWhymarrh Whitby2018-10-015-4/+17
| | | | | | |
| | * | | | | Rework estimateGas logicWhymarrh Whitby2018-10-011-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The tests still pass!
| | * | | | | Update gas when hex data changes on send screenWhymarrh Whitby2018-10-019-14/+56
| | | | | | |
| | * | | | | Update send.utils.test to with better mocksWhymarrh Whitby2018-10-011-5/+8
| | | | | | |
| | * | | | | Allow sending transactions with hex data and no recipientWhymarrh Whitby2018-10-011-2/+2
| | |/ / / /
| * | | | | Merge pull request #5400 from whymarrh/dot-only-hunterWhymarrh Whitby2018-10-022-8/+1
| |\ \ \ \ \ | | |/ / / / | |/| | | | Remove dot-only-hunter package
| | * | | | npm uninstall dot-only-hunterWhymarrh Whitby2018-10-012-7/+0
| | | | | |
| | * | | | Remove dot-only-hunter from test:unit scriptWhymarrh Whitby2018-10-011-1/+1
| |/ / / /
| * | | | Merge pull request #5402 from whymarrh/fix-e2e-testsWhymarrh Whitby2018-10-012-17/+4
| |\ \ \ \ | | | | | | | | | | | | Fix e2e tests for adding custom RPC endpoints
| | * | | | Fix error message shown in assertElementNotPresent e2e helper fnWhymarrh Whitby2018-10-011-3/+1
| | | | | |
| | * | | | Don't log errors extraneously in e2e testsWhymarrh Whitby2018-10-011-1/+0
| | | | | |
| | * | | | Update e2e tests for adding mutliple custom RPC endpointsWhymarrh Whitby2018-10-011-12/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refs 56965b3 Refs #5267 The list of custom RPC endpoints is no longer limited to 3 entries so the test is now to confirm that they _all_ show up.
| | * | | | Switch string concatenation to template stringWhymarrh Whitby2018-10-011-1/+1
| |/ / / /
| * | | | Improvement: Reposition customize gas error (#5265)Sean2018-10-011-2/+4
| | | | |
| * | | | Merge pull request #5325 from sam-aldis/patch-1Dan Finlay2018-10-011-1/+1
| |\ \ \ \ | | | | | | | | | | | | Debounce was breaking in update
| | * | | | Debounce was breaking in updateUKJP Design2018-09-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | As found in issue here: https://github.com/MetaMask/metamask-extension/issues/5064 Pinned the version at 1.1.0 until the new version with breaking changes can be intergrated.
| * | | | | support editable customRPC (#5267)HackyMiner2018-09-296-7/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * support editable customRPC #5246 * remove rpcList size restriction
| * | | | | Merge pull request #5271 from farahbrunache/developkumavis2018-09-282-0/+1241
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | Added Haitian Creole translations
| | * | | | i18n - ht - fix json formattingkumavis2018-09-281-4/+1
| | | | | |
| | * | | | i18n - index - fix whitespacekumavis2018-09-281-21/+21
| | | | | |
| | * | | | fixed quotes in line 749Farah Brunache2018-09-211-1/+1
| | | | | |
| | * | | | fixed some grammatical errorsFarah Brunache2018-09-171-15/+13
| | | | | |
| | * | | | added Haitian Creole translationsFarah Brunache2018-09-162-20/+1266
| | | | | |
| * | | | | Merge pull request #5383 from MetaMask/Version-4.12.0Dan Finlay2018-09-283-15/+64
| |\ \ \ \ \ | | | | | | | | | | | | | | Version 4.12.0
| | * | | | | Correct changelog datev4.12.0Dan Finlay2018-09-281-1/+1
| | | | | | |
| | * | | | | Fix package lockDan Finlay2018-09-281-24/+36
| | | | | | |
| | * | | | | Version 4.12.0Dan Finlay2018-09-282-2/+6
| | | | | | |
| | * | | | | Merge remote-tracking branch 'origin/master' into Version-4.12.0Dan Finlay2018-09-283-5/+38
| |/| | | | | | | | |_|/ / | | |/| | |
| | * | | | Merge pull request #5349 from MetaMask/v4.11.1Kevin Serrano2018-09-262-6505/+6523
| | |\ \ \ \ | | | | | | | | | | | | | | Version 4.11.1
| | | * | | | remove comment about etherdeltabobby dresser2018-09-261-1/+0
| | | | | | |
| | | * | | | Version 4.11.1Dan Finlay2018-09-262-6505/+6524
| | |/ / / /
| | * | | | Merge pull request #5346 from MetaMask/v4.11.1Dan Finlay2018-09-2619-6626/+6956
| | |\ \ \ \ | | | | | | | | | | | | | | v4.11.1
| | | * | | | update package-lock.jsonbrunobar792018-09-261-6450/+6442
| | | | | | |
| | | * | | | Merge branch 'master' into v4.11.1Bruno Barbieri2018-09-252-1/+5
| | | |\ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Merge pull request #5313 from MetaMask/Version-4.11.0v4.11.0Thomas Huang2018-09-252-2/+6
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | Version 4.11.0
| | | * | | | | Version 4.11.0Dan Finlay2018-09-222-2/+6
| | | | | | | |
| | * | | | | | Merge pull request #5079 from MetaMask/v4.9.3kumavis2018-08-1753-76/+774
| | |\| | | | | | | | | | | | | | | | | | | | | Version 4.9.3
| | | | * | | | bump to v4.11.1brunobar792018-09-251-1/+1
| | | | | | | |
| | | | * | | | Merge pull request #5084 from MetaMask/ledger-support-without-providerDan Finlay2018-08-2118-194/+532
| | | |/| | | | | | | | | | | | | | | | | | | | Ledger support (in case of rollback)
| * | | | | | | Update extension badge with correct signTypedData countWhymarrh Whitby2018-09-271-0/+1
| | | | | | | |
| * | | | | | | fix tld bug (#5250)Phyrex Tsai2018-09-271-0/+2
| | | | | | | |
| * | | | | | | Merge pull request #5053 from hahnmichaelf/esdb-supportThomas Huang2018-09-274-3/+10
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Link to ESDB in local phishing.html
| | * | | | | | | additional lint-test fixhahnmichaelf2018-08-141-1/+1
| | | | | | | | |
| | * | | | | | | fix for lint-testhahnmichaelf2018-08-143-4/+4
| | | | | | | | |
| | * | | | | | | fixed nameshahnmichaelf2018-08-142-2/+2
| | | | | | | | |
| | * | | | | | | Re-added GA scripthahnmichaelf2018-08-142-1/+20
| | | | | | | | |
| | * | | | | | | change namehahnmichaelf2018-08-142-1/+1
| | | | | | | | |
| | * | | | | | | base - working. fixes #4774hahnmichaelf2018-08-134-21/+9
| | | | | | | | |
| * | | | | | | | Close transaction details modal when clicking speed upAlexander Tseung2018-09-272-4/+10
| | | | | | | | |
| * | | | | | | | Merge pull request #5367 from dasilvarosa/patch-1Whymarrh Whitby2018-09-271-1/+33
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Update ledger-logo.svg
| | * | | | | | | | Update ledger-logo.svgDavid da Silva Rosa2018-09-261-1/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Noticed the implementation used the old Ledger logo. Simply replaced the .svg without testing, so hope someone can test the extension before merging 😄 .
| * | | | | | | | | bugfix: bump version of inpage providerbitpshr2018-09-272-27/+5
| | | | | | | | | |
| * | | | | | | | | EIP-1102: Add deprecation message (#5353)Paul Bouchon2018-09-262-6/+6
| | | | | | | | | |
| * | | | | | | | | Merge pull request #5368 from MetaMask/bugfix-sign-typed-datakumavis2018-09-262-178/+164
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | bugfix: update eth_signTypedData_v3 parameter order
| | * | | | | | | | bugfix: update eth_signTypedData_v3 parameter orderbitpshr2018-09-262-178/+164
| |/ / / / / / / /
| * | | | | | | | deps - eth-block-tracker@4.0.2 for safe-eventemitter (#5363)kumavis2018-09-262-44/+17
| | | | | | | | |
| * | | | | | | | Merge pull request #5332 from MetaMask/ui-unit-testsThomas Huang2018-09-2618-24/+2123
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Some Ui tests
| | * | | | | | | | Some Ui teststmashuang2018-09-2518-24/+2123
| | | | | | | | | |
| * | | | | | | | | Bugfix: Upgrade json-rpc-engine (#5348)Paul Bouchon2018-09-263-31/+246
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Bugfix: bump version of json-rpc-engine * Increase delay * Update lockfile * deps - json-rpc-engine@3.7.4
| * | | | | | | | | Merge pull request #5361 from MetaMask/firefox-fixeskumavis2018-09-264-61/+2681
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Mozilla addon linter + Firefox builds passing
| | * | | | | | | | | add mozilla lint jobbrunobar792018-09-263-29/+27
| | | | | | | | | | |
| | * | | | | | | | | remove css sourcemaps in prod buildsbrunobar792018-09-261-1/+9
| | | | | | | | | | |
| | * | | | | | | | | Add build step to mozilla-lintDan Finlay2018-09-261-3/+3
| | | | | | | | | | |
| | * | | | | | | | | Add mozilla linter to dist script instead of main testDan Finlay2018-09-261-2/+2
| | | | | | | | | | |
| | * | | | | | | | | Add mozilla addon linter to test suiteDan Finlay2018-09-262-58/+2672
| |/ / / / / / / / /
| * | | | | | | | | Merge pull request #5351 from MetaMask/fix-gh-pages-jobBruno Barbieri2018-09-261-2/+2
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Fix gh-pages job
| | * | | | | | | | | Fix gh-pages jobBruno Barbieri2018-09-261-2/+2
| | | | | | | | | | |
| * | | | | | | | | | Fix MetaMask web3 version (#5352)Esteban Miño2018-09-261-0/+1
| |/ / / / / / / / /
| * | | | | | | | | Merge pull request #5340 from whymarrh/fix-first-time-flow-2Whymarrh Whitby2018-09-251-1/+6
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Fix height of first-time-flow container, again
| | * | | | | | | | | Fix height of first-time-flow container, again but differentWhymarrh Whitby2018-09-251-1/+6
| |/ / / / / / / / /
| * | | | | | | | | Merge pull request #5337 from whymarrh/eslint-ignore-coverageWhymarrh Whitby2018-09-251-0/+1
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Add test coverage dir to eslintignore
| | * | | | | | | | | eslintignore: Add test coverage dir to eslintignoreWhymarrh Whitby2018-09-251-0/+1
| |/ / / / / / / / /
| * | | | | | | | | Merge pull request #5282 from MetaMask/tx-cancel-uiAlexander Tseung2018-09-2569-372/+1218
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Add Cancel Transaction feature. Refactor modals. Add Transaction Details modal.
| | * | | | | | | | | Fix multiplyCurrencies. Add onClose prop for Modal component. Remove ↵Alexander Tseung2018-09-2110-58/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | hideModal from modal components.
| | * | | | | | | | | Add unit testsAlexander Tseung2018-09-209-15/+342
| | | | | | | | | | |
| | * | | | | | | | | Fix integration testsAlexander Tseung2018-09-201-1/+1
| | | | | | | | | | |
| | * | | | | | | | | Fix unit testsAlexander Tseung2018-09-201-5/+4
| | | | | | | | | | |
| | * | | | | | | | | Add transition effect to TransactionListItemDetails expanderAlexander Tseung2018-09-202-13/+29
| | | | | | | | | | |
| | * | | | | | | | | Add TransactionDetails modalAlexander Tseung2018-09-2010-9/+125
| | | | | | | | | | |
| | * | | | | | | | | Switch existing modals from using Notification to Modal. Remove Notification ↵Alexander Tseung2018-09-2038-323/+518
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | component. Add CancelTransaction modal
| | * | | | | | | | | Add withModalProps HOCAlexander Tseung2018-09-202-0/+22
| | | | | | | | | | |
| | * | | | | | | | | Fix Transaction view stylesAlexander Tseung2018-09-203-3/+9
| | | | | | | | | | |
| | * | | | | | | | | Add Modal componentAlexander Tseung2018-09-207-0/+186
| | | | | | | | | | |
| | * | | | | | | | | Refactor ConfirmPageContainerError to ErrorMessageAlexander Tseung2018-09-208-18/+14
| | | | | | | | | | |
| * | | | | | | | | | Merge pull request #5328 from whymarrh/fix-first-time-flowWhymarrh Whitby2018-09-251-0/+1
| |\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | | Fix height of first-time-flow container
| | * | | | | | | | | Fix height of first-time-flow containerWhymarrh Whitby2018-09-241-0/+1
| | | |_|_|_|_|_|/ / | | |/| | | | | | |
| * | | | | | | | | Merge pull request #5310 from MetaMask/getPendingNonce-hotfixThomas Huang2018-09-242-1/+15
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | Adds getPendingNonce method to provider initialization in metamask-controller.
| | * | | | | | | | Adds getPendingNonce method to provider initialization options in ↵Dan Miller2018-09-222-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | metamask-controller.
| * | | | | | | | | Merge pull request #5241 from MetaMask/refactor-settingsAlexander Tseung2018-09-2118-810/+814
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | Refactor settings page to use JSX and follow component file folder st…
| | * | | | | | | | Fix translation casingAlexander Tseung2018-09-212-6/+2
| | | | | | | | | |
| | * | | | | | | | Add Current Conversion Updated string to translationsAlexander Tseung2018-09-202-1/+4
| | | | | | | | | |
| | * | | | | | | | Refactor settings page to use JSX and follow component file folder structureAlexander Tseung2018-09-2018-810/+815
| | |/ / / / / / /
| * | | | | | | | Remove EAL google analytics link. (#5081)Dan Finlay2018-09-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Harry said he's not using this for Ether-Address-Lookup anymore, so removing it.
| * | | | | | | | Update messages.json (#5280)Kevin Serrano2018-09-201-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | Added some translations for Chinese Traditional via Chainsights!
| * | | | | | | | Merge pull request #5298 from whymarrh/fix-tx-spinnerWhymarrh Whitby2018-09-205-24/+23
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | Fix loading screen height
| | * | | | | | | Move main-container wrapper div into its own classWhymarrh Whitby2018-09-204-2/+13
| | | | | | | | |
| | * | | | | | | Prevent loading screen from overlaying the app barWhymarrh Whitby2018-09-203-7/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refs #4417 This change is functional copy of 3893469 that solves the problem in a way that doesn't depend on the height of the app bar since the app bar isn't a fixed height in the smaller views.
| | * | | | | | | Make the LoadingScreen component 100% as tall as its containerWhymarrh Whitby2018-09-201-10/+1
| | | | | | | | |
| | * | | | | | | Remove unused loading-overlay--full-screen CSS stylesWhymarrh Whitby2018-09-201-7/+0
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Refs #4417
| * | | | | | | Merge pull request #5290 from MetaMask/i5289-gettokendataDan Finlay2018-09-192-2/+24
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix exception thrown on getTokenData
| | * | | | | | | Fix exception thrown on getTokenDataAlexander Tseung2018-09-192-2/+24
| |/ / / / / / /
| * | | | | | | Merge pull request #5268 from lastblocklabs/issue-5231v4.10.0Dan Finlay2018-09-181-3/+5
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Improvement: Allow enter to submit password form
| | * | | | | | | Improvement: Allow enter to submit password formSean Rabaut2018-09-151-3/+5
| | | | | | | | |
| * | | | | | | | Merge pull request #5281 from MetaMask/4.10.0Dan Finlay2018-09-182-2/+11
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Version 4.10.0
| | * | | | | | | | Version 4.10.0tmashuang2018-09-181-1/+1
| | | | | | | | | |
| | * | | | | | | | Bump Changelogtmashuang2018-09-181-1/+10
| |/ / / / / / / /
| * | | | | | | | Merge pull request #4803 from MetaMask/eip-712Dan Finlay2018-09-1810-179/+582
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | | EIP-712: Sign typed data
| | * | | | | | | Merge branch 'develop' into eip-712Paul Bouchon2018-09-189-18/+74
| | |\ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | compute and display checksummed hash in selected-account component (#5255)Chad Grimaldi2018-09-162-3/+20
| | | | | | | | |
| * | | | | | | | Improvement: Increase click area for arrows (#5264)Sean2018-09-162-6/+18
| | | | | | | | |
| * | | | | | | | Merge pull request #5270 from MetaMask/fix-retryAlexander Tseung2018-09-162-5/+12
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix speed up functionality
| | * | | | | | | | Fix speed up functionalityAlexander Tseung2018-09-152-5/+12
| |/ / / / / / / /
| * | / / / / / / EIP-1102: Transitionary API (#5256)Paul Bouchon2018-09-152-0/+20
| | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge pull request #5261 from lastblocklabs/style-fix-5242Whymarrh Whitby2018-09-151-3/+3
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | lower input z-index to prevent overlap - follow up style fix to #5242
| | * | | | | | | follow up style fix to #5242chadmg2018-09-141-3/+3
| | | | | | | | |
| * | | | | | | | Merge pull request #5262 from lastblocklabs/issue-5183-jsonimportAlexander Tseung2018-09-141-1/+1
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | Bug Fix: #5183 history not defined
| | * | | | | | | Bug Fix: #5183 history not definedSean Rabaut2018-09-141-1/+1
| |/ / / / / / /
| | * | | | | | Update new method namespace from v2 to v3bitpshr2018-09-144-9/+9
| | | | | | | |