aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* deps - update package-lockkumavis2018-03-281-0/+6
* ci - run e2e jobskumavis2018-03-282-1/+18
* Merge branch 'master' into selenium-e2eThomas Huang2018-03-2859-429/+3417
|\
| * Merge pull request #3739 from gasolin/zhtwfixv4.4.0kumavis2018-03-281-11/+50
| |\
| | * [zh-TW] fix translation and add missing stringsgasolin2018-03-271-11/+50
| * | Merge pull request #3746 from nyatla/masterkumavis2018-03-281-14/+62
| |\ \
| | * | Update messages.jsonR.IIzuka2018-03-271-14/+62
| |/ /
| * | Merge pull request #3737 from MetaMask/include-migration-22kumavis2018-03-271-0/+1
| |\ \ | | |/ | |/|
| | * include migration 22frankiebee2018-03-271-0/+1
| |/
| * Merge pull request #3735 from MetaMask/v4.4.0Dan Finlay2018-03-272-1/+4
| |\
| | * changelog - add note ofr i18n zh_tw th slkumavis2018-03-271-0/+1
| | * v4.4.0kumavis2018-03-272-1/+3
| |/
| * Merge pull request #3732 from MetaMask/i3706-FixLocalStoreWriteDan Finlay2018-03-272-2/+2
| |\
| | * Fix bug where full localStorage would crash on startDan Finlay2018-03-272-2/+2
| |/
| * Merge pull request #3680 from danjm/i3517-popup-newui-onboardingThomas Huang2018-03-274-14/+14
| |\
| | * Empty commit.Dan2018-03-270-0/+0
| | * Empty commit.Dan2018-03-270-0/+0
| | * Empty commit.Dan2018-03-270-0/+0
| | * Empty commit.Dan2018-03-270-0/+0
| | * Empty commit.Dan2018-03-270-0/+0
| | * Empty commit.Dan2018-03-270-0/+0
| | * Empty commit.Dan2018-03-270-0/+0
| | * Empty commit.Dan2018-03-270-0/+0
| | * Fix tests.Dan2018-03-272-4/+5
| | * Empty commit.Dan2018-03-270-0/+0
| | * Improve responsivensss of unique image screen.Dan2018-03-241-0/+4
| | * Pop uses new ui onboarding when in beta.Dan2018-03-233-10/+5
| * | Merge pull request #3710 from danjm/i3326-addtokenscreendesignupdateThomas Huang2018-03-276-122/+321
| |\ \
| | * | Empty commit.Dan2018-03-270-0/+0
| | * | Merge branch 'master' into i3326-addtokenscreendesignupdateDan2018-03-2738-218/+354
| | |\ \
| | * | | Update add token integration tests.Dan2018-03-261-9/+11
| | * | | Use new header on add token confirmation screen.Dan2018-03-261-65/+68
| | * | | Updates Add token screen to latest design.Dan2018-03-244-99/+256
| * | | | Merge pull request #3728 from MetaMask/changle-updates-march26Thomas Huang2018-03-271-0/+6
| |\ \ \ \
| | * | | | New-ui changelog updates (March 26)Dan2018-03-271-0/+6
| | | |/ / | | |/| |
| * | | | Merge pull request #3729 from MetaMask/test-timeout-fixThomas Huang2018-03-271-1/+0
| |\ \ \ \
| | * | | | test - remove timeout causing mocha disconnect issueskumavis2018-03-271-1/+0
| * | | | | Merge pull request #3730 from MetaMask/revert-3665-ci-buildDan Finlay2018-03-271-17/+0
| |\ \ \ \ \
| | * | | | | Revert "Ci - introduce a build job"Dan Finlay2018-03-271-17/+0
| |/ / / / /
| * / / / / migration for adding submittedTime to the txMeta (#3727)Frankie2018-03-272-0/+71
| |/ / / /
| * | | | Merge pull request #3695 from danjm/i3379-signtypedata-overflowThomas Huang2018-03-271-0/+1
| |\ \ \ \
| | * | | | Signed type data notification handles long messages.Dan2018-03-231-0/+1
| | | |_|/ | | |/| |
| * | | | Merge pull request #3665 from MetaMask/ci-buildDan Finlay2018-03-271-0/+17
| |\ \ \ \
| | * | | | ci - fix build job loggingkumavis2018-03-221-2/+5
| | * | | | ci - add build stepkumavis2018-03-221-0/+14
| | |/ / /
| * | | | i18n - sl Slovenian translation (#3724)Filip Š2018-03-271-0/+819
| * | | | i18n - zh_tw traditional chinese (taiwanese)gasolin2018-03-271-0/+864
| * | | | Merge pull request #3711 from artiya4u/feature/thai_localekumavis2018-03-271-0/+819
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Update Thai translate.artiya4u2018-03-241-3/+3
| | * | | Update Thai translate.artiya4u2018-03-241-2/+2
| | * | | Update Thai translate.artiya4u2018-03-241-1/+1
| | * | | ๊๊Update Thai translate.artiya4u2018-03-241-9/+9
| | * | | First add Thai translate.artiya4u2018-03-231-0/+819
| * | | | Merge pull request #3708 from MetaMask/build-sourcemapsDan Finlay2018-03-275-9/+109
| |\ \ \ \
| | * | | | build - fix sourcemaps for devkumavis2018-03-241-1/+1
| | * | | | lint - fixkumavis2018-03-241-1/+1
| | * | | | sentry - npm scripts for uploading source mapskumavis2018-03-242-0/+71
| | * | | | build - always generate sourcemapskumavis2018-03-241-2/+2
| | * | | | sentry - namespace files under metamask dirkumavis2018-03-241-2/+2
| | * | | | sentry - rewrite report urls + use raven-js from npmkumavis2018-03-244-7/+36
| | * | | | build - for build, write sourcemaps to dist/sourcemapskumavis2018-03-241-1/+1
| | * | | | build - always create sourcemapskumavis2018-03-241-2/+2
| | | |_|/ | | |/| |
| * | | | Merge pull request #3718 from sandakersmann/patch-1Dan Finlay2018-03-271-1/+1
| |\ \ \ \
| | * | | | Updated one badge link to httpsMarius Kjærstad2018-03-251-1/+1
| | |/ / /
| * | | | Merge pull request #3721 from alextsg/cb-944Dan Finlay2018-03-2727-156/+166
| |\ \ \ \
| | * | | | Update button stylesAlexander Tseung2018-03-2627-156/+166
| | |/ / /
| * | | | Merge pull request #3722 from danjm/i2582-sendtoensnameDan Finlay2018-03-276-43/+32
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Use ens-input component in send-v2 to allow sending to ens names.Dan2018-03-266-43/+32
| |/ / /
| * | | Merge pull request #3671 from lazaridiscom/masterkumavis2018-03-231-1/+1
| |\ \ \ | | |_|/ | |/| |
| | * | changes test to unit-integration-lint, closes #3650Lazaridis2018-03-221-1/+1
| |/ /
| * | Merge pull request #3662 from MetaMask/v4.3.0v4.3.0kumavis2018-03-222-4/+8
| |\ \
| | * | changelog - add note on i18n being beta onlykumavis2018-03-221-1/+1
| | * | v4.3.0kumavis2018-03-222-1/+3
| | * | changelog - update with new changeskumavis2018-03-221-3/+5
| |/ /
| * | Merge pull request #3658 from MetaMask/danjm-i3554-fix-editing-dapp-token-txskumavis2018-03-224-5/+18
| |\ \
| | * | test - flat - add extra timeout, idk maybekumavis2018-03-221-0/+1
| | * | ui - tx conf - only show special token tx conf screen for token sendkumavis2018-03-221-4/+8
| | * | Merge branch 'i3554-fix-editing-dapp-token-txs' of https://github.com/danjm/m...kumavis2018-03-223-5/+13
| |/| |
| | * | Identify token transactions by method names token data, and not just whether ...Dan2018-03-203-5/+13
| * | | Merge pull request #3656 from MetaMask/trigun0x2-master2kumavis2018-03-223-6/+15
| |\ \ \
| | * \ \ Merge branch 'master' of github.com:MetaMask/metamask-extension into trigun0x...kumavis2018-03-221-0/+873
| | |\ \ \
| | * \ \ \ Merge branch 'master' of https://github.com/trigun0x2/metamask-extension into...kumavis2018-03-223-6/+15
| | |\ \ \ \
| | | * | | | fix for lintJeffrey Tong2018-03-211-5/+5
| | | * | | | remove console logJeffrey Tong2018-03-121-2/+0
| | | * | | | add comments that need clarification on naming conventionJeffrey Tong2018-03-123-9/+10
| | | * | | | fixed multiple notification windows when executing batchJeffrey Tong2018-03-082-2/+14
| | | * | | | removed check for width & height on multiple popup windowsJeffrey Tong2018-03-081-3/+1
| * | | | | | Merge pull request #3648 from raulk/patch-1kumavis2018-03-221-53/+53
| |\ \ \ \ \ \
| | * | | | | | Minor adjustments to Spanish translationRaúl Kripalani2018-03-211-53/+53
* | | | | | | | Merge branch 'master' into selenium-e2eThomas2018-03-222-8/+2
|\| | | | | | |
| * | | | | | | Merge pull request #3657 from MetaMask/revert-3628-3505_Transpile_to_ES5kumavis2018-03-222-8/+2
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| | * | | | | | Revert "Issue 3505 | Transpile to ES5"Thomas Huang2018-03-222-8/+2
| |/ / / / / /
* | | | | | | Merge branch 'master' into selenium-e2eThomas2018-03-22121-4075/+11734
|\| | | | | |
| * | | | | | Merge pull request #3654 from MetaMask/i18n-deDan Finlay2018-03-221-0/+873
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | i18n - fix german json formattingkumavis2018-03-221-7/+6
| | * | | | | Tranlate to German (#3575)Nico2018-03-221-0/+874
| |/ / / / /
| * | | | | Translate to Russian (#3644)Victor Charapaev2018-03-221-0/+819
| * | | | | hn _locales : message.json [HINDI] (#3611)N1X2018-03-222-2/+819
| |/ / / /
| * | | | Merge pull request #3624 from alextsg/cb-941kumavis2018-03-219-198/+274
| |\ \ \ \
| | * | | | Update confirm transaction screenAlexander Tseung2018-03-219-198/+274
| * | | | | Merge pull request #3625 from bradford-hamilton/masterkumavis2018-03-211-0/+819
| |\ \ \ \ \
| | * | | | | add Dutch translationsBradford Lamson-Scribner2018-03-211-0/+819
| | | |_|/ / | | |/| | |
| * | | | | Merge pull request #3641 from hermanjunge/masterkumavis2018-03-211-10/+0
| |\ \ \ \ \
| | * | | | | Nuke the es_419 localeHerman Junge2018-03-211-10/+0
| | |/ / / /
| * | | | | Merge pull request #3585 from lazaridiscom/laz/i3568kumavis2018-03-212-246/+355
| |\ \ \ \ \
| | * | | | | moves setup-related code towads end of file, re #3568Lazaridis2018-03-171-115/+124
| | * | | | | add ESLint exceptions for //= and //-, re #3568Lazaridis2018-03-162-4/+4
| | * | | | | group all vault/keyring related methods together, re #3568Lazaridis2018-03-161-128/+130
| | * | | | | adds initial documentation, re #3568Lazaridis2018-03-161-40/+138
| * | | | | | Merge pull request #3504 from lazaridiscom/laz/i3427kumavis2018-03-217-0/+48
| |\ \ \ \ \ \
| | * | | | | | add READMEs to folders, re #3427Lazaridis2018-03-148-0/+49
| * | | | | | | Merge pull request #3640 from hermanjunge/complete-spanishkumavis2018-03-211-274/+322
| |\ \ \ \ \ \ \
| | * | | | | | | last pass (for now)Herman Junge2018-03-211-53/+53
| | * | | | | | | all 286 english strings were found in your localeHerman Junge2018-03-211-0/+66
| | * | | | | | | all 264 strings declared in your locale were found in the english oneHerman Junge2018-03-211-26/+8
| | * | | | | | | alphabetic sort of spanish messages.jsonHerman Junge2018-03-211-237/+237
| * | | | | | | | Gas inputs can be changed by up and down arrows (#3598)Dan J Miller2018-03-212-0/+3
| |/ / / / / / /
| * | | | | | | Merge pull request #3635 from MetaMask/i3571-CompleteI18nTemplateskumavis2018-03-2112-108/+232
| |\ \ \ \ \ \ \
| | * | | | | | | Add i18n to tx statusThomas2018-03-212-2/+39
| | * | | | | | | Merge branch 'master' into i3571-CompleteI18nTemplatesThomas2018-03-2137-107/+3699
| | |\ \ \ \ \ \ \
| | * | | | | | | | Update onlySendToEtherAddress messageThomas2018-03-211-1/+1
| | * | | | | | | | Add i18n in settings/infoThomas2018-03-212-14/+17
| | * | | | | | | | Started on Tx list i18nThomas2018-03-212-1/+7
| | * | | | | | | | i18n Import flowThomas2018-03-212-5/+5
| | * | | | | | | | I18n add-token.jsThomas2018-03-201-21/+22
| | * | | | | | | | Remove duplicate keysThomas2018-03-201-7/+1
| | * | | | | | | | Add send screen templateDan Finlay2018-03-202-16/+28
| | * | | | | | | | Add template for settings and infoDan Finlay2018-03-202-23/+34
| | * | | | | | | | Add recover and backup tempaltesDan Finlay2018-03-203-18/+42
| | * | | | | | | | Add login templatesDan Finlay2018-03-201-3/+3
| | * | | | | | | | Add connecting indication templatesDan Finlay2018-03-202-6/+42
| | | |_|_|/ / / / | | |/| | | | | |
| * | | | | | | | Merge pull request #3638 from MetaMask/DocumentTranslationScriptkumavis2018-03-211-1/+9
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Document translation scriptDan Finlay2018-03-211-1/+9
| | | |/ / / / / / | | |/| | | | | |
| * | | | | | | | Merge pull request #3632 from MetaMask/retry-tx-refractorkumavis2018-03-213-1/+35
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | Take user home if an unapproved tx is dropped while they are viewing.Dan2018-03-211-0/+18
| | * | | | | | | Fix styling regression from master merge.Dan2018-03-201-1/+1
| | * | | | | | | Improve responsiveness of gas price row on confirm screen.Dan2018-03-201-0/+16
| * | | | | | | | Merge pull request #3633 from hermanjunge/spanishThomas Huang2018-03-211-5/+835
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Add messages.json from @Grana69Grana692018-03-211-5/+835
| |/ / / / / / / /
| * | | | | | | | Merge pull request #3612 from hermanjunge/locale-verificationThomas Huang2018-03-211-0/+96
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Move file to development, fix JSHerman Junge2018-03-211-13/+13
| | * | | | | | | | Add script to verify locale stringsHerman Junge2018-03-201-0/+96
| | | |/ / / / / / | | |/| | | | | |
| * | | | | | | | Merge pull request #3613 from alvesjtiago/masterkumavis2018-03-211-0/+819
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Portuguese translations.Tiago Alves2018-03-201-0/+819
| | | |_|_|_|_|_|/ | | |/| | | | | |
| * | | | | | | | Merge pull request #3579 from matteopey/italian-translationkumavis2018-03-211-0/+819
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Update translation based on the new message.jsonmatteopey2018-03-201-1/+211
| | * | | | | | | | Clients because we mean Ethereum clientsmatteopey2018-03-161-1/+1
| | * | | | | | | | Fix as requested by reviewmatteopey2018-03-161-1/+1
| | * | | | | | | | Add italian translationmatteopey2018-03-161-0/+609
| * | | | | | | | | Merge pull request #3623 from MetaMask/i#3554kumavis2018-03-211-0/+2
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | new-ui - dont exclude `txParams.data` when editing and updating txParamsfrankiebee2018-03-201-0/+2
| | | |_|/ / / / / / | | |/| | | | | | |
| * | | | | | | | | Merge pull request #3605 from lazaridiscom/masterkumavis2018-03-211-1/+1
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | use mkdirp for cross-platform, re #3426Lazaridis2018-03-181-1/+1
| | | |_|/ / / / / / | | |/| | | | | | |
| * | | | | | | | | Merge pull request #3574 from marvinvista/masterkumavis2018-03-211-0/+609
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | |
| | * | | | | | | | Translate to Tagalog #3535Marvin Vista2018-03-151-1/+1
| | * | | | | | | | Translate to Tagalog #3535Marvin Vista2018-03-151-0/+609
| * | | | | | | | | Merge pull request #3628 from ryan-rowland/3505_Transpile_to_ES5Dan Finlay2018-03-212-2/+8
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Issue 3505 | Transpile to ES5Ryan Rowland2018-03-202-2/+8
| | | |_|/ / / / / / | | |/| | | | | | |
| * | | | | | | | | Merge pull request #3489 from MetaMask/retry-tx-refractorThomas Huang2018-03-2123-86/+485
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / | | |/| | | | | | |
| | * | | | | | | | Merge branch 'master' into retry-tx-refractorDan2018-03-2010-13/+25
| | |\ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | Fix Account Names being cropped (#3626)Alexander Tseung2018-03-206-11/+6
| * | | | | | | | | Don't block user from setting gas if estimating gas returns errors. (#3627)Dan J Miller2018-03-204-2/+19
| | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | Merge branch 'master' into retry-tx-refractorDan2018-03-2059-3246/+3744
| | |\ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Merge pull request #3594 from danjm/i3344-improve-currency-inputThomas Huang2018-03-203-7/+176
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Use customized react-trigger-change in send-new-ui integration tests..Dan2018-03-192-1/+162
| | * | | | | | | | Currency input defaults to empty stringDan2018-03-171-6/+14
| * | | | | | | | | Remove unused files from ui folder. (#3577)anticlimactic2018-03-1930-2510/+3
| * | | | | | | | | Make entire gray container of 'reveal seed phrase' a clickable area. (#3596)Dan J Miller2018-03-191-4/+6
| | |_|_|/ / / / / | |/| | | | | | |
| * | | | | | | | Merge pull request #3555 from mamiM/mamiM-Ja-translationkumavis2018-03-181-3/+602
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Translation to JapaneseMami Mordovets2018-03-141-3/+602
| * | | | | | | | | Merge pull request #3560 from Orangem21/masterkumavis2018-03-181-3/+602
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | fixOrange2018-03-151-2/+2
| | * | | | | | | | | Merge pull request #2 from MetaMask/masterOrange2018-03-159-6/+108
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge pull request #1 from Orangem21/yuanaichiOrange2018-03-141-103/+103
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | fixOrange2018-03-141-1/+1
| | | * | | | | | | | | | yuanaichiyuanchao2018-03-141-102/+102
| | |/ / / / / / / / / /
| | * | | | | | | | | | fixOrange2018-03-141-30/+30
| | * | | | | | | | | | fixOrange2018-03-141-1/+1
| | * | | | | | | | | | updateOrange2018-03-141-3/+602
| * | | | | | | | | | | Merge pull request #3602 from vietlq/masterkumavis2018-03-182-0/+619
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | spaceViet Le2018-03-181-1/+1
| | * | | | | | | | | | | corrected vn -> viViet Le2018-03-182-0/+10
| | * | | | | | | | | | | Translated to Vietnamese. Translator: Trang Ha, Editor: Viet LeViet Le2018-03-181-0/+609
| | * | | | | | | | | | | Merge pull request #1 from MetaMask/masterLe Quoc Viet2018-03-15493-3078/+85254
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / / / / | | | |/| | | | | | | | |
| * | | | | | | | | | | | Merge pull request #3564 from nujabes403/patch-1kumavis2018-03-181-5/+604
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Update messages.jsonnujabes4032018-03-161-1/+1
| | * | | | | | | | | | | | Update messages.jsonnujabes4032018-03-161-1/+1
| | * | | | | | | | | | | | Update messages.jsonnujabes4032018-03-161-16/+16
| | * | | | | | | | | | | | Update messages.jsonnujabes4032018-03-161-2/+2
| | * | | | | | | | | | | | Update messages.jsonnujabes4032018-03-161-1/+1
| | * | | | | | | | | | | | Translated whole message in KRnujabes4032018-03-151-109/+109
| | * | | | | | | | | | | | Update kr translation to messages.jsonnujabes4032018-03-151-5/+604
| | | |_|_|/ / / / / / / / | | |/| | | | | | | | | |
| * | | | | | | | | | | | Merge pull request #3603 from vietlq/patch-2Dan Finlay2018-03-181-10/+8
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Update add-to-chrome.mdLe Quoc Viet2018-03-181-0/+2
| | * | | | | | | | | | | | Small editsLe Quoc Viet2018-03-181-10/+6
| |/ / / / / / / / / / / /
| * | | | | | | | | | | | Fix styling on confirm-send-ether and confirm-send-token (#3600)Alexander Tseung2018-03-174-226/+232
| * | | | | | | | | | | | Merge pull request #3590 from SaptakS/feature/whitelistDan Finlay2018-03-171-1/+16
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Inject Script: Blacklist domains where not to inject scriptSaptak Sengupta2018-03-171-1/+16
| | | |_|/ / / / / / / / / | | |/| | | | | | | | | |
| * | | | | | | | | | | | Update Confirm Contract screen (#3597)Alexander Tseung2018-03-179-322/+448
| * | | | | | | | | | | | Fix messages typo (#3591)Thomas Huang2018-03-171-1/+1
| * | | | | | | | | | | | Update margins for consistency in first time flow (#3588)Alexander Tseung2018-03-166-150/+214
| | |_|_|_|_|/ / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Merge pull request #3587 from MetaMask/i18nDan Finlay2018-03-161-0/+210
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | |
| | * | | | | | | | | | More for i18nThomas2018-03-161-0/+210
| |/ / / / / / / / / /
| * | | | | | | | | | Merge pull request #3576 from Senshii/masterkumavis2018-03-161-1/+1
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / | |/| | | | | | | | |
| | * | | | | | | | | fix plural in french translationsimon fourdinier2018-03-151-1/+1
| | |/ / / / / / / /
| | | | | | | * | | Merge branch 'retry-tx-refractor' of https://github.com/MetaMask/metamask-ext...frankiebee2018-03-163-22/+49
| | | | | | | |\ \ \
| | | | | | | | * | | Set retry gasPrice to forceGasMin on confirm screen in cases where gas is not...Dan2018-03-152-4/+34
| | | | | | | | * | | Force gas min has correct precision and is set when editing gas if max.Dan2018-03-153-7/+8
| | | | | | | | * | | Ensure changes from customize gas modal opened from confirm screen are captur...Dan2018-03-152-12/+8
| | | | | | | | * | | Revert 'Set txMeta.time to reflect time of tx approval.'Dan2018-03-151-3/+3
| | | | | | | | * | | Merge branch 'master' into retry-tx-refractorDan2018-03-155-9/+640
| | | | | | | | |\ \ \
| | | | | | | | * \ \ \ Merge branch 'master' into retry-tx-refractorDan2018-03-141-1/+1
| | | | | | | | |\ \ \ \ | | | | |_|_|_|_|/ / / / | | | |/| | | | | | | |
| | | | | | | * | | | | add to CHANGELOG.mdfrankiebee2018-03-161-0/+1
| | | | | | | * | | | | Merge branch 'master' into retry-tx-refractorfrankiebee2018-03-164-460/+260
| | | | | | | |\ \ \ \ \ | | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Update Deposit Eth icon (#3569)Alexander Tseung2018-03-164-460/+260
| |/ / / / / / / / / /
| | | | | | * | | | | Merge branch 'master' into retry-tx-refractorfrankiebee2018-03-158-12/+643
| | | | | | |\ \ \ \ \ | | |_|_|_|_|/ / / / / | |/| | | | | | | | |
| | | | | | * | | | | Merge branch 'master' into retry-tx-refractorfrankiebee2018-03-150-0/+0
| | | | | | |\ \ \ \ \
| | | | | | * | | | | | fix destructuring of variablesfrankiebee2018-03-141-1/+1
| | | | | | | |/ / / / | | | | | | |/| | | |
| | | | | | * | | | | Fix tests.Dan2018-03-143-6/+6
| | | | | | * | | | | Fix TransactionStateManager spelling.Dan2018-03-141-2/+2
| | | | | | * | | | | Merge branch 'master' into retry-tx-refractorDan2018-03-14101-2026/+3530
| | | | | | |\ \ \ \ \ | | | | | | |/ / / / / | | | | | |/| | | | |
| | | | | | * | | | | Fix more lint errors.Dan2018-03-143-11/+2
| | | | | | * | | | | Remove unnecessary addition of nonce to state.Dan2018-03-143-10/+0
| | | | | | * | | | | Make token confirmations compatible.Dan2018-03-142-14/+88
| | | | | | * | | | | Fix tx-list-item submitted check.Dan2018-03-141-1/+1
| | | | | | * | | | | Adds styles for dropped txs in old-ui.Dan2018-03-142-0/+9
| | | | | | * | | | | Correctly set latest submitted retry with nonces that matches others in old-u...Dan2018-03-141-1/+1
| | | | | | * | | | | Use correct name for submittedTime field in tx-list.jsDan2018-03-141-1/+1
| | | | | | * | | | | Use correct var name in new-ui showRetryButtonDan2018-03-141-1/+1
| | | | | | * | | | | Undefined check in showRetryButtonDan2018-03-142-6/+8
| | | | | | * | | | | Styling for dropped.Dan2018-03-142-0/+5
| | | | | | * | | | | Use new submittedTime field to correctly show retry button in old and new ui.Dan2018-03-145-13/+19
| | | | | | * | | | | transactions - return the txMeta in retryTransactionfrankiebee2018-03-141-2/+3
| | | | | | * | | | | tests - add tests for transactions#retryTransaction and transactions#_markNon...frankiebee2018-03-141-1/+44
| | | | | | * | | | | transactions:state - add a submittedTime stamp so the ui has a better grasp o...frankiebee2018-03-141-0/+4
| | | | | | * | | | | Set txMeta.time to reflect time of tx approval.Dan2018-03-131-3/+3
| | | | | | * | | | | Improve phrasing of copy.Dan2018-03-132-2/+2
| | | | | | * | | | | Fix gas calculation and nonce / forceGasMin state setting errors; retry butto...Dan2018-03-133-25/+39
| | | | | | * | | | | Lint fixes.Dan2018-03-092-3/+1
| | | | | | * | | | | Merge branch 'master' into retry-tx-refractorDan2018-03-0938-306/+24463
| | | | | | |\ \ \ \ \
| | | | | | * | | | | | Adds inline opening of gas customization to confirm-send-ether screen.Dan2018-03-093-10/+63
| | | | | | * | | | | | Retry transaction logic added to tx-list-item, confirm-send-ether, customize-...Dan2018-03-099-16/+113
| | | | | | * | | | | | Add html and css for responsive retry button.Dan2018-03-093-0/+57
| | | | | | * | | | | | fix marking of confirmed transaction as droppedfrankiebee2018-03-091-1/+1
| | | | | | * | | | | | transactions - make _markNonceDuplicatesDroppedfrankiebee2018-03-081-21/+20
| | | | | | * | | | | | Merge branch 'master' into retry-tx-refractorfrankiebee2018-03-0853-238/+3612
| | | | | | |\ \ \ \ \ \
| | | | | | * | | | | | | refactor retrytx with higher gas price:frankiebee2018-03-082-26/+55
* | | | | | | | | | | | | Merge branch 'master' into selenium-e2eThomas2018-03-1598-886/+2555
|\| | | | | | | | | | | |
| * | | | | | | | | | | | Merge pull request #3558 from MetaMask/fix-two-translationsThomas Huang2018-03-152-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Fix translations whose substitutions params were not in arrays.Dan2018-03-142-2/+2
| | | |_|_|/ / / / / / / / | | |/| | | | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-12 09:14:40 +0800