| Commit message (Expand) | Author | Age | Files | Lines |
* | Correct reprice title and subtitle key names. | Dan | 2018-03-22 | 2 | -4/+4 |
* | Add en localeMessages to test states. | Dan | 2018-03-22 | 2 | -0/+17 |
* | Fix sender-to-recipient export and non-existent translation key. | Dan | 2018-03-22 | 2 | -5/+3 |
* | Correct connect reference in confirm-send-ether, confirm-deploy-contract, net... | Dan | 2018-03-22 | 3 | -3/+3 |
* | Lint fixes | Dan | 2018-03-22 | 14 | -18/+18 |
* | Fix references to undefined 'this.props' | Dan | 2018-03-22 | 2 | -25/+23 |
* | Remove console.logs | Dan | 2018-03-22 | 2 | -2/+0 |
* | Missed modifications of t() in merge resolution. | Dan | 2018-03-22 | 3 | -4/+1 |
* | Merge branch 'master' into i18n-translator-redux | Dan | 2018-03-22 | 37 | -786/+4409 |
|\ |
|
| * | Merge pull request #3662 from MetaMask/v4.3.0v4.3.0 | kumavis | 2018-03-22 | 2 | -4/+8 |
| |\ |
|
| | * | changelog - add note on i18n being beta only | kumavis | 2018-03-22 | 1 | -1/+1 |
| | * | v4.3.0 | kumavis | 2018-03-22 | 2 | -1/+3 |
| | * | changelog - update with new changes | kumavis | 2018-03-22 | 1 | -3/+5 |
| |/ |
|
| * | Merge pull request #3658 from MetaMask/danjm-i3554-fix-editing-dapp-token-txs | kumavis | 2018-03-22 | 4 | -5/+18 |
| |\ |
|
| | * | test - flat - add extra timeout, idk maybe | kumavis | 2018-03-22 | 1 | -0/+1 |
| | * | ui - tx conf - only show special token tx conf screen for token send | kumavis | 2018-03-22 | 1 | -4/+8 |
| | * | Merge branch 'i3554-fix-editing-dapp-token-txs' of https://github.com/danjm/m... | kumavis | 2018-03-22 | 3 | -5/+13 |
| |/| |
|
| | * | Identify token transactions by method names token data, and not just whether ... | Dan | 2018-03-20 | 3 | -5/+13 |
| * | | Merge pull request #3656 from MetaMask/trigun0x2-master2 | kumavis | 2018-03-22 | 3 | -6/+15 |
| |\ \ |
|
| | * \ | Merge branch 'master' of github.com:MetaMask/metamask-extension into trigun0x... | kumavis | 2018-03-22 | 1 | -0/+873 |
| | |\ \ |
|
| | * \ \ | Merge branch 'master' of https://github.com/trigun0x2/metamask-extension into... | kumavis | 2018-03-22 | 3 | -6/+15 |
| | |\ \ \ |
|
| | | * | | | fix for lint | Jeffrey Tong | 2018-03-21 | 1 | -5/+5 |
| | | * | | | remove console log | Jeffrey Tong | 2018-03-12 | 1 | -2/+0 |
| | | * | | | add comments that need clarification on naming convention | Jeffrey Tong | 2018-03-12 | 3 | -9/+10 |
| | | * | | | fixed multiple notification windows when executing batch | Jeffrey Tong | 2018-03-08 | 2 | -2/+14 |
| | | * | | | removed check for width & height on multiple popup windows | Jeffrey Tong | 2018-03-08 | 1 | -3/+1 |
| * | | | | | Merge pull request #3648 from raulk/patch-1 | kumavis | 2018-03-22 | 1 | -53/+53 |
| |\ \ \ \ \ |
|
| | * | | | | | Minor adjustments to Spanish translation | Raúl Kripalani | 2018-03-21 | 1 | -53/+53 |
| * | | | | | | Merge pull request #3657 from MetaMask/revert-3628-3505_Transpile_to_ES5 | kumavis | 2018-03-22 | 2 | -8/+2 |
| |\ \ \ \ \ \
| | |_|_|_|/ /
| |/| | | | | |
|
| | * | | | | | Revert "Issue 3505 | Transpile to ES5" | Thomas Huang | 2018-03-22 | 2 | -8/+2 |
| |/ / / / / |
|
| * | | | | | Merge pull request #3654 from MetaMask/i18n-de | Dan Finlay | 2018-03-22 | 1 | -0/+873 |
| |\ \ \ \ \
| | |_|/ / /
| |/| | | | |
|
| | * | | | | i18n - fix german json formatting | kumavis | 2018-03-22 | 1 | -7/+6 |
| | * | | | | Tranlate to German (#3575) | Nico | 2018-03-22 | 1 | -0/+874 |
| |/ / / / |
|
| * | | | | Translate to Russian (#3644) | Victor Charapaev | 2018-03-22 | 1 | -0/+819 |
| * | | | | hn _locales : message.json [HINDI] (#3611) | N1X | 2018-03-22 | 2 | -2/+819 |
| |/ / / |
|
| * | | | Merge pull request #3624 from alextsg/cb-941 | kumavis | 2018-03-21 | 9 | -198/+274 |
| |\ \ \ |
|
| | * | | | Update confirm transaction screen | Alexander Tseung | 2018-03-21 | 9 | -198/+274 |
| * | | | | Merge pull request #3625 from bradford-hamilton/master | kumavis | 2018-03-21 | 1 | -0/+819 |
| |\ \ \ \ |
|
| | * | | | | add Dutch translations | Bradford Lamson-Scribner | 2018-03-21 | 1 | -0/+819 |
| | | |_|/
| | |/| | |
|
| * | | | | Merge pull request #3641 from hermanjunge/master | kumavis | 2018-03-21 | 1 | -10/+0 |
| |\ \ \ \ |
|
| | * | | | | Nuke the es_419 locale | Herman Junge | 2018-03-21 | 1 | -10/+0 |
| | |/ / / |
|
| * | | | | Merge pull request #3585 from lazaridiscom/laz/i3568 | kumavis | 2018-03-21 | 2 | -246/+355 |
| |\ \ \ \ |
|
| | * | | | | moves setup-related code towads end of file, re #3568 | Lazaridis | 2018-03-17 | 1 | -115/+124 |
| | * | | | | add ESLint exceptions for //= and //-, re #3568 | Lazaridis | 2018-03-16 | 2 | -4/+4 |
| | * | | | | group all vault/keyring related methods together, re #3568 | Lazaridis | 2018-03-16 | 1 | -128/+130 |
| | * | | | | adds initial documentation, re #3568 | Lazaridis | 2018-03-16 | 1 | -40/+138 |
| * | | | | | Merge pull request #3504 from lazaridiscom/laz/i3427 | kumavis | 2018-03-21 | 7 | -0/+48 |
| |\ \ \ \ \ |
|
| | * | | | | | add READMEs to folders, re #3427 | Lazaridis | 2018-03-14 | 8 | -0/+49 |
| * | | | | | | Merge pull request #3640 from hermanjunge/complete-spanish | kumavis | 2018-03-21 | 1 | -274/+322 |
| |\ \ \ \ \ \ |
|
| | * | | | | | | last pass (for now) | Herman Junge | 2018-03-21 | 1 | -53/+53 |
| | * | | | | | | all 286 english strings were found in your locale | Herman Junge | 2018-03-21 | 1 | -0/+66 |
| | * | | | | | | all 264 strings declared in your locale were found in the english one | Herman Junge | 2018-03-21 | 1 | -26/+8 |
| | * | | | | | | alphabetic sort of spanish messages.json | Herman Junge | 2018-03-21 | 1 | -237/+237 |
| * | | | | | | | Gas inputs can be changed by up and down arrows (#3598) | Dan J Miller | 2018-03-21 | 2 | -0/+3 |
| |/ / / / / / |
|
* | | | | | | | i18n redux solution doesn't require importing t() and passing state to each t... | Dan | 2018-03-22 | 68 | -445/+636 |
* | | | | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into i18n-tra... | kumavis | 2018-03-21 | 49 | -217/+3983 |
|\| | | | | | |
|
| * | | | | | | Merge pull request #3635 from MetaMask/i3571-CompleteI18nTemplates | kumavis | 2018-03-21 | 12 | -108/+232 |
| |\ \ \ \ \ \ |
|
| | * | | | | | | Add i18n to tx status | Thomas | 2018-03-21 | 2 | -2/+39 |
| | * | | | | | | Merge branch 'master' into i3571-CompleteI18nTemplates | Thomas | 2018-03-21 | 37 | -107/+3699 |
| | |\ \ \ \ \ \ |
|
| | * | | | | | | | Update onlySendToEtherAddress message | Thomas | 2018-03-21 | 1 | -1/+1 |
| | * | | | | | | | Add i18n in settings/info | Thomas | 2018-03-21 | 2 | -14/+17 |
| | * | | | | | | | Started on Tx list i18n | Thomas | 2018-03-21 | 2 | -1/+7 |
| | * | | | | | | | i18n Import flow | Thomas | 2018-03-21 | 2 | -5/+5 |
| | * | | | | | | | I18n add-token.js | Thomas | 2018-03-20 | 1 | -21/+22 |
| | * | | | | | | | Remove duplicate keys | Thomas | 2018-03-20 | 1 | -7/+1 |
| | * | | | | | | | Add send screen template | Dan Finlay | 2018-03-20 | 2 | -16/+28 |
| | * | | | | | | | Add template for settings and info | Dan Finlay | 2018-03-20 | 2 | -23/+34 |
| | * | | | | | | | Add recover and backup tempaltes | Dan Finlay | 2018-03-20 | 3 | -18/+42 |
| | * | | | | | | | Add login templates | Dan Finlay | 2018-03-20 | 1 | -3/+3 |
| | * | | | | | | | Add connecting indication templates | Dan Finlay | 2018-03-20 | 2 | -6/+42 |
| | | |_|_|/ / /
| | |/| | | | | |
|
| * | | | | | | | Merge pull request #3638 from MetaMask/DocumentTranslationScript | kumavis | 2018-03-21 | 1 | -1/+9 |
| |\ \ \ \ \ \ \ |
|
| | * | | | | | | | Document translation script | Dan Finlay | 2018-03-21 | 1 | -1/+9 |
| | | |/ / / / /
| | |/| | | | | |
|
| * | | | | | | | Merge pull request #3632 from MetaMask/retry-tx-refractor | kumavis | 2018-03-21 | 3 | -1/+35 |
| |\ \ \ \ \ \ \
| | |/ / / / / /
| |/| | | | | | |
|
| | * | | | | | | Take user home if an unapproved tx is dropped while they are viewing. | Dan | 2018-03-21 | 1 | -0/+18 |
| | * | | | | | | Fix styling regression from master merge. | Dan | 2018-03-20 | 1 | -1/+1 |
| | * | | | | | | Improve responsiveness of gas price row on confirm screen. | Dan | 2018-03-20 | 1 | -0/+16 |
| * | | | | | | | Merge pull request #3633 from hermanjunge/spanish | Thomas Huang | 2018-03-21 | 1 | -5/+835 |
| |\ \ \ \ \ \ \ |
|
| | * | | | | | | | Add messages.json from @Grana69 | Grana69 | 2018-03-21 | 1 | -5/+835 |
| |/ / / / / / / |
|
| * | | | | | | | Merge pull request #3612 from hermanjunge/locale-verification | Thomas Huang | 2018-03-21 | 1 | -0/+96 |
| |\ \ \ \ \ \ \ |
|
| | * | | | | | | | Move file to development, fix JS | Herman Junge | 2018-03-21 | 1 | -13/+13 |
| | * | | | | | | | Add script to verify locale strings | Herman Junge | 2018-03-20 | 1 | -0/+96 |
| | | |/ / / / /
| | |/| | | | | |
|
| * | | | | | | | Merge pull request #3613 from alvesjtiago/master | kumavis | 2018-03-21 | 1 | -0/+819 |
| |\ \ \ \ \ \ \ |
|
| | * | | | | | | | Portuguese translations. | Tiago Alves | 2018-03-20 | 1 | -0/+819 |
| * | | | | | | | | Merge pull request #3579 from matteopey/italian-translation | kumavis | 2018-03-21 | 1 | -0/+819 |
| |\ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | Update translation based on the new message.json | matteopey | 2018-03-20 | 1 | -1/+211 |
| | * | | | | | | | | Clients because we mean Ethereum clients | matteopey | 2018-03-16 | 1 | -1/+1 |
| | * | | | | | | | | Fix as requested by review | matteopey | 2018-03-16 | 1 | -1/+1 |
| | * | | | | | | | | Add italian translation | matteopey | 2018-03-16 | 1 | -0/+609 |
| * | | | | | | | | | Merge pull request #3623 from MetaMask/i#3554 | kumavis | 2018-03-21 | 1 | -0/+2 |
| |\ \ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | new-ui - dont exclude `txParams.data` when editing and updating txParams | frankiebee | 2018-03-20 | 1 | -0/+2 |
| | | |_|/ / / / / /
| | |/| | | | | | | |
|
| * | | | | | | | | | Merge pull request #3605 from lazaridiscom/master | kumavis | 2018-03-21 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | use mkdirp for cross-platform, re #3426 | Lazaridis | 2018-03-18 | 1 | -1/+1 |
| | | |_|/ / / / / /
| | |/| | | | | | | |
|
| * | | | | | | | | | Merge pull request #3574 from marvinvista/master | kumavis | 2018-03-21 | 1 | -0/+609 |
| |\ \ \ \ \ \ \ \ \
| | |_|_|_|_|_|_|/ /
| |/| | | | | | | | |
|
| | * | | | | | | | | Translate to Tagalog #3535 | Marvin Vista | 2018-03-15 | 1 | -1/+1 |
| | * | | | | | | | | Translate to Tagalog #3535 | Marvin Vista | 2018-03-15 | 1 | -0/+609 |
| * | | | | | | | | | Merge pull request #3628 from ryan-rowland/3505_Transpile_to_ES5 | Dan Finlay | 2018-03-21 | 2 | -2/+8 |
| |\ \ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | Issue 3505 | Transpile to ES5 | Ryan Rowland | 2018-03-20 | 2 | -2/+8 |
| | | |_|/ / / / / /
| | |/| | | | | | | |
|
| * | | | | | | | | | Merge pull request #3489 from MetaMask/retry-tx-refractor | Thomas Huang | 2018-03-21 | 23 | -86/+485 |
| |\ \ \ \ \ \ \ \ \
| | | |_|_|_|/ / / /
| | |/| | | | | | | |
|
| | * | | | | | | | | Merge branch 'master' into retry-tx-refractor | Dan | 2018-03-20 | 10 | -13/+25 |
| | |\ \ \ \ \ \ \ \
| | |/ / / / / / / /
| |/| | | | | | | | |
|
| * | | | | | | | | | Fix Account Names being cropped (#3626) | Alexander Tseung | 2018-03-20 | 6 | -11/+6 |
| * | | | | | | | | | Don't block user from setting gas if estimating gas returns errors. (#3627) | Dan J Miller | 2018-03-20 | 4 | -2/+19 |
| | |/ / / / / / /
| |/| | | | | | | |
|
| | * | | | | | | | Merge branch 'master' into retry-tx-refractor | Dan | 2018-03-20 | 59 | -3246/+3744 |
| | |\ \ \ \ \ \ \
| | |/ / / / / / /
| |/| | | | | | | |
|
| | * | | | | | | | Merge branch 'retry-tx-refractor' of https://github.com/MetaMask/metamask-ext... | frankiebee | 2018-03-16 | 3 | -22/+49 |
| | |\ \ \ \ \ \ \ |
|
| | | * | | | | | | | Set retry gasPrice to forceGasMin on confirm screen in cases where gas is not... | Dan | 2018-03-15 | 2 | -4/+34 |
| | | * | | | | | | | Force gas min has correct precision and is set when editing gas if max. | Dan | 2018-03-15 | 3 | -7/+8 |
| | | * | | | | | | | Ensure changes from customize gas modal opened from confirm screen are captur... | Dan | 2018-03-15 | 2 | -12/+8 |
| | | * | | | | | | | Revert 'Set txMeta.time to reflect time of tx approval.' | Dan | 2018-03-15 | 1 | -3/+3 |
| | | * | | | | | | | Merge branch 'master' into retry-tx-refractor | Dan | 2018-03-15 | 5 | -9/+640 |
| | | |\ \ \ \ \ \ \ |
|
| | | * \ \ \ \ \ \ \ | Merge branch 'master' into retry-tx-refractor | Dan | 2018-03-14 | 1 | -1/+1 |
| | | |\ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | | add to CHANGELOG.md | frankiebee | 2018-03-16 | 1 | -0/+1 |
| | * | | | | | | | | | | Merge branch 'master' into retry-tx-refractor | frankiebee | 2018-03-16 | 4 | -460/+260 |
| | |\ \ \ \ \ \ \ \ \ \
| | | | |_|_|_|_|/ / / /
| | | |/| | | | | | | | |
|
| | * | | | | | | | | | | Merge branch 'master' into retry-tx-refractor | frankiebee | 2018-03-15 | 8 | -12/+643 |
| | |\ \ \ \ \ \ \ \ \ \
| | | | |_|_|_|/ / / / /
| | | |/| | | | | | | | |
|
| | * | | | | | | | | | | Merge branch 'master' into retry-tx-refractor | frankiebee | 2018-03-15 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | | | fix destructuring of variables | frankiebee | 2018-03-14 | 1 | -1/+1 |
| | | |_|_|/ / / / / / /
| | |/| | | | | | | | | |
|
| | * | | | | | | | | | | Fix tests. | Dan | 2018-03-14 | 3 | -6/+6 |
| | * | | | | | | | | | | Fix TransactionStateManager spelling. | Dan | 2018-03-14 | 1 | -2/+2 |
| | * | | | | | | | | | | Merge branch 'master' into retry-tx-refractor | Dan | 2018-03-14 | 101 | -2026/+3530 |
| | |\ \ \ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | | | Fix more lint errors. | Dan | 2018-03-14 | 3 | -11/+2 |
| | * | | | | | | | | | | | Remove unnecessary addition of nonce to state. | Dan | 2018-03-14 | 3 | -10/+0 |
| | * | | | | | | | | | | | Make token confirmations compatible. | Dan | 2018-03-14 | 2 | -14/+88 |
| | * | | | | | | | | | | | Fix tx-list-item submitted check. | Dan | 2018-03-14 | 1 | -1/+1 |
| | * | | | | | | | | | | | Adds styles for dropped txs in old-ui. | Dan | 2018-03-14 | 2 | -0/+9 |
| | * | | | | | | | | | | | Correctly set latest submitted retry with nonces that matches others in old-u... | Dan | 2018-03-14 | 1 | -1/+1 |
| | * | | | | | | | | | | | Use correct name for submittedTime field in tx-list.js | Dan | 2018-03-14 | 1 | -1/+1 |
| | * | | | | | | | | | | | Use correct var name in new-ui showRetryButton | Dan | 2018-03-14 | 1 | -1/+1 |
| | * | | | | | | | | | | | Undefined check in showRetryButton | Dan | 2018-03-14 | 2 | -6/+8 |
| | * | | | | | | | | | | | Styling for dropped. | Dan | 2018-03-14 | 2 | -0/+5 |
| | * | | | | | | | | | | | Use new submittedTime field to correctly show retry button in old and new ui. | Dan | 2018-03-14 | 5 | -13/+19 |
| | * | | | | | | | | | | | transactions - return the txMeta in retryTransaction | frankiebee | 2018-03-14 | 1 | -2/+3 |
| | * | | | | | | | | | | | tests - add tests for transactions#retryTransaction and transactions#_markNon... | frankiebee | 2018-03-14 | 1 | -1/+44 |
| | * | | | | | | | | | | | transactions:state - add a submittedTime stamp so the ui has a better grasp o... | frankiebee | 2018-03-14 | 1 | -0/+4 |
| | * | | | | | | | | | | | Set txMeta.time to reflect time of tx approval. | Dan | 2018-03-13 | 1 | -3/+3 |
| | * | | | | | | | | | | | Improve phrasing of copy. | Dan | 2018-03-13 | 2 | -2/+2 |
| | * | | | | | | | | | | | Fix gas calculation and nonce / forceGasMin state setting errors; retry butto... | Dan | 2018-03-13 | 3 | -25/+39 |
| | * | | | | | | | | | | | Lint fixes. | Dan | 2018-03-09 | 2 | -3/+1 |
| | * | | | | | | | | | | | Merge branch 'master' into retry-tx-refractor | Dan | 2018-03-09 | 38 | -306/+24463 |
| | |\ \ \ \ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | | | | Adds inline opening of gas customization to confirm-send-ether screen. | Dan | 2018-03-09 | 3 | -10/+63 |
| | * | | | | | | | | | | | | Retry transaction logic added to tx-list-item, confirm-send-ether, customize-... | Dan | 2018-03-09 | 9 | -16/+113 |
| | * | | | | | | | | | | | | Add html and css for responsive retry button. | Dan | 2018-03-09 | 3 | -0/+57 |
| | * | | | | | | | | | | | | fix marking of confirmed transaction as dropped | frankiebee | 2018-03-09 | 1 | -1/+1 |
| | * | | | | | | | | | | | | transactions - make _markNonceDuplicatesDropped | frankiebee | 2018-03-08 | 1 | -21/+20 |
| | * | | | | | | | | | | | | Merge branch 'master' into retry-tx-refractor | frankiebee | 2018-03-08 | 53 | -238/+3612 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | | | | | refactor retrytx with higher gas price: | frankiebee | 2018-03-08 | 2 | -26/+55 |
* | | | | | | | | | | | | | | | Lint fixes. | Dan | 2018-03-20 | 16 | -11/+19 |
* | | | | | | | | | | | | | | | Merge branch 'master' into i18n-translator-redux | Dan | 2018-03-20 | 3 | -7/+176 |
|\| | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | Merge pull request #3594 from danjm/i3344-improve-currency-input | Thomas Huang | 2018-03-20 | 3 | -7/+176 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | | | | | | Use customized react-trigger-change in send-new-ui integration tests.. | Dan | 2018-03-19 | 2 | -1/+162 |
| | * | | | | | | | | | | | | | | Currency input defaults to empty string | Dan | 2018-03-17 | 1 | -6/+14 |
* | | | | | | | | | | | | | | | | Fixed t() calls where localeMessages is missing; and fix incorrect connect re... | Dan | 2018-03-20 | 18 | -24/+29 |
* | | | | | | | | | | | | | | | | Merge branch 'master' into i18n-translator-redux | Dan | 2018-03-20 | 58 | -3688/+3208 |
|\| | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | Remove unused files from ui folder. (#3577) | anticlimactic | 2018-03-19 | 30 | -2510/+3 |
| * | | | | | | | | | | | | | | | Make entire gray container of 'reveal seed phrase' a clickable area. (#3596) | Dan J Miller | 2018-03-19 | 1 | -4/+6 |
| | |_|_|_|_|_|_|_|_|_|/ / / /
| |/| | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | Merge pull request #3555 from mamiM/mamiM-Ja-translation | kumavis | 2018-03-18 | 1 | -3/+602 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | | | | | | Translation to Japanese | Mami Mordovets | 2018-03-14 | 1 | -3/+602 |
| | | |_|_|_|/ / / / / / / / /
| | |/| | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | Merge pull request #3560 from Orangem21/master | kumavis | 2018-03-18 | 1 | -3/+602 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | | | | | | fix | Orange | 2018-03-15 | 1 | -2/+2 |
| | * | | | | | | | | | | | | | | Merge pull request #2 from MetaMask/master | Orange | 2018-03-15 | 9 | -6/+108 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|_|_|_|_|_|_|/ / / / /
| | | |/| | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | Merge pull request #1 from Orangem21/yuanaichi | Orange | 2018-03-14 | 1 | -103/+103 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | | | | | fix | Orange | 2018-03-14 | 1 | -1/+1 |
| | | * | | | | | | | | | | | | | | yuanaichi | yuanchao | 2018-03-14 | 1 | -102/+102 |
| | |/ / / / / / / / / / / / / / |
|
| | * | | | | | | | | | | | | | | fix | Orange | 2018-03-14 | 1 | -30/+30 |
| | * | | | | | | | | | | | | | | fix | Orange | 2018-03-14 | 1 | -1/+1 |
| | * | | | | | | | | | | | | | | update | Orange | 2018-03-14 | 1 | -3/+602 |
| * | | | | | | | | | | | | | | | Merge pull request #3602 from vietlq/master | kumavis | 2018-03-18 | 2 | -0/+619 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | | | | | | | space | Viet Le | 2018-03-18 | 1 | -1/+1 |
| | * | | | | | | | | | | | | | | | corrected vn -> vi | Viet Le | 2018-03-18 | 2 | -0/+10 |
| | * | | | | | | | | | | | | | | | Translated to Vietnamese. Translator: Trang Ha, Editor: Viet Le | Viet Le | 2018-03-18 | 1 | -0/+609 |
| | * | | | | | | | | | | | | | | | Merge pull request #1 from MetaMask/master | Le Quoc Viet | 2018-03-15 | 493 | -3078/+85254 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|_|_|_|_|_|_|/ / / / / /
| | | |/| | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | Merge pull request #3564 from nujabes403/patch-1 | kumavis | 2018-03-18 | 1 | -5/+604 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | | | | | | | | Update messages.json | nujabes403 | 2018-03-16 | 1 | -1/+1 |
| | * | | | | | | | | | | | | | | | | Update messages.json | nujabes403 | 2018-03-16 | 1 | -1/+1 |
| | * | | | | | | | | | | | | | | | | Update messages.json | nujabes403 | 2018-03-16 | 1 | -16/+16 |
| | * | | | | | | | | | | | | | | | | Update messages.json | nujabes403 | 2018-03-16 | 1 | -2/+2 |
| | * | | | | | | | | | | | | | | | | Update messages.json | nujabes403 | 2018-03-16 | 1 | -1/+1 |
| | * | | | | | | | | | | | | | | | | Translated whole message in KR | nujabes403 | 2018-03-15 | 1 | -109/+109 |
| | * | | | | | | | | | | | | | | | | Update kr translation to messages.json | nujabes403 | 2018-03-15 | 1 | -5/+604 |
| | | |_|_|/ / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | Merge pull request #3603 from vietlq/patch-2 | Dan Finlay | 2018-03-18 | 1 | -10/+8 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | | | | | | | | Update add-to-chrome.md | Le Quoc Viet | 2018-03-18 | 1 | -0/+2 |
| | * | | | | | | | | | | | | | | | | Small edits | Le Quoc Viet | 2018-03-18 | 1 | -10/+6 |
| |/ / / / / / / / / / / / / / / / |
|
| * | | | | | | | | | | | | | | | | Fix styling on confirm-send-ether and confirm-send-token (#3600) | Alexander Tseung | 2018-03-17 | 4 | -226/+232 |
| * | | | | | | | | | | | | | | | | Merge pull request #3590 from SaptakS/feature/whitelist | Dan Finlay | 2018-03-17 | 1 | -1/+16 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | | | | | | | | Inject Script: Blacklist domains where not to inject script | Saptak Sengupta | 2018-03-17 | 1 | -1/+16 |
| | | |_|/ / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | Update Confirm Contract screen (#3597) | Alexander Tseung | 2018-03-17 | 9 | -322/+448 |
| * | | | | | | | | | | | | | | | | Fix messages typo (#3591) | Thomas Huang | 2018-03-17 | 1 | -1/+1 |
| * | | | | | | | | | | | | | | | | Update margins for consistency in first time flow (#3588) | Alexander Tseung | 2018-03-16 | 6 | -150/+214 |
| | |_|_|_|_|/ / / / / / / / / /
| |/| | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | Merge pull request #3587 from MetaMask/i18n | Dan Finlay | 2018-03-16 | 1 | -0/+210 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ /
| |/| | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | More for i18n | Thomas | 2018-03-16 | 1 | -0/+210 |
| |/ / / / / / / / / / / / / / |
|
| * | | | | | | | | | | | | | | Merge pull request #3576 from Senshii/master | kumavis | 2018-03-16 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | |_|_|_|_|_|_|_|_|_|/ / / /
| |/| | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | fix plural in french translation | simon fourdinier | 2018-03-15 | 1 | -1/+1 |
| | |/ / / / / / / / / / / / |
|
| * / / / / / / / / / / / / | Update Deposit Eth icon (#3569) | Alexander Tseung | 2018-03-16 | 4 | -460/+260 |
| |/ / / / / / / / / / / / |
|
* | | | | | | | | | | | | | Delete commented out code from i18n implementation that used globals. | Dan | 2018-03-20 | 1 | -5/+0 |
* | | | | | | | | | | | | | Delete old i18n helper files. | Dan | 2018-03-20 | 2 | -76/+0 |
* | | | | | | | | | | | | | Fetch localeMessages in front end only. | Dan | 2018-03-20 | 3 | -16/+8 |
* | | | | | | | | | | | | | Handle i18n with redux. | Dan | 2018-03-16 | 88 | -385/+538 |
* | | | | | | | | | | | | | ui - settings - add option to set current locale | kumavis | 2018-03-15 | 1 | -0/+45 |
* | | | | | | | | | | | | | Translation to Japanese | Mami Mordovets | 2018-03-15 | 1 | -3/+602 |
* | | | | | | | | | | | | | i18n - load locales manually | kumavis | 2018-03-15 | 39 | -118/+197 |
|/ / / / / / / / / / / / |
|
* | | | | | | | | | | | | Merge pull request #3558 from MetaMask/fix-two-translations | Thomas Huang | 2018-03-15 | 2 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | Fix translations whose substitutions params were not in arrays. | Dan | 2018-03-14 | 2 | -2/+2 |
| | |_|_|/ / / / / / / /
| |/| | | | | | | | | | |
|
* | | | | | | | | | | | | Merge pull request #3562 from MetaMask/danfinlay-patch-1 | kumavis | 2018-03-15 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \
| |_|_|_|_|_|_|_|_|/ / /
|/| | | | | | | | | | | |
|
| * | | | | | | | | | | | Grammar correction | Dan Finlay | 2018-03-15 | 1 | -1/+1 |
| | |/ / / / / / / / /
| |/| | | | | | | | | |
|
* | | | | | | | | | | | Merge pull request #3545 from vincentlg/master | kumavis | 2018-03-15 | 1 | -0/+609 |
|\ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | Update messages.json | Vincent Le Gallic | 2018-03-15 | 1 | -12/+12 |
| * | | | | | | | | | | | Add French translation | Vincent Le Gallic | 2018-03-14 | 1 | -0/+609 |
| | |_|_|/ / / / / / /
| |/| | | | | | | | | |
|
* | | | | | | | | | | | Merge pull request #3565 from MetaMask/local-store-fix | Dan Finlay | 2018-03-15 | 4 | -9/+31 |
|\ \ \ \ \ \ \ \ \ \ \
| |_|/ / / / / / / / /
|/| | | | | | | | | | |
|
| * | | | | | | | | | | local-store - fix class syntax | kumavis | 2018-03-15 | 1 | -2/+2 |
| * | | | | | | | | | | local-store - check for error from extension.runtime | kumavis | 2018-03-15 | 1 | -3/+28 |
| * | | | | | | | | | | deps - use pify instead of util.promisify | kumavis | 2018-03-15 | 3 | -5/+3 |
| * | | | | | | | | | | local-store - fix promisification of methods | kumavis | 2018-03-15 | 1 | -3/+2 |
|/ / / / / / / / / / |
|
* | | | | | | | | | | Merge pull request #3559 from MetaMask/fix-promisify-ref | Dan Finlay | 2018-03-14 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \
| |_|/ / / / / / / /
|/| | | | | | / / /
| | |_|_|_|_|/ / /
| |/| | | | | | | |
|
| * | | | | | | | | fix destructuring of variables | frankiebee | 2018-03-14 | 1 | -1/+1 |
|/ / / / / / / / |
|
* | | | | | | | | Merge pull request #3083 from MetaMask/i3076-UseStorageLocalInstead | kumavis | 2018-03-14 | 6 | -4/+75 |
|\ \ \ \ \ \ \ \ |
|
| * \ \ \ \ \ \ \ | Merge branch 'master' into i3076-UseStorageLocalInstead | kumavis | 2018-03-14 | 4 | -2/+32 |
| |\ \ \ \ \ \ \ \
| |/ / / / / / / /
|/| | | | | | | | |
|
* | | | | | | | | | Merge pull request #3551 from MetaMask/i#3509 | kumavis | 2018-03-14 | 2 | -2/+7 |
|\ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | tx-gas-utils - fix code style | kumavis | 2018-03-14 | 1 | -1/+1 |
| * | | | | | | | | | Merge branch 'i#3509' of https://github.com/MetaMask/metamask-extension into ... | frankiebee | 2018-03-14 | 1 | -1/+2 |
| |\ \ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | changelog - update "txParams.to" validation note | kumavis | 2018-03-14 | 1 | -1/+2 |
| * | | | | | | | | | | transactions move validation of the to field to validateRecipient | frankiebee | 2018-03-14 | 1 | -7/+3 |
| |/ / / / / / / / / |
|
| * | | | | | | | | | Merge remote-tracking branch 'origin/i#3509' into i#3509 | frankiebee | 2018-03-14 | 117 | -1446/+27032 |
| |\ \ \ \ \ \ \ \ \ |
|
| | * \ \ \ \ \ \ \ \ | Merge branch 'master' into i#3509 | Frankie | 2018-03-14 | 117 | -1446/+27032 |
| | |\ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | fix error message | frankiebee | 2018-03-14 | 1 | -1/+1 |
| |/ / / / / / / / / / |
|
| * | | | | | | | | | | add to CHANGELOG.md | frankiebee | 2018-03-14 | 1 | -0/+1 |
| * | | | | | | | | | | transactions - insure if a to field in tx params has a truthy valu that it is... | frankiebee | 2018-03-14 | 1 | -1/+7 |
| | |_|_|_|_|/ / / /
| |/| | | | | | | | |
|
* | | | | | | | | | | Merge pull request #3552 from MetaMask/danfinlay-patch-1 | Thomas Huang | 2018-03-14 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \
| |_|/ / / / / / / /
|/| | | | | | | | | |
|
| * | | | | | | | | | Fix grammar | Dan Finlay | 2018-03-14 | 1 | -1/+1 |
|/ / / / / / / / / |
|
* | | | | | | | | | Merge pull request #3546 from MetaMask/TheCriw-patch-1 | Thomas Huang | 2018-03-14 | 2 | -0/+26 |
|\ \ \ \ \ \ \ \ \
| |_|_|/ / / / / /
|/| | | | | | | | |
|
| * | | | | | | | | ui - lint fix | kumavis | 2018-03-14 | 2 | -2/+2 |
| * | | | | | | | | Merge pull request #3445 from TheCriw/i3440-seed-restore-trim-invalid-characters | kumavis | 2018-03-14 | 2 | -0/+26 |
|/| | | | | | | | |
|
| * | | | | | | | | FIX #3440 improved verification of restore from seed phrase | criw | 2018-03-06 | 2 | -0/+26 |
| | | * | | | | | | Update CHANGELOG.md | kumavis | 2018-03-14 | 1 | -2/+3 |
| | | * | | | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into i3076-Us... | kumavis | 2018-03-14 | 96 | -1055/+36969 |
| | | |\ \ \ \ \ \
| |_|_|/ / / / / /
|/| | | | | | | | |
|
* | | | | | | | | | Merge pull request #3538 from MetaMask/lazaridiscom-patch-1 | Dan Finlay | 2018-03-14 | 2 | -3/+14 |
|\ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | deps - update package-lock | kumavis | 2018-03-14 | 1 | -0/+10 |
| * | | | | | | | | | use 'cross-env' for env-variables within npm scripts, re #3426 | Lazaridis | 2018-03-14 | 1 | -3/+4 |
|/ / / / / / / / / |
|
* | | | | | | | | | Merge pull request #3456 from MetaMask/i18n | kumavis | 2018-03-14 | 63 | -352/+1038 |
|\ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | Update Changelog | Thomas | 2018-03-14 | 1 | -1/+1 |
| * | | | | | | | | | Merge branch 'master' into i18n | Thomas Huang | 2018-03-14 | 1 | -0/+5 |
| |\ \ \ \ \ \ \ \ \
| |/ / / / / / / / /
|/| | | | | | | | | |
|
* | | | | | | | | | | Merge pull request #3527 from danjm/changelog-updates-march13 | kumavis | 2018-03-14 | 1 | -0/+5 |
|\ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | Changlog updates for PRs 3468, 3470 and 3495. | Dan | 2018-03-14 | 1 | -0/+5 |
| | * | | | | | | | | | Update Changelog | Thomas | 2018-03-14 | 1 | -0/+1 |
| | * | | | | | | | | | Remove windows.h from i18n.js | Thomas | 2018-03-14 | 1 | -1/+0 |
| | * | | | | | | | | | Add closing parens to appName | Thomas | 2018-03-14 | 1 | -1/+1 |
| | * | | | | | | | | | Merge branch 'master' into i18n | Thomas Huang | 2018-03-14 | 26 | -455/+646 |
| | |\ \ \ \ \ \ \ \ \
| |_|/ / / / / / / / /
|/| | | | | | | | | | |
|
* | | | | | | | | | | | Merge pull request #3468 from danjm/i3033-responsive-newui-onboarding | kumavis | 2018-03-14 | 9 | -13/+232 |
|\ \ \ \ \ \ \ \ \ \ \
| |/ / / / / / / / / /
|/| | | | | | | | | | |
|
| * | | | | | | | | | | Merge branch 'master' into i3033-responsive-newui-onboarding | kumavis | 2018-03-14 | 48 | -934/+24189 |
| |\ \ \ \ \ \ \ \ \ \
| |/ / / / / / / / / /
|/| | | | | | | | | | |
|
* | | | | | | | | | | | Merge pull request #3470 from danjm/newui-onboarding-fonts | kumavis | 2018-03-14 | 2 | -24/+34 |
|\ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | Update first time flow button fonts, and first-time-flow default font, to Rob... | Dan | 2018-03-08 | 2 | -1/+3 |
| * | | | | | | | | | | | Change fonts in new-ui onboarding to Roboto, with weight 400. | Dan | 2018-03-08 | 1 | -23/+31 |
* | | | | | | | | | | | | Merge pull request #3495 from alextsg/cb-290 | kumavis | 2018-03-14 | 5 | -99/+93 |
|\ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | Increase tap areas for menu buttons on mobile | Alexander Tseung | 2018-03-10 | 5 | -99/+93 |