aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Remove console.logsDan2018-03-222-2/+0
|
* Missed modifications of t() in merge resolution.Dan2018-03-223-4/+1
|
* Merge branch 'master' into i18n-translator-reduxDan2018-03-2237-786/+4409
|\
| * Merge pull request #3662 from MetaMask/v4.3.0v4.3.0kumavis2018-03-222-4/+8
| |\ | | | | | | V4.3.0
| | * 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
| |\ | | | | | | Identify token transactions by method names
| | * 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 ↵kumavis2018-03-223-5/+13
| |/| | | | | | | | | | https://github.com/danjm/metamask-extension into danjm-i3554-fix-editing-dapp-token-txs
| | * Identify token transactions by method names token data, and not just whether ↵Dan2018-03-203-5/+13
| | | | | | | | | | | | they've been add via metamask.
| * | Merge pull request #3656 from MetaMask/trigun0x2-master2kumavis2018-03-223-6/+15
| |\ \ | | | | | | | | Prevent batch request from opening multiple windows (3)
| | * \ Merge branch 'master' of github.com:MetaMask/metamask-extension into ↵kumavis2018-03-221-0/+873
| | |\ \ | | | | | | | | | | | | | | | trigun0x2-master
| | * \ \ Merge branch 'master' of https://github.com/trigun0x2/metamask-extension ↵kumavis2018-03-223-6/+15
| | |\ \ \ | | | | | | | | | | | | | | | | | | into trigun0x2-master
| | | * | | 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 translation
| | * | | | | 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"
| | * | | | | 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 - German Locale
| | * | | | i18n - fix german json formattingkumavis2018-03-221-7/+6
| | | | | |
| | * | | | Tranlate to German (#3575)Nico2018-03-221-0/+874
| |/ / / / | | | | | | | | | | Translation into German
| * | | | Translate to Russian (#3644)Victor Charapaev2018-03-221-0/+819
| | | | | | | | | | | | | | | | | | | | * Add Russian localization
| * | | | hn _locales : message.json [HINDI] (#3611)N1X2018-03-222-2/+819
| |/ / / | | | | | | | | adding hn_IN `_locales`
| * | | Merge pull request #3624 from alextsg/cb-941kumavis2018-03-219-198/+274
| |\ \ \ | | | | | | | | | | Update confirm transaction screen
| | * | | Update confirm transaction screenAlexander Tseung2018-03-219-198/+274
| | | | |
| * | | | Merge pull request #3625 from bradford-hamilton/masterkumavis2018-03-211-0/+819
| |\ \ \ \ | | | | | | | | | | | | add Dutch translations
| | * | | | add Dutch translationsBradford Lamson-Scribner2018-03-211-0/+819
| | | |_|/ | | |/| |
| * | | | Merge pull request #3641 from hermanjunge/masterkumavis2018-03-211-10/+0
| |\ \ \ \ | | | | | | | | | | | | Nuke the es_419 locale
| | * | | | Nuke the es_419 localeHerman Junge2018-03-211-10/+0
| | |/ / /
| * | | | Merge pull request #3585 from lazaridiscom/laz/i3568kumavis2018-03-212-246/+355
| |\ \ \ \ | | | | | | | | | | | | [WIP] document/rearrange metamask-controller.js, re #3568
| | * | | | 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
| |\ \ \ \ \ | | | | | | | | | | | | | | adds READMEs to folders, re #3427
| | * | | | | add READMEs to folders, re #3427Lazaridis2018-03-148-0/+49
| | | | | | |
| * | | | | | Merge pull request #3640 from hermanjunge/complete-spanishkumavis2018-03-211-274/+322
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Complete Spanish Translation
| | * | | | | | 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
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Up and down arrows can control gas inputs. * input-number.js just uses number type.
* | | | | | | i18n redux solution doesn't require importing t() and passing state to each ↵Dan2018-03-2268-445/+636
| | | | | | | | | | | | | | | | | | | | | | | | | | | | t() call; t is just available on props.
* | | | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into ↵kumavis2018-03-2149-217/+3983
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | i18n-translator-redux
| * | | | | | Merge pull request #3635 from MetaMask/i3571-CompleteI18nTemplateskumavis2018-03-2112-108/+232
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | I3571 complete i18n templates
| | * | | | | | 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 script
| | * | | | | | | Document translation scriptDan Finlay2018-03-211-1/+9
| | | |/ / / / / | | |/| | | | |
| * | | | | | | Merge pull request #3632 from MetaMask/retry-tx-refractorkumavis2018-03-213-1/+35
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | Retry tx refractor
| | * | | | | | 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 @Grana69
| | * | | | | | | Add messages.json from @Grana69Grana692018-03-211-5/+835
| |/ / / / / / /
| * | | | | | | Merge pull request #3612 from hermanjunge/locale-verificationThomas Huang2018-03-211-0/+96
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Add script to verify locale strings
| | * | | | | | | 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.
| | * | | | | | | Portuguese translations.Tiago Alves2018-03-201-0/+819
| | | | | | | | |
| * | | | | | | | Merge pull request #3579 from matteopey/italian-translationkumavis2018-03-211-0/+819
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Italian translation
| | * | | | | | | | 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 txParams
| | * | | | | | | | | 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 #3426
| | * | | | | | | | | use mkdirp for cross-platform, re #3426Lazaridis2018-03-181-1/+1
| | | |_|/ / / / / / | | |/| | | | | | |
| * | | | | | | | | Merge pull request #3574 from marvinvista/masterkumavis2018-03-211-0/+609
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | | Tagalog Translation
| | * | | | | | | | Translate to Tagalog #3535Marvin Vista2018-03-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed some special characters
| | * | | | | | | | 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 ES5
| | * | | | | | | | | Issue 3505 | Transpile to ES5Ryan Rowland2018-03-202-2/+8
| | | |_|/ / / / / / | | |/| | | | | | |
| * | | | | | | | | Merge pull request #3489 from MetaMask/retry-tx-refractorThomas Huang2018-03-2123-86/+485
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / | | |/| | | | | | | Retry tx refractor
| | * | | | | | | | 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 branch 'retry-tx-refractor' of ↵frankiebee2018-03-163-22/+49
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/MetaMask/metamask-extension into retry-tx-refractor
| | | * | | | | | | Set retry gasPrice to forceGasMin on confirm screen in cases where gas is ↵Dan2018-03-152-4/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | not edited.
| | | * | | | | | | 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 ↵Dan2018-03-152-12/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | captured for non-tx transactions.
| | | * | | | | | | 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
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / / / | | | |/| | | | | | | |
| | * | | | | | | | | | 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 ↵Dan2018-03-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | old-ui transaction-list-item.
| | * | | | | | | | | | | 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 ↵frankiebee2018-03-141-1/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | transactions#_markNonceDuplicatesDropped
| | * | | | | | | | | | | transactions:state - add a submittedTime stamp so the ui has a better grasp ↵frankiebee2018-03-141-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | of the time of submission
| | * | | | | | | | | | | 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 ↵Dan2018-03-133-25/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | button shows on correct tx.
| | * | | | | | | | | | | 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, ↵Dan2018-03-099-16/+113
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | customize-gas-modal, and dependents.
| | * | | | | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - create a new tx instead of overwriting the tx hash - add a new state 'dropped' to the txStateManager - mark duplicate txs as dropped when one gets confirmed in a block
* | | | | | | | | | | | | | | Lint fixes.Dan2018-03-2016-11/+19
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'master' into i18n-translator-reduxDan2018-03-203-7/+176
|\| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge pull request #3594 from danjm/i3344-improve-currency-inputThomas Huang2018-03-203-7/+176
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currency input defaults to empty string
| | * | | | | | | | | | | | | | 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
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Fixed t() calls where localeMessages is missing; and fix incorrect connect ↵Dan2018-03-2018-24/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | reference.
* | | | | | | | | | | | | | | | Merge branch 'master' into i18n-translator-reduxDan2018-03-2058-3688/+3208
|\| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Remove unused files from ui folder. (#3577)anticlimactic2018-03-1930-2510/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Removed unused UI files. Fixes #3434. * Reverted the deletion of "feature-toggle-utils.js". Reverted the deletion of the test files and modified the paths so they referred to the old-ui.
| * | | | | | | | | | | | | | | 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 Japanese #3536
| | * | | | | | | | | | | | | | Translation to JapaneseMami Mordovets2018-03-141-3/+602
| | | |_|_|_|/ / / / / / / / / | | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge pull request #3560 from Orangem21/masterkumavis2018-03-181-3/+602
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Translate to Chinese (Mandarin) #3529
| | * | | | | | | | | | | | | | fixOrange2018-03-151-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | change loose => 疏松； change imported => 已导入私钥
| | * | | | | | | | | | | | | | Merge pull request #2 from MetaMask/masterOrange2018-03-159-6/+108
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|/ / / / / | | | |/| | | | | | | | | | | | update
| | * | | | | | | | | | | | | | Merge pull request #1 from Orangem21/yuanaichiOrange2018-03-141-103/+103
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 中文翻译
| | | * | | | | | | | | | | | | | fixOrange2018-03-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix 接收 to 接受
| | | * | | | | | | | | | | | | | yuanaichiyuanchao2018-03-141-102/+102
| | |/ / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | fixOrange2018-03-141-30/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix
| | * | | | | | | | | | | | | | fixOrange2018-03-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix
| | * | | | | | | | | | | | | | updateOrange2018-03-141-3/+602
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | update
| * | | | | | | | | | | | | | | Merge pull request #3602 from vietlq/masterkumavis2018-03-182-0/+619
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Vietnamese Translation
| | * | | | | | | | | | | | | | | 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 from the source
| * | | | | | | | | | | | | | | | Merge pull request #3564 from nujabes403/patch-1kumavis2018-03-181-5/+604
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Translate to Korean #3563
| | * | | | | | | | | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Small edits to Chrome guide
| | * | | | | | | | | | | | | | | | 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 script
| | * | | | | | | | | | | | | | | | Inject Script: Blacklist domains where not to inject scriptSaptak Sengupta2018-03-171-1/+16
| | | |_|/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Put a blacklist domain check where if the page url is in the list of blacklisted domains, we shouldn't inject script in that web page.
| * | | | | | | | | | | | | | | | 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 i18n
| | * | | | | | | | | | | | | | More for i18nThomas2018-03-161-0/+210
| |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | Merge pull request #3576 from Senshii/masterkumavis2018-03-161-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | fix plural in french translation
| | * | | | | | | | | | | | | fix plural in french translationsimon fourdinier2018-03-151-1/+1
| | |/ / / / / / / / / / / /
| * / / / / / / / / / / / / Update Deposit Eth icon (#3569)Alexander Tseung2018-03-164-460/+260
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Delete commented out code from i18n implementation that used globals.Dan2018-03-201-5/+0
| | | | | | | | | | | | |
* | | | | | | | | | | | | Delete old i18n helper files.Dan2018-03-202-76/+0
| | | | | | | | | | | | |
* | | | | | | | | | | | | Fetch localeMessages in front end only.Dan2018-03-203-16/+8
| | | | | | | | | | | | |
* | | | | | | | | | | | | Handle i18n with redux.Dan2018-03-1688-385/+538
| | | | | | | | | | | | |
* | | | | | | | | | | | | ui - settings - add option to set current localekumavis2018-03-151-0/+45
| | | | | | | | | | | | |
* | | | | | | | | | | | | Translation to JapaneseMami Mordovets2018-03-151-3/+602
| | | | | | | | | | | | |
* | | | | | | | | | | | | i18n - load locales manuallykumavis2018-03-1539-118/+197
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #3558 from MetaMask/fix-two-translationsThomas Huang2018-03-152-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Fix translations whose substitutions params were not in arrays.
| * | | | | | | | | | | | 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 correction
| * | | | | | | | | | | Grammar correctionDan Finlay2018-03-151-1/+1
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge pull request #3545 from vincentlg/masterkumavis2018-03-151-0/+609
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add French translation 🇫🇷
| * | | | | | | | | | | Update messages.jsonVincent Le Gallic2018-03-151-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | thx to @Senshii
| * | | | | | | | | | | Add French translationVincent Le Gallic2018-03-141-0/+609
| | |_|_|/ / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge pull request #3565 from MetaMask/local-store-fixDan Finlay2018-03-154-9/+31
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | | Fix local store promisification
| * | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | / / / | | |_|_|_|_|/ / / | |/| | | | | | | fix destructuring of variables
| * | | | | | | | fix destructuring of variablesfrankiebee2018-03-141-1/+1
|/ / / / / / / /
* | | | | | | | Merge pull request #3083 from MetaMask/i3076-UseStorageLocalInsteadkumavis2018-03-146-4/+75
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Use storage.local instead of localStorage
| * \ \ \ \ \ \ \ Merge branch 'master' into i3076-UseStorageLocalInsteadkumavis2018-03-144-2/+32
| |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | Merge pull request #3551 from MetaMask/i#3509kumavis2018-03-142-2/+7
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | fix for where null is not supported in txParams
| * | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | i#3509
| | * | | | | | | | | 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 ↵frankiebee2018-03-141-1/+7
| | |_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | is a valid addres and if it is falsy that it is not null to fix issue #3509
* | | | | | | | | | Merge pull request #3552 from MetaMask/danfinlay-patch-1Thomas Huang2018-03-141-1/+1
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | Fix grammar
| * | | | | | | | | Fix grammarDan Finlay2018-03-141-1/+1
|/ / / / / / / / /
* | | | | | | | | Merge pull request #3546 from MetaMask/TheCriw-patch-1Thomas Huang2018-03-142-0/+26
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | improved verification of restore from seed phrase
| * | | | | | | | ui - lint fixkumavis2018-03-142-2/+2
| | | | | | | | |
| * | | | | | | | Merge pull request #3445 from TheCriw/i3440-seed-restore-trim-invalid-characterskumavis2018-03-142-0/+26
|/| | | | | | | | | | | | | | | | | | | | | | | | | | improved verification of restore from seed phrase
| * | | | | | | | 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 ↵kumavis2018-03-1496-1055/+36969
| | | |\ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | i3076-UseStorageLocalInstead
* | | | | | | | | Merge pull request #3538 from MetaMask/lazaridiscom-patch-1Dan Finlay2018-03-142-3/+14
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | cross platform - use 'cross-env' for env-variables within npm scripts
| * | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Add i18n
| * | | | | | | | | 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.
| * | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | Make new-ui create password screen responsive.
| * | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Change fonts in new-ui onboarding to Roboto, with weight 400.
| * | | | | | | | | | | Update first time flow button fonts, and first-time-flow default font, to ↵Dan2018-03-082-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Roboto.
| * | | | | | | | | | | 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 mobile
| * | | | | | | | | | | | 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.
| * | | | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | CI - make CI moar fast
| * | | | | | | | | | | | | 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
| | | | | | | | | | | | | |
generated by cgit (git 2.34.1) at 2024-10-16 22:21:52 +0800