aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | 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
|\ \ \ \ \
| * | | | | 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
* | | | | | 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 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 `PageContainer`sWhymarrh Whitby2018-10-063-64/+64
* | | | | | Merge pull request #5440 from alextsg/fix-translateAlexander Tseung2018-10-064-2/+14
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | 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 orderAlexander Tseung2018-10-052-3/+3
* | | | | | Merge pull request #5438 from MetaMask/update-balance-on-unlockDan Finlay2018-10-061-0/+1
|\ \ \ \ \ \
| * \ \ \ \ \ 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
| * | | | | | 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 applicableAlexander Tseung2018-10-057-20/+111
| |/ / / / /
* | | | | | Merge pull request #5427 from alextsg/i5371-update-cancel-copyAlexander Tseung2018-10-051-1/+1
|\ \ \ \ \ \
| * | | | | | Update "cancel" copyAlexander Tseung2018-10-051-1/+1
| |/ / / / /
* / / / / / Increase suggested gas percentile to 65 (#5359)Dan Finlay2018-10-052-2/+2
|/ / / / /
* | | | | Merge pull request #5412 from whymarrh/after-install-stepsWhymarrh Whitby2018-10-041-9/+0
|\ \ \ \ \
| * | | | | 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 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
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | 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 supportkumavis2018-10-022-189/+167
|/ / / /
* | | | Merge pull request #5329 from whymarrh/confirm-featuresWhymarrh Whitby2018-10-0213-25/+260
|\ \ \ \
| * | | | 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
|\ \ \ \ \
| * | | | | Recipient not required on send screen when hex data presentWhymarrh Whitby2018-10-015-4/+17
| * | | | | Rework estimateGas logicWhymarrh Whitby2018-10-011-10/+10
| * | | | | 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
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | 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 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
| * | | | 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 updateUKJP Design2018-09-231-1/+1
* | | | | support editable customRPC (#5267)HackyMiner2018-09-296-7/+49
* | | | | Merge pull request #5271 from farahbrunache/developkumavis2018-09-282-0/+1241
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | 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
|\ \ \ \ \
| * | | | | 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
| |\ \ \ \
| | * | | | 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
| |\ \ \ \
| | * | | | 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.0Dan Finlay2018-09-222-2/+6
| * | | | | | Merge pull request #5079 from MetaMask/v4.9.3kumavis2018-08-1753-76/+774
| |\| | | | |
| | | * | | | bump to v4.11.1brunobar792018-09-251-1/+1
| | | * | | | Merge pull request #5084 from MetaMask/ledger-support-without-providerDan Finlay2018-08-2118-194/+532
| | |/| | | |
* | | | | | | 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
|\ \ \ \ \ \ \
| * | | | | | | 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.svgDavid da Silva Rosa2018-09-261-1/+33
* | | | | | | | | 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 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 teststmashuang2018-09-2518-24/+2123
* | | | | | | | | Bugfix: Upgrade json-rpc-engine (#5348)Paul Bouchon2018-09-263-31/+246
* | | | | | | | | Merge pull request #5361 from MetaMask/firefox-fixeskumavis2018-09-264-61/+2681
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | 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 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 but differentWhymarrh Whitby2018-09-251-1/+6
|/ / / / / / / / /
* | | | | | | | | Merge pull request #5337 from whymarrh/eslint-ignore-coverageWhymarrh Whitby2018-09-251-0/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | 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
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix multiplyCurrencies. Add onClose prop for Modal component. Remove hideModa...Alexander Tseung2018-09-2110-58/+41
| * | | | | | | | | 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
| * | | | | | | | | 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 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 options in metamask-co...Dan Miller2018-09-222-1/+15
* | | | | | | | | Merge pull request #5241 from MetaMask/refactor-settingsAlexander Tseung2018-09-2118-810/+814
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | 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
* | | | | | | | Update messages.json (#5280)Kevin Serrano2018-09-201-0/+9
* | | | | | | | Merge pull request #5298 from whymarrh/fix-tx-spinnerWhymarrh Whitby2018-09-205-24/+23
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | 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
| * | | | | | | 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
|/ / / / / / /
* | | | | | | Merge pull request #5290 from MetaMask/i5289-gettokendataDan Finlay2018-09-192-2/+24
|\ \ \ \ \ \ \
| * | | | | | | 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 formSean Rabaut2018-09-151-3/+5
* | | | | | | | Merge pull request #5281 from MetaMask/4.10.0Dan Finlay2018-09-182-2/+11
|\ \ \ \ \ \ \ \
| * | | | | | | | 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
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | 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 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
|\ \ \ \ \ \ \
| * | | | | | | 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 definedSean Rabaut2018-09-141-1/+1
|/ / / / / / /
| * | | | | | Update new method namespace from v2 to v3bitpshr2018-09-144-9/+9
| * | | | | | Update error message for chainId mis-matchbitpshr2018-09-141-1/+1
| * | | | | | Implement latest EIP-712 protocolbitpshr2018-09-1410-179/+582
|/ / / / / /
* | | | | | Merge pull request #5247 from MetaMask/AddDocsDan Finlay2018-09-143-46/+60
|\ \ \ \ \ \
| * | | | | | Add jsdoc gh-pages scriptDan Finlay2018-09-133-46/+60
* | | | | | | Merge pull request #5182 from MetaMask/tx-activityAlexander Tseung2018-09-1369-328/+1449
|\ \ \ \ \ \ \
| * | | | | | | Fix identicon address. Fix styling of New Contract recipient. Fix Activity Lo...Alexander Tseung2018-09-139-18/+47
| * | | | | | | Fix tests. Add className to Identicon ethLogos.Alexander Tseung2018-09-135-10/+13
| * | | | | | | Add WEI to getEthConversionFromWeiHexAlexander Tseung2018-09-131-1/+1
| * | | | | | | Add transaction details to TransactionListItem componentAlexander Tseung2018-09-133-37/+46
| * | | | | | | Add TransactionListItemDetails componentAlexander Tseung2018-09-136-0/+203
| * | | | | | | Add TransactionBreakdown componentAlexander Tseung2018-09-139-0/+240
| * | | | | | | Add tests for TransactionActivityLog. Make changes to rendering eventsAlexander Tseung2018-09-1310-42/+349
| * | | | | | | Edit styling of cards variant of SenderToRecipient componentAlexander Tseung2018-09-131-1/+1
| * | | | | | | Add HexToDecimal componentAlexander Tseung2018-09-134-161/+48
| * | | | | | | Add tests for Card componentAlexander Tseung2018-09-132-1/+26
| * | | | | | | Allow denominations in CurrencyDisplay componentAlexander Tseung2018-09-136-16/+85
| * | | | | | | Allow more than 2 variable substitutions in the translation functionAlexander Tseung2018-09-131-4/+4
| * | | | | | | Add raised type buttons to Button component. Refactor all buttons within app ...Alexander Tseung2018-09-1318-94/+180
| * | | | | | | Add ActivityLog componentAlexander Tseung2018-09-1310-1/+264
| |/ / / / / /
* / / / / / / increase z-index of send-to input to allow for right-click (#5242)Chad Grimaldi2018-09-131-0/+4
|/ / / / / /
* | | | | | Merge pull request #5240 from MetaMask/i5238-account-balance-updateDan Finlay2018-09-121-0/+3
|\ \ \ \ \ \
| * | | | | | Ensure account-tracker currentBlockNumber is set on first block update.Dan Miller2018-09-111-0/+3
* | | | | | | Merge pull request #5237 from whymarrh/update-fxDan Finlay2018-09-121-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Update Firefox version for e2e testsWhymarrh Whitby2018-09-121-1/+1
| |/ / / / / /
* | | | | | | Merge pull request #5236 from whymarrh/excise-config-managerDan Finlay2018-09-1213-490/+76
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Default NoticeController ctor opts to empty objWhymarrh Whitby2018-09-122-2/+2
| * | | | | | Add html reporter to test coverage outputWhymarrh Whitby2018-09-122-1/+2
| * | | | | | Delete ConfigManager, replacing its usages with PreferencesControllerWhymarrh Whitby2018-09-1210-488/+73
|/ / / / / /
* | | | | | Merge pull request #5216 from MetaMask/tx-cancelFrankie2018-09-114-2/+98
|\ \ \ \ \ \
| * | | | | | Add createCancelTransaction methodAlexander Tseung2018-09-114-2/+98
* | | | | | | Merge pull request #5223 from whymarrh/tx-error-tooltipsFrankie2018-09-116-31/+78
|\ \ \ \ \ \ \
| * | | | | | | Show failed tx txMeta.err in tooltipsWhymarrh Whitby2018-09-091-1/+1
| * | | | | | | Show failed tx RPC error messages in tooltipsWhymarrh Whitby2018-09-092-2/+15
| * | | | | | | Don't render tooltips without titlesWhymarrh Whitby2018-09-091-0/+8
| * | | | | | | Rewrite Tooltip component as ES6Whymarrh Whitby2018-09-093-30/+55
| * | | | | | | Attach the RPC error value to txMetaWhymarrh Whitby2018-09-091-0/+1
| |/ / / / / /
* | | | | | | Merge pull request #5229 from whymarrh/fix-confirm-seed-wordsDan Finlay2018-09-111-2/+8
|\ \ \ \ \ \ \
| * | | | | | | Clear old seed words when importing new seed wordsWhymarrh Whitby2018-09-111-2/+8
| |/ / / / / /
* | | | | | | Merge pull request #5228 from ConnorChristie/memory-leaksDan Finlay2018-09-113-8/+12
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Upgrade obs-store and fix memory leaksConnor Christie2018-09-103-8/+12
|/ / / / / /
* | | | | | Merge pull request #5212 from whymarrh/yo-deleteWhymarrh Whitby2018-09-071-3/+0
|\ \ \ \ \ \
| * | | | | | Remove unused .yo-rc.json fileWhymarrh Whitby2018-09-061-3/+0
* | | | | | | Merge pull request #5213 from whymarrh/regen-lockfileWhymarrh Whitby2018-09-071-48/+125
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Regenerate lockfileWhymarrh Whitby2018-09-061-48/+125
|/ / / / / /
* | | | | | Use correct loading message when connecting to Kovan (#5189)Eugene Marinelli2018-09-062-1/+2
* | | | | | Merge pull request #5206 from whymarrh/fix-send-content-testsWhymarrh Whitby2018-09-061-1/+1
|\ \ \ \ \ \
| * | | | | | Fix assertion of missing child componentWhymarrh Whitby2018-09-061-1/+1
|/ / / / / /
* | | | | | Merge pull request #5188 from taobun/developDan J Miller2018-09-053-3/+3
|\ \ \ \ \ \
| * | | | | | fix check valid decimals code in new uibunoi2018-09-051-1/+1
| * | | | | | edit decimal check in old-ui/bunoi2018-09-032-2/+2
* | | | | | | Merge pull request #5167 from MetaMask/fix-watcAsset-imagesDan Finlay2018-09-0516-11/+54
|\ \ \ \ \ \ \
| * | | | | | | add assetImages to development statesEsteban MIno2018-08-313-0/+3
| * | | | | | | balance components using selectorsEsteban MIno2018-08-313-5/+5
| * | | | | | | fix integration test for asset images selectorsEsteban MIno2018-08-312-2/+2
| * | | | | | | fix watched tokens images showing in tx listEsteban MIno2018-08-314-4/+16
| * | | | | | | fix watched asset image rendering on confirm transaction headerEsteban MIno2018-08-302-1/+5
| * | | | | | | fix images for watched tokensEsteban MIno2018-08-308-4/+28
* | | | | | | | Merge pull request #5129 from MetaMask/add-sidebar-componentDan J Miller2018-09-0523-76/+267
|\ \ \ \ \ \ \ \
| * | | | | | | | Adds sidebar component and refactors slide in wallet view sidebar to use it.Dan Miller2018-08-2924-76/+290
* | | | | | | | | Merge pull request #5091 from MetaMask/i4945-feature-flag-hex-dataDan J Miller2018-09-0411-4/+77
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Adds feature flag toggle for the hex data row on the send screen.Dan Miller2018-08-2711-4/+77
* | | | | | | | | | Merge pull request #5115 from jdetychey/patch-1Dan J Miller2018-09-041-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Typo in "send" translationJerome de Tychey2018-08-221-1/+1
* | | | | | | | | | | Merge pull request #5191 from eugeneiiim/patch-2Dan J Miller2018-09-041-4/+4
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix CHANGELOG.md formattingEugene Marinelli2018-09-041-4/+4
| | |_|_|_|/ / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge pull request #5138 from MetaMask/greenkeeper/monorepo.enzyme-1.6.0Dan J Miller2018-09-041-2/+2
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | chore(package): update enzyme-adapter-react-15 to version 1.0.6greenkeeper[bot]2018-08-251-1/+1
| * | | | | | | | | | chore(package): update enzyme to version 3.4.4greenkeeper[bot]2018-08-251-1/+1
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #5176 from MetaMask/BumpTokenAbiDan Finlay2018-08-312-1/+24
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | |
| * | | | | | | | | Bump human-standard-token-abi version for DAI supportDan Finlay2018-08-312-1/+24
|/ / / / / / / / /
* | | | | | | | | Merge pull request #5155 from MetaMask/i5154-confirm-spinnerAlexander Tseung2018-08-294-7/+20
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | Fix infinite spinner on failed transactionsAlexander Tseung2018-08-294-7/+20
* | | | | | | | | Merge pull request #4606 from MetaMask/WatchTokenFeatureBruno Barbieri2018-08-2924-6184/+6858
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | fix conflictsEsteban MIno2018-08-29123-2426/+3454
| |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | Merge pull request #5121 from MetaMask/i5099-approveAlexander Tseung2018-08-281-29/+87
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Use eth-contract-metadata data if the token symbol or decimals fail on retrievalAlexander Tseung2018-08-231-29/+87
* | | | | | | | | | Merge pull request #4919 from MetaMask/refactor-tx-listDan Finlay2018-08-2892-8116/+8102
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | |
| * | | | | | | | | Revert changes to tx-list-items.json, and to mock getTransactionCount method ...Dan Miller2018-08-282-2/+2