Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix confirmation popup not always opening | Alexander Tseung | 2018-04-17 | 6 | -53/+83 |
* | Merge branch 'master' into i3981-contract-rates | Dan Finlay | 2018-04-17 | 18 | -9/+930 |
|\ | |||||
| * | Merge pull request #3970 from MetaMask/i3651-removeGlobalLog | Dan Finlay | 2018-04-17 | 16 | -9/+17 |
| |\ | |||||
| | * | Require loglevel singleton in each module that uses it | bitpshr | 2018-04-14 | 16 | -9/+17 |
| * | | Fix vault translation | Martin Šmíd | 2018-04-14 | 1 | -4/+4 |
| * | | Add czech translation | Martin Šmíd | 2018-04-14 | 2 | -0/+913 |
| |/ | |||||
* | | Disable token price polling when no client is active | bitpshr | 2018-04-17 | 3 | -0/+13 |
* | | Maintain token prices using a background service | bitpshr | 2018-04-16 | 2 | -0/+83 |
|/ | |||||
* | Add tests for ComposableObservableStore | bitpshr | 2018-04-14 | 1 | -11/+11 |
* | Add ComposableObservableStore for subscription management | bitpshr | 2018-04-13 | 2 | -70/+85 |
* | Merge pull request #3938 from nyatla/master | kumavis | 2018-04-10 | 1 | -27/+72 |
|\ | |||||
| * | Merge tag 'v4.5.5' | nyatla | 2018-04-10 | 52 | -561/+1145 |
| |\ | |||||
| * | | Update messages.json | R.IIzuka | 2018-04-10 | 1 | -30/+99 |
* | | | Translate to Turkish (#3876) | Mert Ozdag | 2018-04-10 | 2 | -0/+913 |
* | | | Merge pull request #3921 from MetaMask/gh-3736-react-router | kumavis | 2018-04-10 | 1 | -1/+2 |
|\ \ \ | |||||
| * \ \ | Merge branch 'master' of https://github.com/MetaMask/metamask-extension into ... | Alexander Tseung | 2018-04-06 | 10 | -36/+198 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'master' of https://github.com/MetaMask/metamask-extension into ... | Alexander Tseung | 2018-04-05 | 7 | -39/+111 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'master' of https://github.com/MetaMask/metamask-extension into ... | Alexander Tseung | 2018-04-04 | 12 | -42/+47 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'master' of https://github.com/MetaMask/metamask-extension into ... | Alexander Tseung | 2018-04-03 | 1 | -2/+2 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Fix merge conflicts. Modify send workflow | Alexander Tseung | 2018-04-03 | 11 | -184/+275 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'master' of https://github.com/MetaMask/metamask-extension into ... | Alexander Tseung | 2018-03-31 | 2 | -3/+8 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Fix merge conflicts | Alexander Tseung | 2018-03-31 | 9 | -48/+62 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Fix i18n merge conflicts | Alexander Tseung | 2018-03-30 | 20 | -173/+404 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Fix merge conflicts | Alexander Tseung | 2018-03-27 | 50 | -369/+14482 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'uat-next' of https://github.com/MetaMask/metamask-extension int... | Alexander Tseung | 2018-02-09 | 7 | -10/+89 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Fix merge conflicts from uat-next | Alexander Tseung | 2018-02-01 | 7 | -4/+86 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'uat' of https://github.com/MetaMask/metamask-extension into cb-254 | Alexander Tseung | 2018-01-30 | 20 | -75/+579 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | Add react-router to allow use of the browser back button | Alexander Tseung | 2017-12-15 | 1 | -1/+2 |
* | | | | | | | | | | | | | | | | Merge pull request #3922 from MetaMask/empty-vault-fix | kumavis | 2018-04-07 | 1 | -3/+31 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | metamask - never persist if state is missing | kumavis | 2018-04-07 | 1 | -1/+4 |
| * | | | | | | | | | | | | | | | | metamask - never persist if state is missing data | kumavis | 2018-04-07 | 1 | -3/+6 |
| * | | | | | | | | | | | | | | | | metamask - attempt recovery from empty vault | kumavis | 2018-04-07 | 1 | -0/+22 |
* | | | | | | | | | | | | | | | | | Merge pull request #3917 from MetaMask/kumavis-patch-3 | Frankie | 2018-04-07 | 1 | -2/+4 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | tx-state-manager - dont remove old tx history if candidate is not found | kumavis | 2018-04-07 | 1 | -2/+4 |
| |/ / / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | | | 4.5.5v4.5.5 | kumavis | 2018-04-07 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | | v4.5.4 | kumavis | 2018-04-07 | 1 | -1/+1 |
|/ / / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | / / | migrations - back fixes | frankiebee | 2018-04-06 | 8 | -88/+115 |
| |_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | create migration 25 | frankiebee | 2018-04-06 | 2 | -0/+62 |
* | | | | | | | | | | | | | | meta - create a migration template | frankiebee | 2018-04-06 | 1 | -0/+29 |
* | | | | | | | | | | | | | | Merge pull request #3857 from MetaMask/match-local-localecodes | kumavis | 2018-04-06 | 1 | -2/+4 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | Map existingLocaleCodes and userPreferredLocaleCodes to lower case in get-fir... | Dan | 2018-04-04 | 1 | -2/+4 |
| * | | | | | | | | | | | | | | Ensure get-first-preferred-lang-code.js matches locale codes from local direc... | Dan | 2018-04-04 | 1 | -1/+1 |
| | |_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | Merge pull request #3887 from MetaMask/i#3886 | kumavis | 2018-04-06 | 1 | -19/+18 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | transactions - _normalizeTxParams will now return a new object for txParams | frankiebee | 2018-04-06 | 1 | -31/+18 |
| * | | | | | | | | | | | | | | transactions - remove unnecessary keys on txParams | frankiebee | 2018-04-05 | 1 | -0/+12 |
| | |_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | Merge pull request #3900 from MetaMask/migration-error-report | Frankie | 2018-04-06 | 4 | -14/+80 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | migrator - dont overwrite error stack and warn to console | kumavis | 2018-04-06 | 1 | -2/+5 |
| * | | | | | | | | | | | | | | migrator - fix typo | kumavis | 2018-04-06 | 1 | -1/+1 |
| * | | | | | | | | | | | | | | migrations - report migrations errors to sentry with vault structure | kumavis | 2018-04-06 | 4 | -14/+77 |
* | | | | | | | | | | | | | | | Merge pull request #3892 from alextsg/gh-3891 | kumavis | 2018-04-06 | 1 | -0/+4 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | Fix populating txParams with undefined data | Alexander Tseung | 2018-04-06 | 1 | -0/+4 |
| | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |||||
* / | | | | | | | | | | | | | | make migration-24 compat with first-time-state | frankiebee | 2018-04-06 | 1 | -1/+1 |
|/ / / / / / / / / / / / / / | |||||
* / / / / / / / / / / / / / | 4.5.3 | kumavis | 2018-04-05 | 1 | -1/+1 |
|/ / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | transactions - make #_validateTxParams not async and "linting" wink wink nudg... | frankiebee | 2018-04-05 | 1 | -7/+12 |
* | | | | | | | | | | | | | Merge branch 'master' of https://github.com/MetaMask/metamask-extension into ... | frankiebee | 2018-04-05 | 3 | -3/+7 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | 4.5.2v4.5.2 | kumavis | 2018-04-05 | 1 | -1/+1 |
| * | | | | | | | | | | | | | tx - txParams - allow chainId to be a hex string | kumavis | 2018-04-04 | 1 | -1/+1 |
| * | | | | | | | | | | | | | Add webby awards to web3 block list. | Dan Finlay | 2018-04-04 | 1 | -1/+5 |
| | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | | hot-fix - migrate unaproved txParams so that the from is lowercase | frankiebee | 2018-04-05 | 2 | -0/+46 |
* | | | | | | | | | | | | | transactions - normalize txParams | frankiebee | 2018-04-05 | 2 | -36/+53 |
|/ / / / / / / / / / / / | |||||
* | | | | | | | | | | | | Merge pull request #3834 from MetaMask/3734 | kumavis | 2018-04-04 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Address Add Token design feedback | David Yoo | 2018-04-03 | 1 | -1/+1 |
* | | | | | | | | | | | | | 4.5.1v.4.5.1 | kumavis | 2018-04-04 | 1 | -1/+1 |
* | | | | | | | | | | | | | tx-state-manager - validateTxParams - validate chainId is Number | kumavis | 2018-04-04 | 1 | -2/+10 |
* | | | | | | | | | | | | | transactions - dont throw if chain id is not a string | frankiebee | 2018-04-04 | 1 | -2/+2 |
* | | | | | | | | | | | | | app - currency - fix typo + prefer log over console | kumavis | 2018-04-04 | 1 | -2/+3 |
* | | | | | | | | | | | | | app - currency - fix typo | kumavis | 2018-04-04 | 1 | -1/+1 |
* | | | | | | | | | | | | | app - warn on fetch errors instead of spamming sentry | kumavis | 2018-04-04 | 4 | -32/+28 |
* | | | | | | | | | | | | | build - correctly set METAMASK_ENV via envify | kumavis | 2018-04-04 | 5 | -6/+6 |
| |/ / / / / / / / / / / |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | 4.5.0 | kumavis | 2018-04-03 | 1 | -2/+2 |
| |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | |||||
* | | | | | | | | | | | Merge pull request #3831 from MetaMask/i#3770 | Frankie | 2018-04-03 | 2 | -4/+14 |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | transactions gasLimit - use the block gasLimit if getCode fails | frankiebee | 2018-04-03 | 2 | -3/+6 |
| * | | | | | | | | | | transactions validationt - valdate from field on txParams | frankiebee | 2018-04-03 | 1 | -1/+8 |
* | | | | | | | | | | | Merge pull request #3825 from danjm/i3668-warnusertxsimulationfails | Thomas Huang | 2018-04-03 | 1 | -0/+3 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Adds simulation failure error messages to confirm screen. | Dan | 2018-04-03 | 1 | -0/+3 |
| | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | lint - i18n - ru - lint fix | kumavis | 2018-04-03 | 1 | -0/+1 |
* | | | | | | | | | | | Merge branch 'master' into i18n-helper | kumavis | 2018-04-03 | 15 | -235/+349 |
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | |||||
| * | | | | | | | | | | Merge pull request #3783 from gornov/master | kumavis | 2018-04-03 | 1 | -172/+250 |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | |||||
| | * | | | | | | | | | Modified Russian localization. resolves #3534, #3644 | Gornov Dmitry | 2018-03-29 | 1 | -172/+250 |
| | | |_|_|_|_|_|_|/ | | |/| | | | | | | | |||||
| * | | | | | | | | | transactions#newUnapprovedTransaction - dont default origin to metamask | frankiebee | 2018-03-31 | 1 | -1/+1 |
| * | | | | | | | | | transactions - put the origing on the txMeta to help with debugging | frankiebee | 2018-03-31 | 2 | -3/+8 |
| | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
| * | | | | | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into ci-artif... | kumavis | 2018-03-30 | 3 | -35/+49 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | i18n - Update German Locale | Nico | 2018-03-30 | 1 | -24/+39 |
| | * | | | | | | | | changed zaad -> back-up woorden | FBrinkkemper | 2018-03-29 | 1 | -8/+8 |
| | * | | | | | | | | Merge pull request #3782 from MetaMask/i3670-FixNonceBug | Frankie | 2018-03-29 | 1 | -3/+2 |
| | |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | | | |||||
| | | * | | | | | | | Rename variable to be more understandable | Dan Finlay | 2018-03-29 | 1 | -3/+2 |
| * | | | | | | | | | build - extension - move js files to toplevel | kumavis | 2018-03-29 | 5 | -11/+11 |
| * | | | | | | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into ci-artif... | kumavis | 2018-03-29 | 4 | -12/+30 |
| |\| | | | | | | | | |||||
| | * | | | | | | | | Merge pull request #3777 from MetaMask/etc-fixes | Frankie | 2018-03-29 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | controllers - currency - warn currency and encountered error | kumavis | 2018-03-29 | 1 | -1/+1 |
| | * | | | | | | | | | Merge pull request #3765 from MetaMask/sentry-error-simplify | Frankie | 2018-03-29 | 1 | -2/+12 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | sentry - simplify error message 'Transaction Failed: known transaction' | kumavis | 2018-03-28 | 1 | -2/+12 |
| | | |/ / / / / / / / | |||||
| | * / / / / / / / / | tx controller - explode on non-hex txParams + dont add chainId to txParams + ... | kumavis | 2018-03-28 | 2 | -9/+17 |
| | |/ / / / / / / / | |||||
| * | | | | | | | | | build - rename 'popup.js' to 'ui.js' | kumavis | 2018-03-29 | 4 | -3/+3 |
| * | | | | | | | | | ui - change window title 'MetaMask Plugin' to 'MetaMask' | kumavis | 2018-03-29 | 2 | -2/+2 |
| |/ / / / / / / / | |||||
* / / / / / / / / | i18n - fix casing for key 'downloadStateLogs' | kumavis | 2018-03-28 | 8 | -8/+8 |
|/ / / / / / / / | |||||
* | | | | | | | | Merge pull request #3752 from MetaMask/sentry-error-fix | Frankie | 2018-03-28 | 3 | -25/+35 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | sentry - simplify all ethjs errors for better batching | kumavis | 2018-03-28 | 3 | -25/+35 |
* | | | | | | | | | Merge pull request #3760 from MetaMask/i3439-ResetCacheOnAccountReset | kumavis | 2018-03-28 | 1 | -34/+39 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | metamask-controller - fix typo | kumavis | 2018-03-28 | 1 | -1/+1 |
| * | | | | | | | | | Fix bug where resetAccount does not clear network cache | Dan Finlay | 2018-03-28 | 1 | -34/+39 |
| |/ / / / / / / / | |||||
* | | | | | | | | | i18n - fix locales inde | kumavis | 2018-03-28 | 1 | -1/+1 |
* | | | | | | | | | i18n - derrive locale codes from index | kumavis | 2018-03-28 | 1 | -3/+2 |
* | | | | | | | | | i18n - add locales index json | kumavis | 2018-03-28 | 1 | -0/+19 |
* | | | | | | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into i18n-tra... | kumavis | 2018-03-28 | 3 | -6/+52 |
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | |||||
| * | | | | | | | | Merge branch 'master' into i#3731 | frankiebee | 2018-03-28 | 4 | -28/+113 |
| |\| | | | | | | | |||||
| * | | | | | | | | migration for removing unnecessary transactions from state | frankiebee | 2018-03-28 | 2 | -0/+52 |
| * | | | | | | | | transactions - only save up to 40 txs totall across all networks | frankiebee | 2018-03-27 | 1 | -6/+1 |
| | |_|_|_|_|_|/ | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into i18n-tra... | kumavis | 2018-03-28 | 2 | -25/+112 |
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||||
| * | | | | | | | Merge pull request #3739 from gasolin/zhtwfixv4.4.0 | kumavis | 2018-03-28 | 1 | -11/+50 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | [zh-TW] fix translation and add missing strings | gasolin | 2018-03-27 | 1 | -11/+50 |
| * | | | | | | | | Update messages.json | R.IIzuka | 2018-03-27 | 1 | -14/+62 |
| | |_|/ / / / / | |/| | | | | | | |||||
* | | | | | | | | Undo unnecessary line removals. | Dan | 2018-03-27 | 2 | -0/+2 |
* | | | | | | | | Remove comments and console.logs | Dan | 2018-03-27 | 1 | -2/+1 |
* | | | | | | | | Merge branch 'master' into i18n-translator-redux | Dan | 2018-03-27 | 8 | -3/+2558 |
|\| | | | | | | | |||||
| * | | | | | | | include migration 22 | frankiebee | 2018-03-27 | 1 | -0/+1 |
| |/ / / / / / | |||||
| * | | | | | | v4.4.0 | kumavis | 2018-03-27 | 1 | -1/+1 |
| * | | | | | | Fix bug where full localStorage would crash on start | Dan Finlay | 2018-03-27 | 1 | -2/+0 |
| |/ / / / / | |||||
| * | | | | | Merge pull request #3710 from danjm/i3326-addtokenscreendesignupdate | Thomas Huang | 2018-03-27 | 1 | -0/+15 |
| |\ \ \ \ \ | |||||
| | * \ \ \ \ | Merge branch 'master' into i3326-addtokenscreendesignupdate | Dan | 2018-03-27 | 2 | -6/+29 |
| | |\ \ \ \ \ | |||||
| | * | | | | | | Updates Add token screen to latest design. | Dan | 2018-03-24 | 1 | -0/+15 |
| * | | | | | | | migration for adding submittedTime to the txMeta (#3727) | Frankie | 2018-03-27 | 1 | -0/+39 |
| * | | | | | | | i18n - sl Slovenian translation (#3724) | Filip Š | 2018-03-27 | 1 | -0/+819 |
| * | | | | | | | i18n - zh_tw traditional chinese (taiwanese) | gasolin | 2018-03-27 | 1 | -0/+864 |
| * | | | | | | | Merge pull request #3711 from artiya4u/feature/thai_locale | kumavis | 2018-03-27 | 1 | -0/+819 |
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | |||||
| | * | | | | | | Update Thai translate. | artiya4u | 2018-03-24 | 1 | -3/+3 |
| | * | | | | | | Update Thai translate. | artiya4u | 2018-03-24 | 1 | -2/+2 |
| | * | | | | | | Update Thai translate. | artiya4u | 2018-03-24 | 1 | -1/+1 |
| | * | | | | | | ๊๊Update Thai translate. | artiya4u | 2018-03-24 | 1 | -9/+9 |
| | * | | | | | | First add Thai translate. | artiya4u | 2018-03-23 | 1 | -0/+819 |
* | | | | | | | | Merge branch 'master' into i18n-translator-redux | Dan | 2018-03-27 | 2 | -6/+29 |
|\| | | | | | | | |||||
| * | | | | | | | lint - fix | kumavis | 2018-03-24 | 1 | -1/+1 |
| * | | | | | | | sentry - namespace files under metamask dir | kumavis | 2018-03-24 | 1 | -2/+2 |
| * | | | | | | | sentry - rewrite report urls + use raven-js from npm | kumavis | 2018-03-24 | 2 | -7/+30 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Use extension api to get initial locale. | Dan | 2018-03-22 | 4 | -6/+26 |
* | | | | | | | Correct reprice title and subtitle key names. | Dan | 2018-03-22 | 1 | -2/+2 |
* | | | | | | | Merge branch 'master' into i18n-translator-redux | Dan | 2018-03-22 | 14 | -563/+4072 |
|\| | | | | | | |||||
| * | | | | | | v4.3.0 | kumavis | 2018-03-22 | 1 | -1/+1 |
| * | | | | | | 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 |
| * | | | | | | | | | 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 | 1 | -0/+819 |
| |/ / / / / / / | |||||
| * | | | | | | | 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 | 1 | -245/+354 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | 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 | 1 | -3/+3 |
| | * | | | | | | | 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 | 3 | -0/+23 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | add READMEs to folders, re #3427 | Lazaridis | 2018-03-14 | 3 | -0/+23 |
| * | | | | | | | | | 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 |
* | | | | | | | | | | i18n redux solution doesn't require importing t() and passing state to each t... | Dan | 2018-03-22 | 4 | -4/+4 |
* | | | | | | | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into i18n-tra... | kumavis | 2018-03-21 | 7 | -39/+3224 |
|\| | | | | | | | | | |||||
| * | | | | | | | | | Add i18n to tx status | Thomas | 2018-03-21 | 1 | -1/+13 |
| * | | | | | | | | | Merge branch 'master' into i3571-CompleteI18nTemplates | Thomas | 2018-03-21 | 6 | -36/+3146 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Add messages.json from @Grana69 | Grana69 | 2018-03-21 | 1 | -5/+835 |
| | * | | | | | | | | | 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 #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 branch 'master' into retry-tx-refractor | Dan | 2018-03-20 | 8 | -13/+2660 |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / | | | |/| | | | | | | | | | |||||
| | * | | | | | | | | | | | Merge branch 'master' into retry-tx-refractor | frankiebee | 2018-03-16 | 1 | -0/+32 |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / | | | |/| | | | | | | | | | |||||
| | * | | | | | | | | | | | Merge branch 'master' into retry-tx-refractor | frankiebee | 2018-03-15 | 2 | -4/+637 |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / | | | |/| | | | | | | | | | |||||
| | * | | | | | | | | | | | fix destructuring of variables | frankiebee | 2018-03-14 | 1 | -1/+1 |
| | * | | | | | | | | | | | Fix TransactionStateManager spelling. | Dan | 2018-03-14 | 1 | -2/+2 |
| | * | | | | | | | | | | | Merge branch 'master' into retry-tx-refractor | Dan | 2018-03-14 | 5 | -11/+680 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | transactions - return the txMeta in retryTransaction | frankiebee | 2018-03-14 | 1 | -2/+3 |
| | * | | | | | | | | | | | | transactions:state - add a submittedTime stamp so the ui has a better grasp o... | frankiebee | 2018-03-14 | 1 | -0/+4 |
| | * | | | | | | | | | | | | Merge branch 'master' into retry-tx-refractor | Dan | 2018-03-09 | 5 | -15/+98 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / / / / | | | |/| | | | | | | | | | | |||||
| | * | | | | | | | | | | | | 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 | 13 | -9/+766 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | refactor retrytx with higher gas price: | frankiebee | 2018-03-08 | 2 | -26/+55 |
| * | | | | | | | | | | | | | | Update onlySendToEtherAddress message | Thomas | 2018-03-21 | 1 | -1/+1 |
| * | | | | | | | | | | | | | | Add i18n in settings/info | Thomas | 2018-03-21 | 1 | -0/+3 |
| * | | | | | | | | | | | | | | Started on Tx list i18n | Thomas | 2018-03-21 | 1 | -0/+6 |
| * | | | | | | | | | | | | | | Remove duplicate keys | Thomas | 2018-03-20 | 1 | -7/+1 |
| * | | | | | | | | | | | | | | Add send screen template | Dan Finlay | 2018-03-20 | 1 | -1/+13 |
| * | | | | | | | | | | | | | | Add template for settings and info | Dan Finlay | 2018-03-20 | 1 | -0/+9 |
| * | | | | | | | | | | | | | | Add recover and backup tempaltes | Dan Finlay | 2018-03-20 | 1 | -0/+18 |
| * | | | | | | | | | | | | | | Add connecting indication templates | Dan Finlay | 2018-03-20 | 1 | -0/+15 |
| | |_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | Lint fixes. | Dan | 2018-03-20 | 1 | -1/+0 |
* | | | | | | | | | | | | | | Merge branch 'master' into i18n-translator-redux | Dan | 2018-03-20 | 8 | -10/+2090 |
|\| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | 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 | 4 | -5/+75 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | 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 | 1 | -0/+609 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | space | Viet Le | 2018-03-18 | 1 | -1/+1 |
| | * | | | | | | | | | | | | | | | corrected vn -> vi | Viet Le | 2018-03-18 | 1 | -0/+0 |
| | * | | | | | | | | | | | | | | | Translated to Vietnamese. Translator: Trang Ha, Editor: Viet Le | Viet Le | 2018-03-18 | 1 | -0/+609 |
| | | |_|_|_|_|_|/ / / / / / / / | | |/| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | 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 #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 | 1 | -0/+16 |
| * | | | | | | | | | | | | | | | Fix messages typo (#3591) | Thomas Huang | 2018-03-17 | 1 | -1/+1 |
| * | | | | | | | | | | | | | | | 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 | 1 | -0/+32 |
| |/ / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | Fetch localeMessages in front end only. | Dan | 2018-03-20 | 2 | -13/+3 |
* | | | | | | | | | | | | | Handle i18n with redux. | Dan | 2018-03-16 | 4 | -8/+25 |
* | | | | | | | | | | | | | Translation to Japanese | Mami Mordovets | 2018-03-15 | 1 | -3/+602 |
* | | | | | | | | | | | | | i18n - load locales manually | kumavis | 2018-03-15 | 1 | -59/+74 |
|/ / / / / / / / / / / / | |||||
* | | | | | | | | | | | | 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 |
| | |/ / / / / / / / / / | |/| | | | | | | | | | | |||||
* | | | | | | | | | | | | 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 |
* | | | | | | | | | | | | local-store - fix promisification of methods | kumavis | 2018-03-15 | 1 | -3/+2 |
| |/ / / / / / / / / / |/| | | | | | | | | | | |||||
* | | | | | | | | | | | fix destructuring of variables | frankiebee | 2018-03-14 | 1 | -1/+1 |
| |/ / / / / / / / / |/| | | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'master' into i3076-UseStorageLocalInstead | kumavis | 2018-03-14 | 1 | -2/+4 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | tx-gas-utils - fix code style | kumavis | 2018-03-14 | 1 | -1/+1 |
| * | | | | | | | | | | 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 | 6 | -21/+703 |
| |\ \ \ \ \ \ \ \ \ \ |