aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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 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 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 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
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #3562 from MetaMask/danfinlay-patch-1kumavis2018-03-151-1/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | |
| * | | | | | | | | Grammar correctionDan Finlay2018-03-151-1/+1
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #3545 from vincentlg/masterkumavis2018-03-151-0/+609
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Update messages.jsonVincent Le Gallic2018-03-151-12/+12
| * | | | | | | | | Add French translationVincent Le Gallic2018-03-141-0/+609
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #3565 from MetaMask/local-store-fixDan Finlay2018-03-154-9/+31
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | local-store - fix class syntaxkumavis2018-03-151-2/+2
| * | | | | | | | local-store - check for error from extension.runtimekumavis2018-03-151-3/+28
| * | | | | | | | deps - use pify instead of util.promisifykumavis2018-03-153-5/+3
| * | | | | | | | local-store - fix promisification of methodskumavis2018-03-151-3/+2
|/ / / / / / / /
* | | | | | | | Merge pull request #3559 from MetaMask/fix-promisify-refDan Finlay2018-03-141-1/+1
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| | | | * | | | Merge branch 'master' into retry-tx-refractorfrankiebee2018-03-150-0/+0
| | | | |\ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| * | | | | | | fix destructuring of variablesfrankiebee2018-03-141-1/+1
|/ / / / / / /
| | | * / / / 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
| | | |\ \ \ | |_|_|/ / / |/| | | | |
* | | | | | Merge pull request #3083 from MetaMask/i3076-UseStorageLocalInsteadkumavis2018-03-146-4/+75
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into i3076-UseStorageLocalInsteadkumavis2018-03-144-2/+32
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | |
* | | | | | | Merge pull request #3551 from MetaMask/i#3509kumavis2018-03-142-2/+7
|\ \ \ \ \ \ \
| * | | | | | | tx-gas-utils - fix code stylekumavis2018-03-141-1/+1
| * | | | | | | Merge branch 'i#3509' of https://github.com/MetaMask/metamask-extension into ...frankiebee2018-03-141-1/+2
| |\ \ \ \ \ \ \
| | * | | | | | | changelog - update "txParams.to" validation notekumavis2018-03-141-1/+2
| * | | | | | | | transactions move validation of the to field to validateRecipientfrankiebee2018-03-141-7/+3
| |/ / / / / / /
| * | | | | | | Merge remote-tracking branch 'origin/i#3509' into i#3509frankiebee2018-03-14117-1446/+27032
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'master' into i#3509Frankie2018-03-14117-1446/+27032
| | |\ \ \ \ \ \ \
| * | | | | | | | | fix error messagefrankiebee2018-03-141-1/+1
| |/ / / / / / / /
| * | | | | | | | add to CHANGELOG.mdfrankiebee2018-03-141-0/+1
| * | | | | | | | transactions - insure if a to field in tx params has a truthy valu that it is...frankiebee2018-03-141-1/+7
* | | | | | | | | Merge pull request #3552 from MetaMask/danfinlay-patch-1Thomas Huang2018-03-141-1/+1
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Fix grammarDan Finlay2018-03-141-1/+1
|/ / / / / / / /
* | | | | | | | Merge pull request #3546 from MetaMask/TheCriw-patch-1Thomas Huang2018-03-142-0/+26
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | ui - lint fixkumavis2018-03-142-2/+2
| * | | | | | | Merge pull request #3445 from TheCriw/i3440-seed-restore-trim-invalid-characterskumavis2018-03-142-0/+26
|/| | | | | | |
| * | | | | | | FIX #3440 improved verification of restore from seed phrasecriw2018-03-062-0/+26
| | | * | | | | Update CHANGELOG.mdkumavis2018-03-141-2/+3
| | | * | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into i3076-Us...kumavis2018-03-1496-1055/+36969
| | | |\ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
* | | | | | | | Merge pull request #3538 from MetaMask/lazaridiscom-patch-1Dan Finlay2018-03-142-3/+14
|\ \ \ \ \ \ \ \
| * | | | | | | | deps - update package-lockkumavis2018-03-141-0/+10
| * | | | | | | | use 'cross-env' for env-variables within npm scripts, re #3426Lazaridis2018-03-141-3/+4
|/ / / / / / / /
* | | | | | | | Merge pull request #3456 from MetaMask/i18nkumavis2018-03-1463-352/+1038
|\ \ \ \ \ \ \ \
| * | | | | | | | Update ChangelogThomas2018-03-141-1/+1
| * | | | | | | | Merge branch 'master' into i18nThomas Huang2018-03-141-0/+5
| |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | Merge pull request #3527 from danjm/changelog-updates-march13kumavis2018-03-141-0/+5
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Changlog updates for PRs 3468, 3470 and 3495.Dan2018-03-141-0/+5
| | * | | | | | | | Update ChangelogThomas2018-03-141-0/+1
| | * | | | | | | | Remove windows.h from i18n.jsThomas2018-03-141-1/+0
| | * | | | | | | | Add closing parens to appNameThomas2018-03-141-1/+1
| | * | | | | | | | Merge branch 'master' into i18nThomas Huang2018-03-1426-455/+646
| | |\ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge pull request #3468 from danjm/i3033-responsive-newui-onboardingkumavis2018-03-149-13/+232
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Merge branch 'master' into i3033-responsive-newui-onboardingkumavis2018-03-1448-934/+24189
| |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge pull request #3470 from danjm/newui-onboarding-fontskumavis2018-03-142-24/+34
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Update first time flow button fonts, and first-time-flow default font, to Rob...Dan2018-03-082-1/+3
| * | | | | | | | | | Change fonts in new-ui onboarding to Roboto, with weight 400.Dan2018-03-081-23/+31
* | | | | | | | | | | Merge pull request #3495 from alextsg/cb-290kumavis2018-03-145-99/+93
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Increase tap areas for menu buttons on mobileAlexander Tseung2018-03-105-99/+93
* | | | | | | | | | | | Merge pull request #3525 from anticlimactic/move-dev-fileskumavis2018-03-143-19/+19
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Moved mock-dev.js and ui-dev.js to development folder.Vincent2018-03-133-19/+19
* | | | | | | | | | | | | Merge pull request #3518 from MetaMask/ci-moar-fastThomas Huang2018-03-1410-300/+268
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | test - mascara - fix async wrapkumavis2018-03-121-1/+1
| * | | | | | | | | | | | test - use new async selectors for faster testingkumavis2018-03-122-89/+49
| * | | | | | | | | | | | genStates - fix fs api callskumavis2018-03-121-2/+2
| * | | | | | | | | | | | test - add comment about test behavior odditykumavis2018-03-122-4/+2
| * | | | | | | | | | | | test - poll for element instead of manual timeoutskumavis2018-03-124-189/+144
| * | | | | | | | | | | | test - genStates - use async apikumavis2018-03-121-14/+17
| * | | | | | | | | | | | ci - wrap env var in quoteskumavis2018-03-111-4/+4
| * | | | | | | | | | | | ci - split integration tests into parallel firefox and chrome runskumavis2018-03-112-5/+57
| | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | |
| | | | * | | | | | | | Left align create password.Dan2018-03-133-10/+22
| | | | * | | | | | | | Styling fixes to welcome; hide network component on create password; shown we...Dan2018-03-134-9/+8
| | | | * | | | | | | | Add welcome screen to new-ui browser first time flow.Dan2018-03-098-12/+165
| | | | * | | | | | | | Make new-ui create password screen responsive.Dan2018-03-083-25/+57
| | | |/ / / / / / / /
| | | | * | | | | | | Add missing opening parens to pag-container__subtitleThomas2018-03-141-1/+1
| | | | * | | | | | | Merge branch 'master' into i18nThomas Huang2018-03-145-83/+122
| | | | |\ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | |
* | | | | | | | | | | Update deposit ether styling (#3510)Alexander Tseung2018-03-135-82/+125
|/ / / / / / / / / /
| | | * | | | | | | Add sigRequest for Signature RequestThomas2018-03-131-0/+3
| | | * | | | | | | Add loglevel and window.log to i18n.jsThomas2018-03-131-0/+2
| | | * | | | | | | Add i18n back into JsonImportSubviewThomas2018-03-121-7/+7
| | | * | | | | | | Merge branch 'master' into i18nThomas Huang2018-03-1228-415/+23632
| | | |\ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge pull request #3501 from MetaMask/circleci-2.0kumavis2018-03-103-18/+154
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | ci - adjust scss cache keykumavis2018-03-101-3/+3
| * | | | | | | | | | ci - cache firefox against Revisionkumavis2018-03-101-3/+3
| * | | | | | | | | | ci - cache firefox install under build numberkumavis2018-03-101-3/+3
| * | | | | | | | | | ci - split download and install firefox stepskumavis2018-03-101-14/+32
| * | | | | | | | | | ci - install firefox58 and cachekumavis2018-03-101-1/+17
| * | | | | | | | | | ci - prep-deps - install latest firefoxkumavis2018-03-101-2/+4
| * | | | | | | | | | ci - optimize - dont update npmkumavis2018-03-101-4/+1
| * | | | | | | | | | ci - integration tests need to generate scss cache keykumavis2018-03-101-1/+9
| * | | | | | | | | | ci - fix typokumavis2018-03-101-1/+2
| * | | | | | | | | | test - breakout npm script for building for integration testskumavis2018-03-102-3/+4
| * | | | | | | | | | ci - fix config formattingkumavis2018-03-101-2/+2
| * | | | | | | | | | ci - add prep-scss to flowkumavis2018-03-101-0/+3
| * | | | | | | | | | ci - parallize flat + mascara integration testskumavis2018-03-101-8/+49
| * | | | | | | | | | ci - breakup npm test into parallel processeskumavis2018-03-101-6/+33
| * | | | | | | | | | ci - restore node_modules before testkumavis2018-03-101-2/+4
| * | | | | | | | | | ci - test on all brancheskumavis2018-03-101-17/+0
| * | | | | | | | | | ci - update circle configkumavis2018-03-101-13/+15
| * | | | | | | | | | ci - introduce circle ci 2.0kumavis2018-03-102-17/+52
* | | | | | | | | | | Merge pull request #3500 from MetaMask/greenkeeper-chillThomas Huang2018-03-103-880/+608
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | deps - update package-lockkumavis2018-03-101-1037/+1998
| * | | | | | | | | | | chore(package): update gulp-stylelint to version 7.0.0greenkeeper[bot]2018-03-101-1/+1
| * | | | | | | | | | | chore(package): update stylelint-config-standard to version 18.2.0greenkeeper[bot]2018-03-101-1/+1
| * | | | | | | | | | | fix(package): update gulp-autoprefixer to version 5.0.0greenkeeper[bot]2018-03-101-1/+1
| * | | | | | | | | | | deps - remove unused missippi depkumavis2018-03-102-2/+0
| * | | | | | | | | | | chore(package): update browserify to version 16.1.1greenkeeper[bot]2018-03-101-1/+1
| * | | | | | | | | | | deps - bump pumpkumavis2018-03-102-1440/+209
| |/ / / / / / / / / /
* | | | | | | | | | | Merge pull request #3497 from MetaMask/testingkumavis2018-03-101-4/+6
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Persist rinkeby.infura.io and clean nock afterThomas2018-03-101-4/+6
* | | | | | | | | | | Merge pull request #3496 from MetaMask/nsp-fixkumavis2018-03-101-0/+3
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | node security - ignore known hoek advisorykumavis2018-03-101-0/+3
|/ / / / / / / / / /
* | | | | | | | | | Remove de-selected token from selectedTokens hash instead of setting to null ...Alexander Tseung2018-03-091-6/+10
* | | | | | | | | | Add empty object default value for tokenData (#3493)Alexander Tseung2018-03-091-2/+2
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 19:50:08 +0800