Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Merge branch 'master' into i#3509 | Frankie | 2018-03-14 | 6 | -21/+703 |
| | |\| | | | | | |||||
| * | | | | | | | fix error message | frankiebee | 2018-03-14 | 1 | -1/+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 branch 'master' of github.com:MetaMask/metamask-extension into i3076-Us... | kumavis | 2018-03-14 | 2 | -6/+605 |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| * | | | | | Add sigRequest for Signature Request | Thomas | 2018-03-13 | 1 | -0/+3 |
| * | | | | | Merge branch 'master' into i18n | Thomas Huang | 2018-03-12 | 4 | -12/+95 |
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | |||||
| * | | | | | Merge branch 'master' into i18n | Dan Finlay | 2018-03-07 | 1 | -3/+3 |
| |\ \ \ \ \ | |||||
| * | | | | | | Missing comma in messages.json | Dan | 2018-03-07 | 1 | -1/+1 |
| * | | | | | | Merge branch 'master' into i18n | Dan | 2018-03-07 | 24 | -25/+912 |
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | |||||
| * | | | | | | complete i18n across new UI | Nick Doiron | 2018-01-30 | 2 | -69/+105 |
| * | | | | | | better organization of locale file; i18n in more view files | Nick Doiron | 2018-01-24 | 1 | -125/+506 |
| * | | | | | | first steps to i18n | Nick Doiron | 2018-01-23 | 1 | -1/+166 |
* | | | | | | | lint fix | kumavis | 2018-03-09 | 1 | -1/+1 |
* | | | | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into i3076-Us... | kumavis | 2018-03-09 | 2 | -9/+92 |
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | |||||
| * | | | | | | Merge pull request #3409 from scsaba/seed-phrase-verification | Dan Finlay | 2018-03-08 | 2 | -9/+92 |
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | |||||
| | * | | | | | modify verifySeedPhrase to async and call it from addNewAccount also | Csaba Solya | 2018-03-06 | 1 | -32/+34 |
| | * | | | | | add documentation | Csaba Solya | 2018-03-04 | 2 | -0/+9 |
| | * | | | | | verify seedwords on log in | Csaba Solya | 2018-03-04 | 1 | -3/+16 |
| | * | | | | | verify addresses regardless case | Csaba Solya | 2018-03-03 | 1 | -1/+1 |
| | * | | | | | fix lint issues | Csaba Solya | 2018-03-03 | 2 | -11/+11 |
| | * | | | | | seed phrase verifier | Csaba Solya | 2018-03-03 | 2 | -2/+61 |
* | | | | | | | background - storage - cleanup storage wiring | kumavis | 2018-03-09 | 2 | -34/+30 |
* | | | | | | | Tighten up data loading code | Dan Finlay | 2018-03-08 | 1 | -4/+8 |
* | | | | | | | Add clarifying comment | Dan Finlay | 2018-03-08 | 1 | -0/+1 |
* | | | | | | | Some fixes for new storage strategy | Dan Finlay | 2018-03-08 | 1 | -5/+9 |
* | | | | | | | Increase storage debounce to 2s | Dan Finlay | 2018-03-08 | 1 | -1/+1 |
* | | | | | | | Merge branch 'master' into i3076-UseStorageLocalInstead | Dan Finlay | 2018-03-08 | 3 | -6/+6 |
|\| | | | | | | |||||
| * | | | | | | fix typo in tests and tx-state-manager | Jeffrey Tong | 2018-03-08 | 1 | -1/+1 |
| * | | | | | | fix typo in transaction.js | Jeffrey Tong | 2018-03-07 | 1 | -2/+2 |
| | |_|_|/ / | |/| | | | | |||||
| * | | | | | Version 4.2.0 | kumavis | 2018-03-07 | 1 | -3/+3 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge branch 'master' into i3076-UseStorageLocalInstead | Dan Finlay | 2018-03-07 | 87 | -61/+1407 |
|\| | | | | |||||
| * | | | | Merge pull request #3309 from scsaba/edge-support | Dan Finlay | 2018-03-07 | 2 | -0/+77 |
| |\ \ \ \ | |||||
| | * | | | | make keyFromPassword private | Csaba Solya | 2018-02-23 | 1 | -3/+3 |
| | * | | | | Merge branch 'master' into edge-support | Csaba S | 2018-02-22 | 71 | -41/+562 |
| | |\ \ \ \ | |||||
| | * | | | | | add edge support | Csaba Solya | 2018-02-22 | 2 | -0/+77 |
| * | | | | | | Version 4.1.3v4.1.3 | Dan Finlay | 2018-03-03 | 1 | -1/+1 |
| | |_|/ / / | |/| | | | | |||||
| * | | | | | Merge pull request #3356 from MetaMask/cdn-minimization | Kevin Serrano | 2018-03-02 | 7 | -0/+644 |
| |\ \ \ \ \ | |||||
| | * | | | | | Check in all font files locally. | Kevin Serrano | 2018-03-01 | 7 | -0/+644 |
| | | |_|_|/ | | |/| | | | |||||
| * | | | | | 4.1.2 | kumavis | 2018-03-01 | 1 | -1/+1 |
| * | | | | | Merge pull request #3361 from MetaMask/4.1.1v4.1.1 | Thomas Huang | 2018-03-01 | 1 | -1/+1 |
| |\ \ \ \ \ | |||||
| | * | | | | | v4.1.1 | kumavis | 2018-03-01 | 1 | -1/+1 |
| | |/ / / / | |||||
| * | | | | | sentry - extractErrorMessage - fix comment formatting | kumavis | 2018-03-01 | 1 | -1/+1 |
| * | | | | | sentry - failed tx - improve ethjs-rpc error formating | kumavis | 2018-03-01 | 2 | -5/+41 |
| * | | | | | sentry - clean - move setupRaven to lib | kumavis | 2018-03-01 | 3 | -3/+3 |
| |/ / / / | |||||
| * | | | | Merge pull request #3323 from MetaMask/version-4.0.0v4.1.0 | Frankie | 2018-02-28 | 1 | -1/+1 |
| |\ \ \ \ | |||||
| | * | | | | Bump Version | Thomas | 2018-02-28 | 1 | -1/+1 |
| | * | | | | Version 4.0.0 | Thomas | 2018-02-23 | 1 | -1/+1 |
| | | |/ / | | |/| | | |||||
| * | | | | Merge pull request #3281 from MetaMask/sentry-failed-tx-debatch | Dan Finlay | 2018-02-28 | 1 | -1/+2 |
| |\ \ \ \ | | |/ / / | |/| | | | |||||
| | * | | | sentry - report failed tx with more specific message | kumavis | 2018-02-17 | 1 | -1/+2 |
| * | | | | Merge pull request #3306 from danjm/MM-805-send-from-tab-popup-fix | Thomas Huang | 2018-02-22 | 1 | -1/+11 |
| |\ \ \ \ | |||||
| | * | | | | Prevents new transaction from generating popup when metamask is open in an ac... | Dan | 2018-02-22 | 1 | -1/+11 |
| * | | | | | Merge branch 'master' into uat-master | Dan Finlay | 2018-02-22 | 4 | -3/+17 |
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | |||||
| | * | | | | Merge pull request #3250 from MetaMask/i#3136 | kumavis | 2018-02-16 | 1 | -2/+3 |
| | |\ \ \ \ | |||||
| | | * | | | | fix - hex prefix estimatedGas on txMeta | frankiebee | 2018-02-15 | 1 | -2/+3 |
| | * | | | | | Fix incorrect promise instantiation | Dan Finlay | 2018-02-16 | 1 | -1/+1 |
| | | |_|/ / | | |/| | | | |||||
| | * | | | | Version 3.14.2v3.14.2 | Dan Finlay | 2018-02-16 | 1 | -1/+1 |
| | * | | | | Merge pull request #3222 from MetaMask/mesh-test | Dan Finlay | 2018-02-16 | 2 | -0/+13 |
| | |\ \ \ \ | | | |/ / / | | |/| | | | |||||
| | | * | | | metamask mesh - inject mesh testing container | kumavis | 2018-02-11 | 2 | -0/+13 |
| | * | | | | use the providers initial _blocktracker. fixes #2393 | Lazaridis | 2018-02-11 | 1 | -1/+1 |
| | |/ / / | |||||
| * | / / | Fix promise construction | Dan Finlay | 2018-02-21 | 1 | -1/+1 |
| | |/ / | |/| | | |||||
| * | | | Bump uat version to 4.0.12 | Dan | 2018-02-17 | 1 | -1/+1 |
| * | | | Make oldui compatible with newUI style changes | Thomas Huang | 2018-02-16 | 1 | -2/+2 |
| * | | | Merge branch 'uat' into uat-next | Dan | 2018-02-08 | 6 | -10/+63 |
| |\ \ \ | |||||
| | * | | | Merge branch 'master' into uat | Dan | 2018-02-08 | 6 | -10/+63 |
| | |\| | | |||||
| | | * | | Version 3.14.1v3.14.1 | Dan Finlay | 2018-02-02 | 1 | -1/+1 |
| | | * | | Version 3.14.0 | Dan Finlay | 2018-02-02 | 1 | -1/+1 |
| | | * | | Merge branch 'master' into localStorage-clean-up | Frankie | 2018-02-01 | 3 | -0/+23 |
| | | |\ \ | |||||
| | | | * | | preserve other networks TXs | Bruno Barbieri | 2018-02-01 | 1 | -3/+4 |
| | | | * | | use txMeta.txParams | Bruno Barbieri | 2018-01-31 | 1 | -1/+1 |
| | | | * | | wipe only transactions for current account | Bruno Barbieri | 2018-01-31 | 3 | -9/+15 |
| | | | * | | clean up | Bruno Barbieri | 2018-01-31 | 1 | -3/+3 |
| | | | * | | added reset account feature | Bruno Barbieri | 2018-01-31 | 3 | -0/+16 |
| | | * | | | remove RecentBlocks from disk | frankiebee | 2018-02-01 | 2 | -3/+2 |
| | | * | | | creater migration to remove BlacklistController | frankiebee | 2018-01-31 | 1 | -0/+33 |
| | | * | | | remove BlacklistController from disk state | frankiebee | 2018-01-31 | 2 | -6/+2 |
| | | |/ / | |||||
| | | * | | Version 3.13.8v3.13.8 | Dan Finlay | 2018-01-30 | 1 | -1/+1 |