aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Update ChangelogThomas2018-04-051-0/+2
* Merge branch 'master' into i#3791Thomas2018-04-052-1/+3
|\
| * Merge pull request #3880 from MetaMask/v4.5.3v4.5.3Thomas Huang2018-04-052-1/+3
| |\
| | * 4.5.3kumavis2018-04-052-1/+3
| |/
* / Add target=_blank exportAsFileThomas2018-04-052-0/+2
|/
* Merge pull request #3879 from MetaMask/normalize-transactionskumavis2018-04-058-89/+220
|\
| * transactions - make #_validateTxParams not async and "linting" wink wink nudg...frankiebee2018-04-052-18/+20
| * Merge branch 'master' of https://github.com/MetaMask/metamask-extension into ...frankiebee2018-04-056-6/+16
| |\ | |/ |/|
* | Merge pull request #3878 from MetaMask/hot-fix-for-new-uikumavis2018-04-052-1/+4
|\ \
| * | add to CHANGELOG.mdfrankiebee2018-04-051-0/+2
| * | hot-fix new-ui - default to an object if identities is undefinedfrankiebee2018-04-051-1/+2
|/ /
* | Merge pull request #3875 from danjm/i3837-to-field-rinkeby-kovanThomas Huang2018-04-051-2/+2
|\ \
| * | Don't prevent user from setting an eth address in to field if there is no ens...Dan2018-04-051-2/+2
* | | Merge pull request #3869 from MetaMask/4.5.2kumavis2018-04-052-1/+3
|\ \ \
| * | | 4.5.2v4.5.2kumavis2018-04-052-1/+3
|/ / /
* | | Merge pull request #3868 from MetaMask/chainid-fixkumavis2018-04-052-1/+3
|\ \ \ | |/ / |/| |
| * | changelog - add note on txParams.chainId validation changekumavis2018-04-051-0/+2
| * | tx - txParams - allow chainId to be a hex stringkumavis2018-04-041-1/+1
|/ /
* | Merge pull request #3862 from MetaMask/webby-awards-fixKevin Serrano2018-04-041-1/+5
|\ \
| * | Add webby awards to web3 block list.Dan Finlay2018-04-041-1/+5
|/ /
| * add to CHANGELOG.mdfrankiebee2018-04-051-0/+2
| * hot-fix - migrate unaproved txParams so that the from is lowercasefrankiebee2018-04-053-0/+83
| * transactions - normalize txParamsfrankiebee2018-04-054-80/+125
|/
* Merge pull request #3834 from MetaMask/3734kumavis2018-04-044-17/+37
|\
| * Address feedbackDavid Yoo2018-04-042-8/+24
| * Fix testsDavid Yoo2018-04-031-1/+1
| * Address Add Token design feedbackDavid Yoo2018-04-033-8/+12
* | Merge pull request #3854 from MetaMask/v4.5.1Dan Finlay2018-04-042-1/+6
|\ \
| * | 4.5.1v.4.5.1kumavis2018-04-042-1/+3
| * | changelog - add note on fixed NODE_ENV side effectskumavis2018-04-041-0/+3
|/ /
* | Merge pull request #3848 from MetaMask/i#3841kumavis2018-04-041-2/+10
|\ \
| * | 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
* | | Merge pull request #3850 from MetaMask/ci-improvementsThomas Huang2018-04-045-74/+144
|\ \ \ | |/ / |/| |
| * | ci - metamaskbot-announce - gracefully handle missing PRkumavis2018-04-041-47/+58
| * | ci - job-publish - publish source+sourcemaps to sentry if new releasekumavis2018-04-044-11/+63
| * | ci - metamaskbot announce - js style changekumavis2018-04-041-5/+5
| * | ci - rename job-announce to job-publishkumavis2018-04-041-2/+2
| * | ci - announce - add sourcemaps to artifactskumavis2018-04-041-0/+3
| * | ci - load npm deps by revision to always get latest for buildkumavis2018-04-041-12/+16
|/ /
* | Merge pull request #3846 from MetaMask/fetch-err-warnkumavis2018-04-045-44/+38
|\ \
| * | 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-045-44/+37
|/ /
* | Merge pull request #3845 from MetaMask/build-fix-envThomas Huang2018-04-048-18/+15
|\ \
| * | build - correctly set METAMASK_ENV via envifykumavis2018-04-048-18/+15
|/ /
* | Merge pull request #3835 from MetaMask/4.5.0v4.5.0Thomas Huang2018-04-032-3/+6
|\ \
| * | 4.5.0kumavis2018-04-032-2/+4
| * | changelog - add note on localeskumavis2018-04-031-1/+2
|/ /
* | Merge pull request #3830 from MetaMask/build-perfThomas Huang2018-04-033-13/+87
|\ \
| * \ Merge branch 'master' of github.com:MetaMask/metamask-extension into build-perfkumavis2018-04-0341-974/+4192
| |\ \
| * | | build - use uglifyify and gulp-multi-process for better performancekumavis2018-03-313-64/+91
* | | | Merge pull request #3833 from MetaMask/ci-patchkumavis2018-04-031-1/+0
|\ \ \ \ | |_|/ / |/| | |
| * | | ci - dont log unneeded env varkumavis2018-04-031-1/+0
|/ / /
* | | Merge pull request #3831 from MetaMask/i#3770Frankie2018-04-034-6/+42
|\ \ \
| * | | tests - fix txController tests so that txMetas have a from feildfrankiebee2018-04-031-2/+4
| * | | transactions gasLimit - use the block gasLimit if getCode failsfrankiebee2018-04-032-3/+6
| * | | transactions validationt - valdate from field on txParamsfrankiebee2018-04-032-1/+32
* | | | Merge pull request #3805 from MetaMask/ci-screenskumavis2018-04-0310-355/+3156
|\ \ \ \ | |_|_|/ |/| | |
| * | | Merge branch 'master' of github.com:MetaMask/metamask-extension into ci-screenskumavis2018-04-0313-351/+341
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #3828 from MetaMask/lint-sys-fixkumavis2018-04-038-8/+6
|\ \ \ \
| * \ \ \ Merge branch 'master' into lint-sys-fixkumavis2018-04-0318-302/+646
| |\ \ \ \
| * | | | | lint - remove use of 'event' globalkumavis2018-04-032-3/+3
| * | | | | lint - rules - disallow 'event' globalkumavis2018-04-031-0/+1
| * | | | | old-ui - lint fixeskumavis2018-04-034-4/+1
| * | | | | lint - include old uikumavis2018-04-031-2/+2
| | |_|_|/ | |/| | |
* | | | | Merge pull request #3825 from danjm/i3668-warnusertxsimulationfailsThomas Huang2018-04-035-343/+335
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Adds simulation failure error messages to confirm screen.Dan2018-04-034-0/+44
| * | | | UpdateSendErrors only called when balance defined, recalled if balance updates.Dan2018-04-033-343/+291
| | | * | ci:screens - turn on repeat in walkthrough gifkumavis2018-04-031-1/+1
| | | * | deps - update shell-parallelkumavis2018-04-032-4/+15
| | | * | Merge branch 'master' of github.com:MetaMask/metamask-extension into ci-screenskumavis2018-04-035-12/+130
| | | |\ \ | |_|_|/ / |/| | | |
* | | | | Merge pull request #3829 from MetaMask/locales-lintThomas Huang2018-04-035-3/+121
|\ \ \ \ \
| * | | | | lint - i18n - ru - lint fixkumavis2018-04-031-0/+1
| * | | | | lint - lint json files in app/kumavis2018-04-034-3/+120
|/ / / / /
| | | * | Merge branch 'master' of github.com:MetaMask/metamask-extension into ci-screenskumavis2018-04-0327-642/+1120
| | | |\ \ | |_|_|/ / |/| | | |
* | | | | Merge pull request #3826 from danjm/ensure-txparams-0xprefixedkumavis2018-04-031-0/+4
|\ \ \ \ \
| * | | | | Ensure txParams are prefixed with 0x when sending.Dan2018-04-031-0/+4
| |/ / / /
* | | | | Merge pull request #3763 from MetaMask/i18n-helperkumavis2018-04-0311-125/+81
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | deps - bump package-lock.jsonkumavis2018-04-031-47/+0
| * | | | Update translating-guide.mdkumavis2018-04-031-3/+6
| * | | | Merge branch 'master' into i18n-helperkumavis2018-04-03111-1215/+2523
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge pull request #3783 from gornov/masterkumavis2018-04-031-172/+250
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Modified Russian localization. resolves #3534, #3644Gornov Dmitry2018-03-291-172/+250
* | | | | Merge pull request #3816 from MetaMask/kumavis-patch-2Dan Finlay2018-04-011-3/+2
|\ \ \ \ \
| * | | | | identicon - set blockies height and width to identicon diameterkumavis2018-03-311-3/+2
|/ / / / /
* | | | | Merge pull request #3801 from danjm/i3684-txlistitemstestkumavis2018-03-312-0/+189
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Adds integration tests for rendering of tx list items.Dan2018-03-302-0/+189
* | | | | Merge pull request #3774 from danjm/i3686-txparamundefined-sigrequestsintxlistkumavis2018-03-313-9/+22
|\| | | |
| * | | | Merge branch 'master' into i3686-txparamundefined-sigrequestsintxlistDan2018-03-3087-562/+1036
| |\ \ \ \
| * | | | | Ensure correct address used when rendering transfer transactions.Dan2018-03-291-1/+2
| * | | | | Fix display of unapprovedMessages in txList (old and new ui); includes fix of...Dan2018-03-283-9/+21
* | | | | | Merge pull request #3762 from danjm/i3471-checkbalanceonconfirmscreenkumavis2018-03-316-21/+175
|\ \ \ \ \ \
| * | | | | | Fix lint and testsDan2018-03-302-4/+4
| * | | | | | Merge branch 'master' into i3471-checkbalanceonconfirmscreenDan2018-03-3087-561/+1035
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| * | | | | | Show insufficient funds on confirm screen on first render.Dan2018-03-302-1/+21
| * | | | | | Confirm send token detects if balance is sufficient for gas.Dan2018-03-281-0/+3
| * | | | | | Merge branch 'master' into i3471-checkbalanceonconfirmscreenkumavis2018-03-28107-723/+1250
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| * | | | | | Confirm send token detects if balance is sufficient for gas.Dan2018-03-282-7/+56
| * | | | | | Checking for sufficient balance in confirm ether screen; includes error messa...Dan2018-03-284-15/+97
* | | | | | | Merge pull request #3808 from MetaMask/txMeta-originkumavis2018-03-314-16/+21
|\ \ \ \ \ \ \
| * | | | | | | 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
| * | | | | | | deps - bump proviedr-enginefrankiebee2018-03-312-13/+13
* | | | | | | | Merge pull request #3806 from MetaMask/build-dev-fixFrankie2018-03-312-7/+5
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | build - properly set GULP_METAMASK_DEBUG on devkumavis2018-03-312-7/+5
|/ / / / / / /
| | | | | * | i18n - further improve locale verifierkumavis2018-03-281-41/+28
| | | | | * | i18n - cleanup verify locales utilkumavis2018-03-281-66/+80
| | | | | * | i18n - fix casing for key 'downloadStateLogs'kumavis2018-03-288-8/+8
| | | |_|/ / | | |/| | |
| | | | | * ci - screens - increase delay before setting provider typekumavis2018-03-311-1/+1
| | | | | * ci - breakout announce job to upload builds and screenshotskumavis2018-03-311-13/+35
| | | | | * ci - screens - add delay after setting networkkumavis2018-03-311-0/+1
| | | | | * ci - build:announce - fix script pathkumavis2018-03-311-1/+1
| | | | | * ci - build:announce - replace bash qith js because of string escaping nightmarekumavis2018-03-312-34/+52
| | | | | * ci - build:announce - fix json escapingkumavis2018-03-311-6/+6
| | | | | * ci - build:announce - fix json escapingkumavis2018-03-311-6/+6
| | | | | * ci - build:announce - fix shell script pathkumavis2018-03-311-1/+1
| | | | | * ci - build:announce - break out into shell scriptkumavis2018-03-312-32/+35
| | | | | * ci - build:announce - rewrite github comment to include walkthrough gifkumavis2018-03-311-9/+23
| | | | | * development - ci-screens - remove mocha wrapper that was losing exit codekumavis2018-03-313-117/+12
| | | | | * development - screens - fix screenshot on failurekumavis2018-03-311-3/+4
| | | | | * development - screens - screenshot on failurekumavis2018-03-311-4/+25
| | | | | * Merge branch 'master' of github.com:MetaMask/metamask-extension into ci-screenskumavis2018-03-3126-667/+1249
| | | | | |\ | |_|_|_|_|/ |/| | | | |
* | | | | | Merge pull request #3781 from MetaMask/ci-artifactsThomas Huang2018-03-3126-434/+833
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | clean - mascara - remove unused codekumavis2018-03-301-2/+0
| * | | | | mascara - server - serve bundles from distkumavis2018-03-303-14/+1
| * | | | | npm scripts - rewrite default scripts to new task nameskumavis2018-03-301-6/+5
| * | | | | build - split primary tasks into metamask + extension * dev + buildkumavis2018-03-301-7/+55
| * | | | | build - cleanup commented codekumavis2018-03-301-27/+0
| * | | | | build - fix scss + js reloadkumavis2018-03-301-8/+12
| * | | | | build - fix copy devModekumavis2018-03-301-32/+31
| * | | | | build - refactor scss compilation into single configkumavis2018-03-301-18/+63
| * | | | | build - dev - fix js build orderkumavis2018-03-301-1/+1
| * | | | | build - dev - run js tasks in parallel and set watch flagkumavis2018-03-301-3/+4
| * | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into ci-artif...kumavis2018-03-3081-512/+952
| |\ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | ci - build:announce - fix links to extension buildskumavis2018-03-291-4/+5
| * | | | | ci - build:announce - fix linkkumavis2018-03-291-5/+5
| * | | | | ci - build:announce - link all buildskumavis2018-03-291-2/+9
| * | | | | ci - artifacts - upload extension builds, dont upload extension sourcekumavis2018-03-291-1/+4
| * | | | | npm scripts - simplify and speed up dist buildskumavis2018-03-291-2/+1
| * | | | | ci - upload whole dist + fix announce mascara urlkumavis2018-03-291-3/+3
| * | | | | ui - fix typo in settingskumavis2018-03-291-1/+1
| * | | | | ci - artifacts - simplify result pathkumavis2018-03-291-0/+1
| * | | | | deps - update package-lockkumavis2018-03-292-88/+226
| * | | | | ui - add guard against unset localekumavis2018-03-291-1/+2
| * | | | | build - refactor copy and copy:watch (renamed to copy:dev)kumavis2018-03-291-44/+62
| * | | | | ui - identicon - use relative link for ether logokumavis2018-03-291-1/+1
| * | | | | ui - use relative location for imageskumavis2018-03-294-5/+5
| * | | | | ui - fix relative url for deposit-ether-modalkumavis2018-03-291-1/+1
| * | | | | ui - use relative url for i18n-helper fetching localeskumavis2018-03-291-1/+1
| * | | | | mascara - fix proxy html script linkkumavis2018-03-291-1/+1
| * | | | | deps - update pakage-lockkumavis2018-03-291-10/+97
| * | | | | mascara - use sw-controller and other cleanupskumavis2018-03-295-40/+50
| * | | | | build - extension - move js files to toplevelkumavis2018-03-296-14/+14
| * | | | | build - mascara - copy proxy htmlkumavis2018-03-291-4/+13
| * | | | | build - refactor js build processkumavis2018-03-291-43/+66
| * | | | | build - fix mascara sourcemaps destkumavis2018-03-291-49/+46
| * | | | | build - remove copy debugkumavis2018-03-291-1/+1
| * | | | | build - remove deprecated deps taskkumavis2018-03-291-12/+0
| * | | | | build - refactor copy taskskumavis2018-03-291-26/+46
| * | | | | mascara - server - server bundles before static assets + serve dist/mascara i...kumavis2018-03-291-9/+8
| * | | | | mascara - html - fix script locationskumavis2018-03-292-4/+4
| * | | | | ci - announce QA build to GitHub pull requestkumavis2018-03-291-0/+12
| * | | | | ui - css - use relative path for fontskumavis2018-03-291-14/+14
| * | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into ci-artif...kumavis2018-03-296-49/+83
| |\ \ \ \ \
| * | | | | | build - refactor build task generators + add mascara to standard build phasekumavis2018-03-291-86/+116
| * | | | | | mascara - move file locations to match extension structurekumavis2018-03-293-6/+6
| * | | | | | ci - upload mascara build as artifactkumavis2018-03-291-2/+1
| * | | | | | build - rename 'popup.js' to 'ui.js'kumavis2018-03-294-3/+3
| * | | | | | ui - change window title 'MetaMask Plugin' to 'MetaMask'kumavis2018-03-293-3/+3
| * | | | | | ci - publish dist as artifactkumavis2018-03-291-0/+3
| | |_|/ / / | |/| | | |
| | | | | * test - e2e - set network to localhostkumavis2018-03-311-0/+6
| | | | | * ci - e2e+screens - add sleep to make sure ganache is readykumavis2018-03-311-2/+2
| | | | | * ci - e2e+screens - use shell-parallel to run ganachekumavis2018-03-312-17/+205
| | | | | * Update package-lockThomas2018-03-311-0/+1819
| | | | | * Ganache:start script with seed phraseThomas2018-03-311-2/+4
| | | | | * development - screens - use localhost for networkkumavis2018-03-312-6/+20
| | | | | * network - use providerType for localhostkumavis2018-03-312-6/+7
| | | | | * ci - run screenshotterkumavis2018-03-301-0/+21
| | | | | * development - screenshotter - capture en locale and build gif from only enkumavis2018-03-301-7/+8
| | | | | * development - screenshotter - capture screens across all localeskumavis2018-03-302-13/+35
| | | | | * development - create selenium screen shotterkumavis2018-03-303-45/+246
| | | | | * test - add auto screen shotterkumavis2018-03-304-1/+276
| |_|_|_|/ |/| | | |
* | | | | Merge pull request #3788 from danjm/i3787-make-t-available-via-contextkumavis2018-03-3073-451/+818
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' into i3787-make-t-available-via-contextDan2018-03-303-6/+29
| |\ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | Merge pull request #3798 from MetaMask/e2e-selectorThomas Huang2018-03-303-6/+29
|\ \ \ \ \ \
| * | | | | | ci - upload e2e test artifactskumavis2018-03-301-0/+3
| * | | | | | Merge branch 'master' into e2e-selectorkumavis2018-03-3013-89/+177
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | test - e2e - fix selector with extra div (?)kumavis2018-03-301-1/+1
| * | | | | | test - e2e - generate artifacts on test failurekumavis2018-03-302-6/+26
| | * | | | | Add changelog entry for language selection.Dan2018-03-301-0/+1
| | * | | | | Stopping wrapping provider children in div; stop wrapping old-ui in provider.Dan2018-03-303-6/+5
| | * | | | | Merge branch 'master' into i3787-make-t-available-via-contextDan2018-03-305-52/+67
| | |\ \ \ \ \ | |_|/ / / / / |/| | | | | |
* | | | | | | Merge pull request #3795 from MetaMask/i3790-IncreaseSafeGasLimitkumavis2018-03-302-3/+4
|\ \ \ \ \ \ \
| * | | | | | | Bump changelogDan Finlay2018-03-301-0/+1
| * | | | | | | Increase permitted safe gas limitDan Finlay2018-03-301-3/+3
* | | | | | | | Merge pull request #3794 from MetaMask/e2e-selectorThomas Huang2018-03-301-17/+16
|\ \ \ \ \ \ \ \
| * | | | | | | | Better delays and fix logout css selectorThomas2018-03-301-3/+6
| | |/ / / / / / | |/| | | | | |
| * | | | | | | test - e2e - prefer css selectors over xpathkumavis2018-03-301-15/+11
| | |_|/ / / / | |/| | | | |
* | | | | | | i18n - Update German LocaleNico2018-03-301-24/+39
* | | | | | | Merge pull request #3786 from FBrinkkemper/patch-1kumavis2018-03-301-8/+8
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | changed zaad -> back-up woordenFBrinkkemper2018-03-291-8/+8
|/ / / / / /
| | * / / / Removes t from props via metamask-connect and instead places it on context vi...Dan2018-03-2973-450/+817
| |/ / / / |/| | | |
* | | | | Merge pull request #3782 from MetaMask/i3670-FixNonceBugFrankie2018-03-292-3/+38
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Rename variable to be more understandableDan Finlay2018-03-292-5/+21
| * | | | Add test to reproduce issue behaviorDan Finlay2018-03-291-0/+19
| | |/ / | |/| |
* | | | Merge pull request #3777 from MetaMask/etc-fixesFrankie2018-03-293-38/+54
|\ \ \ \
| * | | | controllers - currency - warn currency and encountered errorkumavis2018-03-291-1/+1
| * | | | deps - bump ethjs-query to fix unhandled promise rejectionskumavis2018-03-292-14/+19
| * | | | deps - update package-lock (maybe greenkeeper forgot?)kumavis2018-03-291-23/+34
| | |/ / | |/| |
* | | | 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
| |/ / /
* | | | Merge pull request #3767 from MetaMask/tx-state-undefined-valueFrankie2018-03-292-9/+17
|\ \ \ \ | |/ / / |/| | |
| * | | tx controller - explode on non-hex txParams + dont add chainId to txParams + ...kumavis2018-03-282-9/+17
|/ / /
* | | Merge pull request #3713 from MetaMask/greenkeeper/eslint-plugin-mocha-5.0.0kumavis2018-03-281-1/+1
|\ \ \
| * | | chore(package): update eslint-plugin-mocha to version 5.0.0greenkeeper[bot]2018-03-241-1/+1
* | | | Merge pull request #3652 from MetaMask/greenkeeper/sinon-5.0.0kumavis2018-03-281-1/+1
|\ \ \ \
| * | | | chore(package): update sinon to version 5.0.0greenkeeper[bot]2018-03-221-1/+1
* | | | | 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-282-34/+41
|\ \ \ \ \ \
| * | | | | | metamask-controller - fix typokumavis2018-03-281-1/+1
| * | | | | | Fix bug where resetAccount does not clear network cacheDan Finlay2018-03-282-34/+41
* | | | | | | Merge pull request #3745 from danjm/i3723-fix-long-token-ammountskumavis2018-03-281-1/+8
|\ \ \ \ \ \ \
| * | | | | | | Long token amounts in wallet are truncated with ellipsis.Dan2018-03-271-1/+8
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge pull request #3742 from danjm/i3705-prefix-to-address-with-0xkumavis2018-03-281-1/+3
|\ \ \ \ \ \ \
| * | | | | | | Prefixes to addresses with 0x before sending.Dan2018-03-271-1/+3
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge pull request #3741 from MetaMask/i3692-addtoken-address-undefinedkumavis2018-03-281-1/+4
|\ \ \ \ \ \ \
| * | | | | | | Prevent users from adding custom token if decimals is an empty string.Dan2018-03-271-1/+4
| |/ / / / / /
* | | | | | | Merge pull request #3740 from danjm/i3682-navigateTo-undefinedkumavis2018-03-281-5/+0
|\ \ \ \ \ \ \
| * | | | | | | Stop using navigateTo for external link in settings.Dan2018-03-271-5/+0
| |/ / / / / /
* | | | | | | Merge pull request #3743 from gasolin/buyetherviewkumavis2018-03-281-2/+0
|\ \ \ \ \ \ \
| * | | | | | | remove unavailable goToBuyEtherView propTypegasolin2018-03-271-2/+0
| |/ / / / / /
* | | | | | | Merge pull request #3609 from MetaMask/i18n-translator-reduxkumavis2018-03-28100-650/+1155
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | i18n - fix locales indekumavis2018-03-281-1/+1
| * | | | | | ui - actions - fix log for background callkumavis2018-03-281-1/+1
| * | | | | | ui - settings - fix for currentLocalekumavis2018-03-281-2/+3
| * | | | | | ui - settings - derrive locales from indexkumavis2018-03-281-8/+1
| * | | | | | i18n - derrive locale codes from indexkumavis2018-03-281-3/+2
| * | | | | | development - genStates - simplify locale importingkumavis2018-03-282-14/+2
| * | | | | | i18n - add locales index jsonkumavis2018-03-281-0/+19
| * | | | | | test - integration - add locale build stepkumavis2018-03-281-2/+4
| * | | | | | Merge branch 'i18n-translator-redux' of github.com:MetaMask/metamask-extensio...kumavis2018-03-281-1/+3
| |\ \ \ \ \ \
| | * | | | | | Don't query for undefined.Dan2018-03-281-1/+3
| * | | | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into i18n-tra...kumavis2018-03-286-12/+194
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| / / / / / / | |/ / / / / /
* | | | | | | Merge pull request #3758 from MetaMask/i#3731kumavis2018-03-285-9/+154
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into i#3731frankiebee2018-03-285-28/+118
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | |
| * | | | | | | migration for removing unnecessary transactions from statefrankiebee2018-03-284-3/+154
| * | | | | | | transactions - only save up to 40 txs totall across all networksfrankiebee2018-03-271-6/+1
* | | | | | | | Merge pull request #3755 from MetaMask/revert-3730-revert-3665-ci-buildThomas Huang2018-03-281-3/+40
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |