aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Import defaults in send_/Dan2018-05-1510-17/+18
* Fix Button component path in page-container footer.Dan2018-05-151-1/+1
* Add index.js files to send_ subdirectoriesDan2018-05-1513-0/+13
* Merge branch 'develop' into i3725-refactor-send-component-Dan2018-05-14142-4065/+12673
* Tests for send.duck.jsDan2018-05-144-20/+167
* Rename ducks/send.js to ducks/send.duck.jsDan2018-05-1415-14/+14
* Add missing unit tests in send_/: now 100% function test coverage in send_/Dan2018-05-144-112/+298
* Lint fixesDan2018-05-1410-31/+6
* Unit tests for account-list-item, amount-max-button and send-amount-row compo...Dan2018-05-143-0/+381
* Unit tests for from-dropdown; split out send-dropdown-list from from-dropdownDan2018-05-124-39/+260
* SendRowErrorMessage component test.Dan2018-05-111-0/+28
* Unit tests for send from, gas, to and wrapper row components.Dan2018-05-114-0/+403
* Fix test descriptions and remove unnecessary proptypes.Dan2018-05-105-14/+10
* Adds test for send, send-content, send-footer and send-header components.Dan2018-05-076-16/+516
* Unit tests for containers, utils and selectors in send_/Dan2018-05-0546-127/+3222
* Merge branch 'i3725-refactor-send-component-' of github.com:MetaMask/metamask...Dan2018-05-0113-1153/+1500
|\
| * Merge pull request #4157 from danjm/i3725-refactor-send-component-2Dan J Miller2018-05-0115-1169/+1941
| |\
| | * Merge branch 'i3725-refactor-send-component-' into i3725-refactor-send-compon...Dan2018-05-01227-2737/+11177
| | |\ | | |/ | |/|
| | * Refactor page-container component structureAlexander Tseung2018-04-1114-106/+1367
* | | Delete dead send code.Dan2018-05-0110-723/+2
|/ /
* | Remove 'goHome' from send_Dan2018-05-012-4/+1
* | Move getMaxModeOn selector to amount-max-button container.Dan2018-05-013-6/+10
* | Use constants for send screen errors messages.Dan2018-05-014-9/+29
* | Fix send-v2__form class in send-content.componentDan2018-05-011-1/+1
* | Fix amount max button.Dan2018-05-015-7/+7
* | Fix close button on send screenDan2018-04-302-4/+5
* | Further refactors; includes refactor of send-v2.js and associated containerDan2018-04-3025-156/+489
* | Fixes to get tests passing.Dan2018-04-279-15/+35
* | Lint fixes and alphabetization for i3725-refactor-send-componentDan2018-04-2735-365/+330
* | Core of the refactor completeDan2018-04-2734-489/+757
* | Merge branch 'master' into i3725-refactor-send-componentDan2018-04-25132-2147/+5940
|\ \
| * \ Merge pull request #3940 from nyatla/masterDan Finlay2018-04-243-1/+3
| |\ \
| | * | Reduced button padding.nyatla2018-04-101-0/+1
| | * | Expanded dropdown menu width of title.nyatla2018-04-101-1/+1
| | * | Changed mouse cursor to "pointer" on the cancel text at the top left of the p...nyatla2018-04-101-0/+1
| * | | Merge pull request #4023 from MetaMask/greenkeeper/ethjs-contract-0.2.0Dan Finlay2018-04-241-1/+1
| |\ \ \
| | * | | fix(package): update ethjs-contract to version 0.2.0greenkeeper[bot]2018-04-191-1/+1
| * | | | Merge pull request #4062 from MetaMask/i4056-LatestPriceApiDan Finlay2018-04-241-1/+1
| |\ \ \ \
| | * | | | Use the metamask balanc3 dev price apiDan Finlay2018-04-241-1/+1
| * | | | | Merge pull request #3934 from MetaMask/node-enginesDan Finlay2018-04-241-1/+1
| |\ \ \ \ \
| | * | | | | package.json - update engines field to require node v8.x.xkumavis2018-04-101-1/+1
| * | | | | | Merge pull request #3935 from MetaMask/ci-tests-first-then-dessertDan Finlay2018-04-241-10/+11
| |\ \ \ \ \ \
| | * | | | | | ci - complete all tests before running extraskumavis2018-04-101-10/+11
| | |/ / / / /
| * | | | | | Merge pull request #4057 from MetaMask/sentry-bumpDan Finlay2018-04-242-4/+4
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | deps - bump sentry for more detailed fetch failurekumavis2018-04-242-4/+4
| * | | | | | Merge pull request #4029 from MetaMask/DocumentMetaMaskControllerDan Finlay2018-04-241-131/+330
| |\ \ \ \ \ \
| | * | | | | | Linted docsDan Finlay2018-04-241-1/+1
| | * | | | | | Linted jsdocsDan Finlay2018-04-211-52/+60
| | * | | | | | Added docs to MM-controllerDan Finlay2018-04-191-130/+321
| | | |_|/ / / | | |/| | | |
| * | | | | | Merge pull request #3968 from MetaMask/gh-3653Dan Finlay2018-04-2420-121/+212
| |\ \ \ \ \ \
| | * | | | | | Clean up network configAlexander Tseung2018-04-2420-121/+212
| | | |/ / / / | | |/| | | |
| * | | | | | Merge pull request #4028 from MetaMask/i4016-customrpcDan Finlay2018-04-241-6/+8
| |\ \ \ \ \ \
| | * | | | | | Fix custom RPC not redirecting to Settings pageAlexander Tseung2018-04-191-6/+8
| * | | | | | | Merge pull request #4041 from MetaMask/DocumentBackgroundDan Finlay2018-04-241-2/+127
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| | * | | | | | Remove wrong charsDan Finlay2018-04-211-2/+2
| | * | | | | | Add ui note to background docsDan Finlay2018-04-211-1/+1
| | * | | | | | Lint background docsDan Finlay2018-04-211-12/+12
| | * | | | | | Document MetaMaskState and TransactionMetaDan Finlay2018-04-211-0/+69
| | * | | | | | Document Background ScriptDan Finlay2018-04-201-2/+58
| * | | | | | | Merge pull request #4020 from MetaMask/i3941-jsdoc-bitpshrDan Finlay2018-04-2127-4149/+296
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Clean up JSDoc for background scriptsbitpshr2018-04-207-24/+32
| | * | | | | | Add more documentation to computed balances controllerbitpshr2018-04-204-6/+77
| | * | | | | | Add JSDoc to various background scriptsbitpshr2018-04-1930-9339/+14
| | * | | | | | Add generated docsbitpshr2018-04-1918-227/+5485
| | * | | | | | Add JSDoc to various background scriptsbitpshr2018-04-196-70/+205
| * | | | | | | Merge pull request #4030 from MetaMask/i4014-metamask-versionThomas Huang2018-04-201-1/+9
| |\ \ \ \ \ \ \
| | * | | | | | | Show correct MetaMask version number in the Info pageAlexander Tseung2018-04-191-1/+9
| | | |/ / / / / | | |/| | | | |
| * | | | | | | Merge pull request #4026 from MetaMask/i4015-oldui-seedThomas Huang2018-04-191-6/+18
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Fix exception thrown when revealing seed wordsAlexander Tseung2018-04-191-6/+18
| | | |/ / / / | | |/| | | |
| * | | | | | Merge pull request #3984 from whymarrh/3941-jsdocDan Finlay2018-04-199-48/+150
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Add a few missing docblocks to background filesWhymarrh Whitby2018-04-199-48/+150
| * | | | | | Merge pull request #3987 from MetaMask/dm-docs-1Dan Finlay2018-04-198-17/+389
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Missing bracket in docblock.Dan2018-04-191-1/+1
| | * | | | | Merge branch 'master' into dm-docs-1Dan2018-04-1992-1703/+8290
| | |\| | | |
| | * | | | | NO MIXED TABS AND SPACESDan2018-04-193-137/+137
| | * | | | | Documentation fix: @constant -> @propertyDan2018-04-191-1/+1
| | * | | | | Add missing descriptions in util.jsDan2018-04-171-4/+4
| | * | | | | Document async function as returning a promise.Dan2018-04-171-1/+1
| | * | | | | Improve documentation of promises that return undefined.Dan2018-04-172-4/+4
| | * | | | | Typo fixes, type fixes on the return clauses of the buyEthUrl and getPreffere...Dan2018-04-176-7/+8
| | * | | | | Spell deprecated correctly.Dan2018-04-171-2/+2
| | * | | | | @params -> @param fixDan2018-04-173-8/+8
| | * | | | | Documentation for various controllers and libsDan2018-04-179-19/+387
| | * | | | | Documentation for environemnt-type.jsDan2018-04-121-0/+9
| * | | | | | Merge pull request #3977 from MetaMask/i-3913-big-numberDan Finlay2018-04-195-25/+52
| |\ \ \ \ \ \
| | * | | | | | Fix spinner layoutAlexander Tseung2018-04-185-26/+28
| | * | | | | | Fix BigNumber exception in confirm-send-etherAlexander Tseung2018-04-182-3/+28
| * | | | | | | Merge pull request #4004 from MetaMask/i3955-reveal-seedDan Finlay2018-04-196-23/+116
| |\ \ \ \ \ \ \
| | * | | | | | | Fix UI getting stuck in Reveal Seed screenAlexander Tseung2018-04-196-23/+116
| * | | | | | | | Merge pull request #3998 from MetaMask/i3988-checksummed-addressDan Finlay2018-04-1912-27/+46
| |\ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | |
| | * | | | | | | Show checksummed addresses throughout the UIbitpshr2018-04-1812-27/+46
| | |/ / / / / /
| * | / / / / / I18n - add Tamil + some Hindi fixesVikas Kumar Yadav2018-04-193-10/+923
| | |/ / / / / | |/| | | | |
| * | | | | | Merge pull request #4000 from MetaMask/depsDan Finlay2018-04-182-33/+36
| |\ \ \ \ \ \
| | * | | | | | deps - update keyring controller and other eth-dependincesfrankiebee2018-04-182-33/+36
| |/ / / / / /
| * | | | | | Merge pull request #3853 from MetaMask/i3580-InternationalizeCurrencyDan Finlay2018-04-1812-1300/+1235
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Merge branch 'master' into i3580-InternationalizeCurrencyDan Finlay2018-04-1882-346/+6088
| | |\ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge pull request #3969 from MetaMask/i3966-AddJsDocsPageThomas Huang2018-04-1821-0/+4254
| |\ \ \ \ \ \
| | * | | | | | Add JSDocs Page and ScriptDan Finlay2018-04-1321-61/+4681
| | | |/ / / / | | |/| | | |
| * | | | | | Merge pull request #3995 from MetaMask/i3759-popupDan Finlay2018-04-1812-68/+104
| |\ \ \ \ \ \
| | * | | | | | Fix confirmation popup not always openingAlexander Tseung2018-04-1712-68/+104
| |/ / / / / /
| * | | | | | Merge pull request #3982 from MetaMask/i3981-contract-ratesDan Finlay2018-04-1713-92/+147
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge branch 'master' into i3981-contract-ratesDan Finlay2018-04-1744-141/+1166
| | |\ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge pull request #3967 from MetaMask/AddTeamDocsDan Finlay2018-04-172-0/+79
| |\ \ \ \ \ \ \
| | * | | | | | | Fix spelling typoDan Finlay2018-04-171-1/+1
| | * | | | | | | Add Herman team documentationDan Finlay2018-04-131-0/+11
| | * | | | | | | LintedDan Finlay2018-04-131-2/+0
| | * | | | | | | Add Paul to team docsDan Finlay2018-04-131-0/+7
| | * | | | | | | Add team member documentationDan Finlay2018-04-132-0/+63
| | | |/ / / / / | | |/| | | | |
| * | | | | | | Merge pull request #3970 from MetaMask/i3651-removeGlobalLogDan Finlay2018-04-1737-113/+172
| |\ \ \ \ \ \ \
| | * | | | | | | Require loglevel singleton in each module that uses itbitpshr2018-04-1437-113/+172
| * | | | | | | | Merge pull request #3978 from espoem/cs-langDan Finlay2018-04-172-0/+913
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Fix vault translationMartin Šmíd2018-04-141-4/+4
| | * | | | | | | | Add czech translationMartin Šmíd2018-04-142-0/+913
| | |/ / / / / / /
| * | | | | | | | Merge pull request #3985 from whymarrh/unused-jshintDan Finlay2018-04-171-27/+0
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Remove unused JSHint file, ESLint is the standardWhymarrh Whitby2018-04-171-27/+0
| | |/ / / / / / /
| * | | | | | | | Merge pull request #3976 from MetaMask/i3973-FixLocaleSettingskumavis2018-04-172-1/+2
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | Fix action for setting localeDan Finlay2018-04-142-1/+2
| |/ / / / / / /
| | | * | | | | Update CHANGELOG with information about rate fetchingbitpshr2018-04-171-1/+2
| | | * | | | | Disable token price polling when no client is activebitpshr2018-04-174-0/+14
| | | * | | | | Maintain token prices using a background servicebitpshr2018-04-167-81/+117
| | | * | | | | Fetch token prices based on contract addressbitpshr2018-04-168-81/+85
| | |/ / / / / | |/| | | | |
| * | | | | | Merge pull request #3975 from MetaMask/i3947-composableStoreDan Finlay2018-04-146-265/+637
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Add tests for ComposableObservableStorebitpshr2018-04-142-11/+46
| | * | | | | Add ComposableObservableStore for subscription managementbitpshr2018-04-135-265/+602
| |/ / / / /
| | * | | | Merge branch 'master' into i3580-InternationalizeCurrencykumavis2018-04-106-33/+994
| | |\ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Add basic currency localization test.Dan2018-04-102-0/+162
| | * | | | Fix integration tests so that they check for localize currency.Dan2018-04-101-4/+4
| | * | | | Lint fix.Dan2018-04-102-2/+2
| | * | | | Merge branch 'master' into i3580-InternationalizeCurrencyDan2018-04-10104-3163/+5310
| | |\ \ \ \
| | * | | | | Internationalize converted value in confirm screensDan2018-04-102-4/+36
| | * | | | | Internationalize converted value in currency-input.jsDan2018-04-101-10/+25
| | * | | | | Improve display of crypto currencies when selected as the 'Current Conversion'Dan2018-04-102-35/+1206
| | * | | | | Fix and improve testDan Finlay2018-04-041-2/+12
| | * | | | | LintedDan Finlay2018-04-041-1/+1
| | * | | | | Bump changelogDan Finlay2018-04-041-0/+2
| | * | | | | Internationalize currencyDan Finlay2018-04-044-1/+44
* | | | | | | second commitDan2018-04-1118-50/+461
* | | | | | | Merge branch 'master' into i3725-refactor-send-componentDan2018-04-1078-1913/+6030
|\| | | | | | | |_|_|_|_|/ |/| | | | |
| * | | | | Merge pull request #3938 from nyatla/masterkumavis2018-04-101-27/+72
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | ローカライズファイル以外を元に戻したnyatla2018-04-103-3337/+1793
| | * | | | Merge tag 'v4.5.5'nyatla2018-04-10184-3344/+10841
| | |\ \ \ \
| | * | | | | Update messages.jsonR.IIzuka2018-04-102-92/+207
| * | | | | | Merge pull request #3894 from danjm/i3696-disablefirsttimeimportloadingkumavis2018-04-101-3/+4
| |\ \ \ \ \ \
| | * | | | | | Disable the first time flow import button while isLoading is true.Dan2018-04-091-3/+4
| * | | | | | | Merge pull request #3852 from MetaMask/i3621-LogoPerformancekumavis2018-04-102-1/+3
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'master' into i3621-LogoPerformancekumavis2018-04-1098-2011/+6507
| | |\ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Translate to Turkish (#3876)Mert Ozdag2018-04-102-0/+913
| * | | | | | | | Merge pull request #3895 from MetaMask/greenkeeper/gulp-sass-4.0.0kumavis2018-04-101-1/+1
| |\ \ \ \ \ \ \ \
| | * | | | | | | | fix(package): update gulp-sass to version 4.0.0greenkeeper[bot]2018-04-051-1/+1
| * | | | | | | | | Merge pull request #3925 from MetaMask/greenkeeper/ethjs-0.3.4kumavis2018-04-101-1/+1
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | |
| | * | | | | | | | fix(package): update ethjs to version 0.3.4greenkeeper[bot]2018-04-071-1/+1
| | | |_|_|_|_|_|/ | | |/| | | | | |
| * | | | | | | | Merge pull request #3921 from MetaMask/gh-3736-react-routerkumavis2018-04-1061-1787/+4799
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | Fix integration testsAlexander Tseung2018-04-076-19/+39
| | * | | | | | | Merge branch 'master' of https://github.com/MetaMask/metamask-extension into ...Alexander Tseung2018-04-0617-49/+315
| | |\ \ \ \ \ \ \
| | * | | | | | | | Fix editing transactionAlexander Tseung2018-04-061-2/+1
| | * | | | | | | | Revert "commit"Alexander Tseung2018-04-064-18/+7
| | * | | | | | | | Merge branch 'master' of https://github.com/MetaMask/metamask-extension into ...Alexander Tseung2018-04-065-3/+6
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | commitAlexander Tseung2018-04-064-7/+18
| | * | | | | | | | | Fix confirm-sig-requests integration testAlexander Tseung2018-04-051-3/+3
| | * | | | | | | | | Merge branch 'master' of https://github.com/MetaMask/metamask-extension into ...Alexander Tseung2018-04-0513-95/+239
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / | | | |/| | | | | | |
| | * | | | | | | | | Fix integration testsAlexander Tseung2018-04-053-7/+28
| | * | | | | | | | | Use new design for showing seed wordsAlexander Tseung2018-04-041-1/+13
| | * | | | | | | | | commitAlexander Tseung2018-04-041-8/+2
| | * | | | | | | | | Merge branch 'master' of https://github.com/MetaMask/metamask-extension into ...Alexander Tseung2018-04-0424-156/+250
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Fix transaction confirmationsAlexander Tseung2018-04-044-35/+161
| | * | | | | | | | | | Merge branch 'master' of https://github.com/MetaMask/metamask-extension into ...Alexander Tseung2018-04-036-17/+93
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Fix merge conflicts. Modify send workflowAlexander Tseung2018-04-0348-808/+5271
| | |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Fix lint errorsAlexander Tseung2018-04-0313-414/+21
| | * | | | | | | | | | | | Add withRouter to I18nProvider componentAlexander Tseung2018-04-031-1/+6
| | * | | | | | | | | | | | Refactor onboarding flowAlexander Tseung2018-04-0216-235/+403
| | * | | | | | | | | | | | Fix conf-tx renderAlexander Tseung2018-03-313-7/+50
| | * | | | | | | | | | | | Merge branch 'master' of https://github.com/MetaMask/metamask-extension into ...Alexander Tseung2018-03-315-23/+26
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Fix merge conflictsAlexander Tseung2018-03-31101-944/+1774
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | Fix merge conflicts. Refactor renderPrimary into Home componentAlexander Tseung2018-03-3110-610/+694
| | * | | | | | | | | | | | | | Fix i18n merge conflictsAlexander Tseung2018-03-30120-849/+2004
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | Fix merge conflicts. Refactor onboarding flow.Alexander Tseung2018-03-2918-91/+176
| | * | | | | | | | | | | | | | | Fix merge conflictsAlexander Tseung2018-03-27267-5943/+47127
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | Fix react-router related exceptionsAlexander Tseung2018-02-102-2/+2
| | * | | | | | | | | | | | | | | | Merge branch 'uat-next' of https://github.com/MetaMask/metamask-extension int...Alexander Tseung2018-02-091-3/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'uat-next' of https://github.com/MetaMask/metamask-extension int...Alexander Tseung2018-02-092-36/+28
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'uat-next' of https://github.com/MetaMask/metamask-extension int...Alexander Tseung2018-02-0947-173/+1349
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | Fix lint errorsAlexander Tseung2018-02-024-10/+3
| | * | | | | | | | | | | | | | | | | | | Checks if there is currently a send in progress before redirecting to default...Dan2018-02-011-3/+7
| | * | | | | | | | | | | | | | | | | | | Fix merge conflicts from uat-nextAlexander Tseung2018-02-0140-230/+1152
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | Add create new account routes, fix conflicts from uat updatesAlexander Tseung2018-02-0120-643/+674
| | * | | | | | | | | | | | | | | | | | | | Merge branch 'uat' of https://github.com/MetaMask/metamask-extension into cb-254Alexander Tseung2018-01-30111-2410/+6087
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | Add prop-types to package.json, redirect from create-password screen when isI...Alexander Tseung2017-12-152-2/+22
| | * | | | | | | | | | | | | | | | | | | | | Add route for signature requestAlexander Tseung2017-12-156-305/+454
| | * | | | | | | | | | | | | | | | | | | | | Add initialized checks for first time flow routesAlexander Tseung2017-12-156-83/+60
| | * | | | | | | | | | | | | | | | | | | | | Add route for Mascara confirm seedAlexander Tseung2017-12-154-120/+151
| | * | | | | | | | | | | | | | | | | | | | | Fix lint errorsAlexander Tseung2017-12-154-14/+44
| | * | | | | | | | | | | | | | | | | | | | | Add routes for mascaraAlexander Tseung2017-12-1513-198/+296
| | * | | | | | | | | | | | | | | | | | | | | Add react-router to allow use of the browser back buttonAlexander Tseung2017-12-1543-1468/+2065
| * | | | | | | | | | | | | | | | | | | | | | Merge pull request #3922 from MetaMask/empty-vault-fixkumavis2018-04-071-3/+31
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | metamask - never persist if state is missingkumavis2018-04-071-1/+4
| | * | | | | | | | | | | | | | | | | | | | | | metamask - never persist if state is missing datakumavis2018-04-071-3/+6
| | * | | | | | | | | | | | | | | | | | | | | | metamask - attempt recovery from empty vaultkumavis2018-04-071-0/+22
| * | | | | | | | | | | | | | | | | | | | | | | Merge pull request #3917 from MetaMask/kumavis-patch-3Frankie2018-04-071-2/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | tx-state-manager - dont remove old tx history if candidate is not foundkumavis2018-04-071-2/+4
| | |/ / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | Merge pull request #3916 from MetaMask/4.5.5Frankie2018-04-072-1/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | / / | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | 4.5.5v4.5.5kumavis2018-04-072-1/+3
| | * | | | | | | | | | | | | | | | | | | | | changelog - add changes for v4.5.5kumavis2018-04-071-1/+7
| | * | | | | | | | | | | | | | | | | | | | | v4.5.4kumavis2018-04-072-1/+3
| | * | | | | | | | | | | | | | | | | | | | | changelog - add missing entrieskumavis2018-04-071-1/+3
| |/ / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | Merge pull request #3901 from MetaMask/MM-QA-Guidekumavis2018-04-061-0/+48
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | Update QA_Guide.mdThomas Huang2018-04-061-0/+3
| | * | | | | | | | | | | | | | | | | | | | | Update QA_Guide.mdThomas Huang2018-04-061-1/+0
| | * | | | | | | | | | | | | | | | | | | | | UpdateThomas2018-04-061-2/+4
| | * | | | | | | | | | | | | | | | | | | | | Commit Metamask QA GuideThomas2018-04-061-0/+44
| * | | | | | | | | | | | | | | | | | | | | | Merge pull request #3907 from MetaMask/fix-all-migrationskumavis2018-04-069-89/+124
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | migrations - back fixesfrankiebee2018-04-069-89/+124
| | | | | | | | | | | | | | | | | | | | * | | Improve fox logo performanceDan Finlay2018-04-042-1/+3
* | | | | | | | | | | | | | | | | | | | | | | first commitDan2018-04-0794-37/+845
|/ / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | Merge pull request #3906 from MetaMask/migration-25Thomas Huang2018-04-064-3/+133
|\| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | create migration 25frankiebee2018-04-064-3/+112
| * | | | | | | | | | | | | | | | | | | | | test - run live migrations over first time statefrankiebee2018-04-061-4/+25
|/ / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | Merge pull request #3904 from MetaMask/migrations-templateFrankie2018-04-062-0/+46
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | meta - create a migration templatefrankiebee2018-04-062-0/+46
|/ / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | Merge pull request #3857 from MetaMask/match-local-localecodeskumavis2018-04-061-2/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | Map existingLocaleCodes and userPreferredLocaleCodes to lower case in get-fir...Dan2018-04-041-2/+4
| * | | | | | | | | | | | | | | | | | | | | Ensure get-first-preferred-lang-code.js matches locale codes from local direc...Dan2018-04-041-1/+1
| | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | Merge pull request #3883 from danjm/i3685-define-event-privatekey-importkumavis2018-04-061-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | event object actually passed to this.createKeyringOnEnter in private-key.jsDan2018-04-051-1/+2
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | Merge pull request #3887 from MetaMask/i#3886kumavis2018-04-062-27/+27
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | transactions - _normalizeTxParams will now return a new object for txParamsfrankiebee2018-04-062-40/+27
| * | | | | | | | | | | | | | | | | | | | | transactions - remove unnecessary keys on txParamsfrankiebee2018-04-052-1/+14
| |/ / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | Merge pull request #3900 from MetaMask/migration-error-reportFrankie2018-04-064-14/+80
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | migrator - dont overwrite error stack and warn to consolekumavis2018-04-061-2/+5
| * | | | | | | | | | | | | | | | | | | | | migrator - fix typokumavis2018-04-061-1/+1
| * | | | | | | | | | | | | | | | | | | | | migrations - report migrations errors to sentry with vault structurekumavis2018-04-064-14/+77
* | | | | | | | | | | | | | | | | | | | | | Merge pull request #3892 from alextsg/gh-3891kumavis2018-04-062-1/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Fix populating txParams with undefined dataAlexander Tseung2018-04-062-1/+10
* | | | | | | | | | | | | | | | | | | | | | Merge pull request #3899 from MetaMask/migration-24-fixkumavis2018-04-062-1/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | make migration-24 compat with first-time-statefrankiebee2018-04-062-1/+13
| | |_|/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | Merge pull request #3865 from MetaMask/openlinkinnewwindowThomas Huang2018-04-062-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Bump ChangelogKevin Serrano2018-04-051-0/+1
| * | | | | | | | | | | | | | | | | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into openlink...Kevin Serrano2018-04-0513-95/+239
| |\| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Make token helpscout link open in new tab.Kevin Serrano2018-04-041-0/+1
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge pull request #3882 from MetaMask/i#3791Kevin Serrano2018-04-053-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Change double-quotes to single-quotesThomas2018-04-052-2/+2
| * | | | | | | | | | | | | | | | | | | Update ChangelogThomas2018-04-051-0/+2
| * | | | | | | | | | | | | | | | | | | Merge branch 'master' into i#3791Thomas2018-04-052-1/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Add target=_blank exportAsFileThomas2018-04-052-0/+2
| | |_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge pull request #3884 from danjm/i3874-send-eth-to-selfKevin Serrano2018-04-051-3/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Allow from and to address to be the same in new-ui.Dan2018-04-051-3/+0
|/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Merge pull request #3880 from MetaMask/v4.5.3v4.5.3Thomas Huang2018-04-052-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | 4.5.3kumavis2018-04-052-1/+3
|/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge pull request #3879 from MetaMask/normalize-transactionskumavis2018-04-058-89/+220
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | transactions - make #_validateTxParams not async and "linting" wink wink nudg...frankiebee2018-04-052-18/+20
| * | | | | | | | | | | | | | | | | Merge branch 'master' of https://github.com/MetaMask/metamask-extension into ...frankiebee2018-04-056-6/+16
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | |