aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #3766 from Kriechi/bump-urwidThomas Kriechbaumer2019-12-311-1/+1
|\
| * bump urwidThomas Kriechbaumer2019-12-311-1/+1
|/
* Merge pull request #3762 from asfaltboy/add-pep-561-py.typedMaximilian Hils2019-12-292-0/+1
|\
| * Add py.typed stub as per PEP-561Pavel Savchenko2019-12-292-0/+1
|/
* update CHANGELOG for 5.0.1Maximilian Hils2019-12-271-0/+5
* pyinstaller: add publicsuffix2 hookMaximilian Hils2019-12-271-0/+3
* enable UTF-8 icons for WSLMaximilian Hils2019-12-271-1/+1
* Merge pull request #3758 from pasanr/patch-1Thomas Kriechbaumer2019-12-271-2/+2
|\
| * Minor typo of 'with'pasanr2019-12-251-2/+2
|/
* Merge pull request #3754 from mhils/docker-latestMaximilian Hils2019-12-212-5/+10
|\
| * docker: auto-update latest tagMaximilian Hils2019-12-212-5/+10
|/
* update release instructionsMaximilian Hils2019-12-212-15/+17
* `mitmproxy --version`: incorporate non-annotated tagsMaximilian Hils2019-12-212-2/+2
* update release checklistMaximilian Hils2019-12-211-10/+5
* Merge pull request #3747 from cixtor/masterMaximilian Hils2019-12-201-1/+1
|\
| * Fix #3571 to support image/webp in mitmweb to display previewsCixtor2019-12-171-1/+1
|/
* update trove classifiersMaximilian Hils2019-12-161-6/+4
* Revert "ci: run on tags"Maximilian Hils2019-12-161-1/+1
* bump versionMaximilian Hils2019-12-161-1/+1
* bump versionMaximilian Hils2019-12-161-1/+1
* ci: run on tagsMaximilian Hils2019-12-161-1/+1
* Merge pull request #3745 from mhils/v5.xMaximilian Hils2019-12-129-6249/+8315
|\
| * update CHANGELOG for 5.0Maximilian Hils2019-12-121-0/+43
| * [web] update compiled assetsMaximilian Hils2019-12-123-5/+5
| * [web] fix status column renderingMaximilian Hils2019-12-121-5/+5
| * [web] update gulp to fix nodejs compatibilityMaximilian Hils2019-12-123-6234/+8251
| * fix #3722Maximilian Hils2019-12-121-5/+11
|/
* Merge pull request #3724 from typoon/command-history-fileMaximilian Hils2019-12-128-218/+633
|\
| * Making linter happyHenrique2019-11-271-1/+0
| * Fixed small issueHenrique2019-11-271-2/+2
| * Fixed small bugs on command_history and testsHenrique2019-11-272-157/+173
| * Merge branch 'command-history-file' of github.com:typoon/mitmproxy into comma...Henrique2019-11-275-221/+105
| |\
| | * command history: start adjusting testsMaximilian Hils2019-11-262-83/+32
| | * simplify command history addonMaximilian Hils2019-11-263-138/+73
| * | Merge branch 'master' of github.com:mitmproxy/mitmproxy into command-history-...Henrique2019-11-271-1/+0
| |\ \
| * \ \ Merge branch 'mitmproxy-improve-commander' of github.com:typoon/mitmproxy int...Henrique2019-11-271-7/+42
| |\ \ \ | | |_|/ | |/| |
| * | | Addressing comments from reviewHenrique2019-11-253-46/+86
| * | | Removing the remotepdb stuff.Henrique2019-11-251-5/+0
| * | | Fixing it back to what it wasHenrique2019-11-251-5/+6
| * | | Logic to handle multiple instances using CommandHistory.Henrique2019-11-252-13/+99
| * | | Make windows happy once againHenrique2019-11-251-0/+8
| * | | Make windows happyHenrique2019-11-251-0/+2
| * | | Making windows happyHenrique2019-11-251-0/+1
| * | | Oops, forgot to add the tests for the CommandHistory addonHenrique2019-11-251-0/+196
| * | | Making windows happyHenrique2019-11-251-0/+7
| * | | Moved confdir check logic into the addonHenrique2019-11-252-13/+7
| * | | Make `mypy` happyHenrique2019-11-241-1/+1
| * | | Fixed the logic according to some tests, added new testsHenrique2019-11-244-261/+314
| * | | Making the linter happyHenrique2019-11-235-15/+5
| * | | Fix to check if command_history file exists prior to trying to read itHenrique2019-11-231-2/+5