aboutsummaryrefslogtreecommitdiffstats
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into i3981-contract-ratesDan Finlay2018-04-1718-9/+930
|\
| * Merge pull request #3970 from MetaMask/i3651-removeGlobalLogDan Finlay2018-04-1716-9/+17
| |\
| | * Require loglevel singleton in each module that uses itbitpshr2018-04-1416-9/+17
| * | Fix vault translationMartin Šmíd2018-04-141-4/+4
| * | Add czech translationMartin Šmíd2018-04-142-0/+913
| |/
* | Disable token price polling when no client is activebitpshr2018-04-173-0/+13
* | Maintain token prices using a background servicebitpshr2018-04-162-0/+83
|/
* Add tests for ComposableObservableStorebitpshr2018-04-141-11/+11
* Add ComposableObservableStore for subscription managementbitpshr2018-04-132-70/+85
* Merge pull request #3938 from nyatla/masterkumavis2018-04-101-27/+72
|\
| * Merge tag 'v4.5.5'nyatla2018-04-1052-561/+1145
| |\
| * | Update messages.jsonR.IIzuka2018-04-101-30/+99
* | | Translate to Turkish (#3876)Mert Ozdag2018-04-102-0/+913
* | | Merge pull request #3921 from MetaMask/gh-3736-react-routerkumavis2018-04-101-1/+2
|\ \ \
| * \ \ Merge branch 'master' of https://github.com/MetaMask/metamask-extension into ...Alexander Tseung2018-04-0610-36/+198
| |\ \ \
| * \ \ \ Merge branch 'master' of https://github.com/MetaMask/metamask-extension into ...Alexander Tseung2018-04-057-39/+111
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' of https://github.com/MetaMask/metamask-extension into ...Alexander Tseung2018-04-0412-42/+47
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' of https://github.com/MetaMask/metamask-extension into ...Alexander Tseung2018-04-031-2/+2
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Fix merge conflicts. Modify send workflowAlexander Tseung2018-04-0311-184/+275
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/MetaMask/metamask-extension into ...Alexander Tseung2018-03-312-3/+8
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Fix merge conflictsAlexander Tseung2018-03-319-48/+62
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Fix i18n merge conflictsAlexander Tseung2018-03-3020-173/+404
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Fix merge conflictsAlexander Tseung2018-03-2750-369/+14482
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'uat-next' of https://github.com/MetaMask/metamask-extension int...Alexander Tseung2018-02-097-10/+89
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Fix merge conflicts from uat-nextAlexander Tseung2018-02-017-4/+86
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'uat' of https://github.com/MetaMask/metamask-extension into cb-254Alexander Tseung2018-01-3020-75/+579
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Add react-router to allow use of the browser back buttonAlexander Tseung2017-12-151-1/+2
* | | | | | | | | | | | | | | | Merge pull request #3922 from MetaMask/empty-vault-fixkumavis2018-04-071-3/+31
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | metamask - never persist if state is missingkumavis2018-04-071-1/+4
| * | | | | | | | | | | | | | | | metamask - never persist if state is missing datakumavis2018-04-071-3/+6
| * | | | | | | | | | | | | | | | metamask - attempt recovery from empty vaultkumavis2018-04-071-0/+22
* | | | | | | | | | | | | | | | | Merge pull request #3917 from MetaMask/kumavis-patch-3Frankie2018-04-071-2/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | tx-state-manager - dont remove old tx history if candidate is not foundkumavis2018-04-071-2/+4
| |/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | 4.5.5v4.5.5kumavis2018-04-071-1/+1
* | | | | | | | | | | | | | | | v4.5.4kumavis2018-04-071-1/+1
|/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | / / migrations - back fixesfrankiebee2018-04-068-88/+115
| |_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | create migration 25frankiebee2018-04-062-0/+62
* | | | | | | | | | | | | | meta - create a migration templatefrankiebee2018-04-061-0/+29
* | | | | | | | | | | | | | Merge pull request #3857 from MetaMask/match-local-localecodeskumavis2018-04-061-2/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Map existingLocaleCodes and userPreferredLocaleCodes to lower case in get-fir...Dan2018-04-041-2/+4
| * | | | | | | | | | | | | | Ensure get-first-preferred-lang-code.js matches locale codes from local direc...Dan2018-04-041-1/+1
| | |_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #3887 from MetaMask/i#3886kumavis2018-04-061-19/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | transactions - _normalizeTxParams will now return a new object for txParamsfrankiebee2018-04-061-31/+18
| * | | | | | | | | | | | | | transactions - remove unnecessary keys on txParamsfrankiebee2018-04-051-0/+12
| | |_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #3900 from MetaMask/migration-error-reportFrankie2018-04-064-14/+80
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | migrator - dont overwrite error stack and warn to consolekumavis2018-04-061-2/+5
| * | | | | | | | | | | | | | migrator - fix typokumavis2018-04-061-1/+1
| * | | | | | | | | | | | | | migrations - report migrations errors to sentry with vault structurekumavis2018-04-064-14/+77
* | | | | | | | | | | | | | | Merge pull request #3892 from alextsg/gh-3891kumavis2018-04-061-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Fix populating txParams with undefined dataAlexander Tseung2018-04-061-0/+4
| | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | |
* / | | | | | | | | | | | | | make migration-24 compat with first-time-statefrankiebee2018-04-061-1/+1
|/ / / / / / / / / / / / / /
* / / / / / / / / / / / / / 4.5.3kumavis2018-04-051-1/+1
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | transactions - make #_validateTxParams not async and "linting" wink wink nudg...frankiebee2018-04-051-7/+12
* | | | | | | | | | | | | Merge branch 'master' of https://github.com/MetaMask/metamask-extension into ...frankiebee2018-04-053-3/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | 4.5.2v4.5.2kumavis2018-04-051-1/+1
| * | | | | | | | | | | | | tx - txParams - allow chainId to be a hex stringkumavis2018-04-041-1/+1
| * | | | | | | | | | | | | Add webby awards to web3 block list.Dan Finlay2018-04-041-1/+5
| | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | |
* | | | | | | | | | | | | hot-fix - migrate unaproved txParams so that the from is lowercasefrankiebee2018-04-052-0/+46
* | | | | | | | | | | | | transactions - normalize txParamsfrankiebee2018-04-052-36/+53
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #3834 from MetaMask/3734kumavis2018-04-041-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Address Add Token design feedbackDavid Yoo2018-04-031-1/+1
* | | | | | | | | | | | | 4.5.1v.4.5.1kumavis2018-04-041-1/+1
* | | | | | | | | | | | | tx-state-manager - validateTxParams - validate chainId is Numberkumavis2018-04-041-2/+10
* | | | | | | | | | | | | transactions - dont throw if chain id is not a stringfrankiebee2018-04-041-2/+2
* | | | | | | | | | | | | app - currency - fix typo + prefer log over consolekumavis2018-04-041-2/+3
* | | | | | | | | | | | | app - currency - fix typokumavis2018-04-041-1/+1
* | | | | | | | | | | | | app - warn on fetch errors instead of spamming sentrykumavis2018-04-044-32/+28
* | | | | | | | | | | | | build - correctly set METAMASK_ENV via envifykumavis2018-04-045-6/+6
| |/ / / / / / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | 4.5.0kumavis2018-04-031-2/+2
| |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | |
* | | | | | | | | | | Merge pull request #3831 from MetaMask/i#3770Frankie2018-04-032-4/+14
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | transactions gasLimit - use the block gasLimit if getCode failsfrankiebee2018-04-032-3/+6
| * | | | | | | | | | transactions validationt - valdate from field on txParamsfrankiebee2018-04-031-1/+8
* | | | | | | | | | | Merge pull request #3825 from danjm/i3668-warnusertxsimulationfailsThomas Huang2018-04-031-0/+3
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Adds simulation failure error messages to confirm screen.Dan2018-04-031-0/+3
| | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | |
* | | | | | | | | | | lint - i18n - ru - lint fixkumavis2018-04-031-0/+1
* | | | | | | | | | | Merge branch 'master' into i18n-helperkumavis2018-04-0315-235/+349
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge pull request #3783 from gornov/masterkumavis2018-04-031-172/+250
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Modified Russian localization. resolves #3534, #3644Gornov Dmitry2018-03-291-172/+250
| | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| * | | | | | | | | transactions#newUnapprovedTransaction - dont default origin to metamaskfrankiebee2018-03-311-1/+1
| * | | | | | | | | transactions - put the origing on the txMeta to help with debuggingfrankiebee2018-03-312-3/+8
| | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into ci-artif...kumavis2018-03-303-35/+49
| |\ \ \ \ \ \ \ \
| | * | | | | | | | i18n - Update German LocaleNico2018-03-301-24/+39
| | * | | | | | | | changed zaad -> back-up woordenFBrinkkemper2018-03-291-8/+8
| | * | | | | | | | Merge pull request #3782 from MetaMask/i3670-FixNonceBugFrankie2018-03-291-3/+2
| | |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| | | * | | | | | | Rename variable to be more understandableDan Finlay2018-03-291-3/+2
| * | | | | | | | | build - extension - move js files to toplevelkumavis2018-03-295-11/+11
| * | | | | | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into ci-artif...kumavis2018-03-294-12/+30
| |\| | | | | | | |
| | * | | | | | | | Merge pull request #3777 from MetaMask/etc-fixesFrankie2018-03-291-1/+1
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | controllers - currency - warn currency and encountered errorkumavis2018-03-291-1/+1
| | * | | | | | | | | Merge pull request #3765 from MetaMask/sentry-error-simplifyFrankie2018-03-291-2/+12
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | sentry - simplify error message 'Transaction Failed: known transaction'kumavis2018-03-281-2/+12
| | | |/ / / / / / / /
| | * / / / / / / / / tx controller - explode on non-hex txParams + dont add chainId to txParams + ...kumavis2018-03-282-9/+17
| | |/ / / / / / / /
| * | | | | | | | | build - rename 'popup.js' to 'ui.js'kumavis2018-03-294-3/+3
| * | | | | | | | | ui - change window title 'MetaMask Plugin' to 'MetaMask'kumavis2018-03-292-2/+2
| |/ / / / / / / /
* / / / / / / / / i18n - fix casing for key 'downloadStateLogs'kumavis2018-03-288-8/+8
|/ / / / / / / /
* | | | | | | | Merge pull request #3752 from MetaMask/sentry-error-fixFrankie2018-03-283-25/+35
|\ \ \ \ \ \ \ \
| * | | | | | | | sentry - simplify all ethjs errors for better batchingkumavis2018-03-283-25/+35
* | | | | | | | | Merge pull request #3760 from MetaMask/i3439-ResetCacheOnAccountResetkumavis2018-03-281-34/+39
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | metamask-controller - fix typokumavis2018-03-281-1/+1
| * | | | | | | | | Fix bug where resetAccount does not clear network cacheDan Finlay2018-03-281-34/+39
| |/ / / / / / / /
* | | | | | | | | i18n - fix locales indekumavis2018-03-281-1/+1
* | | | | | | | | i18n - derrive locale codes from indexkumavis2018-03-281-3/+2
* | | | | | | | | i18n - add locales index jsonkumavis2018-03-281-0/+19
* | | | | | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into i18n-tra...kumavis2018-03-283-6/+52
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Merge branch 'master' into i#3731frankiebee2018-03-284-28/+113
| |\| | | | | | |
| * | | | | | | | migration for removing unnecessary transactions from statefrankiebee2018-03-282-0/+52
| * | | | | | | | transactions - only save up to 40 txs totall across all networksfrankiebee2018-03-271-6/+1
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into i18n-tra...kumavis2018-03-282-25/+112
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge pull request #3739 from gasolin/zhtwfixv4.4.0kumavis2018-03-281-11/+50
| |\ \ \ \ \ \ \
| | * | | | | | | [zh-TW] fix translation and add missing stringsgasolin2018-03-271-11/+50
| * | | | | | | | Update messages.jsonR.IIzuka2018-03-271-14/+62
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Undo unnecessary line removals.Dan2018-03-272-0/+2
* | | | | | | | Remove comments and console.logsDan2018-03-271-2/+1
* | | | | | | | Merge branch 'master' into i18n-translator-reduxDan2018-03-278-3/+2558
|\| | | | | | |
| * | | | | | | include migration 22frankiebee2018-03-271-0/+1
| |/ / / / / /
| * | | | | | v4.4.0kumavis2018-03-271-1/+1
| * | | | | | Fix bug where full localStorage would crash on startDan Finlay2018-03-271-2/+0
| |/ / / / /
| * | | | | Merge pull request #3710 from danjm/i3326-addtokenscreendesignupdateThomas Huang2018-03-271-0/+15
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'master' into i3326-addtokenscreendesignupdateDan2018-03-272-6/+29
| | |\ \ \ \ \
| | * | | | | | Updates Add token screen to latest design.Dan2018-03-241-0/+15
| * | | | | | | migration for adding submittedTime to the txMeta (#3727)Frankie2018-03-271-0/+39
| * | | | | | | i18n - sl Slovenian translation (#3724)Filip Š2018-03-271-0/+819
| * | | | | | | i18n - zh_tw traditional chinese (taiwanese)gasolin2018-03-271-0/+864
| * | | | | | | Merge pull request #3711 from artiya4u/feature/thai_localekumavis2018-03-271-0/+819
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| | * | | | | | Update Thai translate.artiya4u2018-03-241-3/+3
| | * | | | | | Update Thai translate.artiya4u2018-03-241-2/+2
| | * | | | | | Update Thai translate.artiya4u2018-03-241-1/+1
| | * | | | | | ๊๊Update Thai translate.artiya4u2018-03-241-9/+9
| | * | | | | | First add Thai translate.artiya4u2018-03-231-0/+819
* | | | | | | | Merge branch 'master' into i18n-translator-reduxDan2018-03-272-6/+29
|\| | | | | | |
| * | | | | | | lint - fixkumavis2018-03-241-1/+1
| * | | | | | | sentry - namespace files under metamask dirkumavis2018-03-241-2/+2
| * | | | | | | sentry - rewrite report urls + use raven-js from npmkumavis2018-03-242-7/+30
| | |/ / / / / | |/| | | | |
* | | | | | | Use extension api to get initial locale.Dan2018-03-224-6/+26
* | | | | | | Correct reprice title and subtitle key names.Dan2018-03-221-2/+2
* | | | | | | Merge branch 'master' into i18n-translator-reduxDan2018-03-2214-563/+4072
|\| | | | | |
| * | | | | | v4.3.0kumavis2018-03-221-1/+1
| * | | | | | Merge pull request #3656 from MetaMask/trigun0x2-master2kumavis2018-03-223-6/+15
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge branch 'master' of github.com:MetaMask/metamask-extension into trigun0x...kumavis2018-03-221-0/+873
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'master' of https://github.com/trigun0x2/metamask-extension into...kumavis2018-03-223-6/+15
| | |\ \ \ \ \ \ \
| | | * | | | | | | fix for lintJeffrey Tong2018-03-211-5/+5
| | | * | | | | | | remove console logJeffrey Tong2018-03-121-2/+0
| | | * | | | | | | add comments that need clarification on naming conventionJeffrey Tong2018-03-123-9/+10
| | | * | | | | | | fixed multiple notification windows when executing batchJeffrey Tong2018-03-082-2/+14
| | | * | | | | | | removed check for width & height on multiple popup windowsJeffrey Tong2018-03-081-3/+1
| * | | | | | | | | Merge pull request #3648 from raulk/patch-1kumavis2018-03-221-53/+53
| |\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | |
| | * | | | | | | | Minor adjustments to Spanish translationRaúl Kripalani2018-03-211-53/+53
| * | | | | | | | | i18n - fix german json formattingkumavis2018-03-221-7/+6
| * | | | | | | | | Tranlate to German (#3575)Nico2018-03-221-0/+874
| | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Translate to Russian (#3644)Victor Charapaev2018-03-221-0/+819
| * | | | | | | | hn _locales : message.json [HINDI] (#3611)N1X2018-03-221-0/+819
| |/ / / / / / /
| * | | | | | | Merge pull request #3625 from bradford-hamilton/masterkumavis2018-03-211-0/+819
| |\ \ \ \ \ \ \
| | * | | | | | | add Dutch translationsBradford Lamson-Scribner2018-03-211-0/+819
| | | |/ / / / / | | |/| | | | |
| * | | | | | | Merge pull request #3641 from hermanjunge/masterkumavis2018-03-211-10/+0
| |\ \ \ \ \ \ \
| | * | | | | | | Nuke the es_419 localeHerman Junge2018-03-211-10/+0
| | |/ / / / / /
| * | | | | | | Merge pull request #3585 from lazaridiscom/laz/i3568kumavis2018-03-211-245/+354
| |\ \ \ \ \ \ \
| | * | | | | | | moves setup-related code towads end of file, re #3568Lazaridis2018-03-171-115/+124
| | * | | | | | | add ESLint exceptions for //= and //-, re #3568Lazaridis2018-03-161-3/+3
| | * | | | | | | 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-213-0/+23
| |\ \ \ \ \ \ \ \
| | * | | | | | | | add READMEs to folders, re #3427Lazaridis2018-03-143-0/+23
| * | | | | | | | | 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
* | | | | | | | | | i18n redux solution doesn't require importing t() and passing state to each t...Dan2018-03-224-4/+4
* | | | | | | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into i18n-tra...kumavis2018-03-217-39/+3224
|\| | | | | | | | |
| * | | | | | | | | Add i18n to tx statusThomas2018-03-211-1/+13
| * | | | | | | | | Merge branch 'master' into i3571-CompleteI18nTemplatesThomas2018-03-216-36/+3146
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Add messages.json from @Grana69Grana692018-03-211-5/+835
| | * | | | | | | | | Merge pull request #3613 from alvesjtiago/masterkumavis2018-03-211-0/+819
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Portuguese translations.Tiago Alves2018-03-201-0/+819
| | | | |_|/ / / / / / | | | |/| | | | | | |
| | * | | | | | | | | Merge pull request #3579 from matteopey/italian-translationkumavis2018-03-211-0/+819
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Update translation based on the new message.jsonmatteopey2018-03-201-1/+211
| | | * | | | | | | | | Clients because we mean Ethereum clientsmatteopey2018-03-161-1/+1
| | | * | | | | | | | | Fix as requested by reviewmatteopey2018-03-161-1/+1
| | | * | | | | | | | | Add italian translationmatteopey2018-03-161-0/+609
| | * | | | | | | | | | Merge pull request #3574 from marvinvista/masterkumavis2018-03-211-0/+609
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Translate to Tagalog #3535Marvin Vista2018-03-151-1/+1
| | | * | | | | | | | | | Translate to Tagalog #3535Marvin Vista2018-03-151-0/+609
| | * | | | | | | | | | | Merge branch 'master' into retry-tx-refractorDan2018-03-208-13/+2660
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / | | | |/| | | | | | | | |
| | * | | | | | | | | | | Merge branch 'master' into retry-tx-refractorfrankiebee2018-03-161-0/+32
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / | | | |/| | | | | | | | |
| | * | | | | | | | | | | Merge branch 'master' into retry-tx-refractorfrankiebee2018-03-152-4/+637
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / | | | |/| | | | | | | | |
| | * | | | | | | | | | | fix destructuring of variablesfrankiebee2018-03-141-1/+1
| | * | | | | | | | | | | Fix TransactionStateManager spelling.Dan2018-03-141-2/+2
| | * | | | | | | | | | | Merge branch 'master' into retry-tx-refractorDan2018-03-145-11/+680
| | |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | transactions - return the txMeta in retryTransactionfrankiebee2018-03-141-2/+3
| | * | | | | | | | | | | | transactions:state - add a submittedTime stamp so the ui has a better grasp o...frankiebee2018-03-141-0/+4
| | * | | | | | | | | | | | Merge branch 'master' into retry-tx-refractorDan2018-03-095-15/+98
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / / / / | | | |/| | | | | | | | | |
| | * | | | | | | | | | | | 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-0813-9/+766
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | refactor retrytx with higher gas price:frankiebee2018-03-082-26/+55
| * | | | | | | | | | | | | | Update onlySendToEtherAddress messageThomas2018-03-211-1/+1
| * | | | | | | | | | | | | | Add i18n in settings/infoThomas2018-03-211-0/+3
| * | | | | | | | | | | | | | Started on Tx list i18nThomas2018-03-211-0/+6
| * | | | | | | | | | | | | | Remove duplicate keysThomas2018-03-201-7/+1
| * | | | | | | | | | | | | | Add send screen templateDan Finlay2018-03-201-1/+13
| * | | | | | | | | | | | | | Add template for settings and infoDan Finlay2018-03-201-0/+9
| * | | | | | | | | | | | | | Add recover and backup tempaltesDan Finlay2018-03-201-0/+18
| * | | | | | | | | | | | | | Add connecting indication templatesDan Finlay2018-03-201-0/+15
| | |_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Lint fixes.Dan2018-03-201-1/+0
* | | | | | | | | | | | | | Merge branch 'master' into i18n-translator-reduxDan2018-03-208-10/+2090
|\| | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge pull request #3555 from mamiM/mamiM-Ja-translationkumavis2018-03-181-3/+602
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Translation to JapaneseMami Mordovets2018-03-141-3/+602
| | | |_|_|/ / / / / / / / / | | |/| | | | | | | | | | |
| * | | | | | | | | | | | | Merge pull request #3560 from Orangem21/masterkumavis2018-03-181-3/+602
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | fixOrange2018-03-151-2/+2
| | * | | | | | | | | | | | | Merge pull request #2 from MetaMask/masterOrange2018-03-154-5/+75
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | fixOrange2018-03-141-1/+1
| | * | | | | | | | | | | | | | yuanaichiyuanchao2018-03-141-102/+102
| | * | | | | | | | | | | | | | fixOrange2018-03-141-30/+30
| | * | | | | | | | | | | | | | fixOrange2018-03-141-1/+1
| | * | | | | | | | | | | | | | updateOrange2018-03-141-3/+602
| * | | | | | | | | | | | | | | Merge pull request #3602 from vietlq/masterkumavis2018-03-181-0/+609
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | spaceViet Le2018-03-181-1/+1
| | * | | | | | | | | | | | | | | corrected vn -> viViet Le2018-03-181-0/+0
| | * | | | | | | | | | | | | | | Translated to Vietnamese. Translator: Trang Ha, Editor: Viet LeViet Le2018-03-181-0/+609
| | | |_|_|_|_|_|/ / / / / / / / | | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge pull request #3564 from nujabes403/patch-1kumavis2018-03-181-5/+604
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | Update messages.jsonnujabes4032018-03-161-1/+1
| | * | | | | | | | | | | | | | | Update messages.jsonnujabes4032018-03-161-1/+1
| | * | | | | | | | | | | | | | | Update messages.jsonnujabes4032018-03-161-16/+16
| | * | | | | | | | | | | | | | | Update messages.jsonnujabes4032018-03-161-2/+2
| | * | | | | | | | | | | | | | | Update messages.jsonnujabes4032018-03-161-1/+1
| | * | | | | | | | | | | | | | | Translated whole message in KRnujabes4032018-03-151-109/+109
| | * | | | | | | | | | | | | | | Update kr translation to messages.jsonnujabes4032018-03-151-5/+604
| | | |_|/ / / / / / / / / / / / | | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge pull request #3590 from SaptakS/feature/whitelistDan Finlay2018-03-171-1/+16
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | Inject Script: Blacklist domains where not to inject scriptSaptak Sengupta2018-03-171-1/+16
| | | |/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Update Confirm Contract screen (#3597)Alexander Tseung2018-03-171-0/+16
| * | | | | | | | | | | | | | | Fix messages typo (#3591)Thomas Huang2018-03-171-1/+1
| * | | | | | | | | | | | | | | More for i18nThomas2018-03-161-0/+210
| | |_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge pull request #3576 from Senshii/masterkumavis2018-03-161-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | fix plural in french translationsimon fourdinier2018-03-151-1/+1
| | |/ / / / / / / / / / / /
| * / / / / / / / / / / / / Update Deposit Eth icon (#3569)Alexander Tseung2018-03-161-0/+32
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Fetch localeMessages in front end only.Dan2018-03-202-13/+3
* | | | | | | | | | | | | Handle i18n with redux.Dan2018-03-164-8/+25
* | | | | | | | | | | | | Translation to JapaneseMami Mordovets2018-03-151-3/+602
* | | | | | | | | | | | | i18n - load locales manuallykumavis2018-03-151-59/+74
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #3545 from vincentlg/masterkumavis2018-03-151-0/+609
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Update messages.jsonVincent Le Gallic2018-03-151-12/+12
| * | | | | | | | | | | | Add French translationVincent Le Gallic2018-03-141-0/+609
| | |/ / / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | local-store - fix class syntaxkumavis2018-03-151-2/+2
* | | | | | | | | | | | local-store - check for error from extension.runtimekumavis2018-03-151-3/+28
* | | | | | | | | | | | local-store - fix promisification of methodskumavis2018-03-151-3/+2
| |/ / / / / / / / / / |/| | | | | | | | | |
* | | | | | | | | | | fix destructuring of variablesfrankiebee2018-03-141-1/+1
| |/ / / / / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge branch 'master' into i3076-UseStorageLocalInsteadkumavis2018-03-141-2/+4
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | tx-gas-utils - fix code stylekumavis2018-03-141-1/+1
| * | | | | | | | | | transactions move validation of the to field to validateRecipientfrankiebee2018-03-141-7/+3
| * | | | | | | | | | Merge remote-tracking branch 'origin/i#3509' into i#3509frankiebee2018-03-146-21/+703
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Merge branch 'master' into i#3509Frankie2018-03-146-21/+703
| | |\| | | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 19:41:31 +0800