aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* fix pyinstallerMaximilian Hils2016-11-2816-118/+141
* Fix transparent mode initialisation, refactor mitmproxy.platform (#1787)Maximilian Hils2016-11-2510-68/+74
* mitmweb: include console loggingMaximilian Hils2016-11-251-10/+30
* mitmweb: add --no-browserMaximilian Hils2016-11-253-3/+13
* fix pyinstaller (#1788)Maximilian Hils2016-11-259-122/+27
* update dependencies (#1789)Maximilian Hils2016-11-251-1/+1
* Merge branch 'mitmweb-eventlog'Maximilian Hils2016-11-2322-275/+505
|\
| * mitmweb: 100% app test coverage, numerous fixesMaximilian Hils2016-11-2314-126/+377
| * minor fixesMaximilian Hils2016-11-234-11/+9
| * add eventstore testsMaximilian Hils2016-11-231-0/+32
| * mitmweb: fix event displayMaximilian Hils2016-11-233-5/+4
| * mitmweb: cleanup, reimplement eventlogMaximilian Hils2016-11-234-137/+87
* | fix contentview attributesMaximilian Hils2016-11-231-3/+6
* | Merge commit '9bc5adf'Maximilian Hils2016-11-2321-178/+454
|\ \
| * | add more websocket indicators to mitmproxy and mitmdumpThomas Kriechbaumer2016-11-234-20/+32
| * | add metadata info to flow detail viewThomas Kriechbaumer2016-11-232-2/+11
| * | websocket: show messages in the eventlogThomas Kriechbaumer2016-11-231-0/+1
| * | fix docsThomas Kriechbaumer2016-11-232-2/+2
| * | disable TCP support for nowThomas Kriechbaumer2016-11-231-3/+4
| * | websocket: add testsThomas Kriechbaumer2016-11-235-4/+37
| * | websocket: change cmdline optionThomas Kriechbaumer2016-11-234-13/+14
| * | websocket: add event documentationThomas Kriechbaumer2016-11-231-12/+46
| * | add WebSocket flows and messagesThomas Kriechbaumer2016-11-238-54/+238
| * | rename WebSocket{s,} protocolThomas Kriechbaumer2016-11-239-45/+46
| |/
* / bump cryptography dependencyThomas Kriechbaumer2016-11-231-1/+1
|/
* make the new mypy release happyMaximilian Hils2016-11-233-0/+11
* Update README.mdMaximilian Hils2016-11-221-0/+1
* Update README.mdMaximilian Hils2016-11-221-0/+1
* remove mitmweb authMaximilian Hils2016-11-223-18/+1
* don't set an empty ALPN, refs #1772Maximilian Hils2016-11-221-1/+1
* Merge pull request #1769 from mhils/update-pydivertMaximilian Hils2016-11-212-42/+44
|\
| * update pydivert, fix #1749Maximilian Hils2016-11-212-42/+44
|/
* Descriptive error message for SSL context initialization failure (#1767)Yoginski2016-11-212-1/+35
* remove stickycookie exampleMaximilian Hils2016-11-212-43/+0
* Merge pull request #1768 from mhils/organize-examplesMaximilian Hils2016-11-2143-268/+196
|\
| * organize examplesMaximilian Hils2016-11-2143-268/+196
|/
* rewrite absolute-form HTTP requests to relative form, fix #1759 (#1765)Maximilian Hils2016-11-203-0/+22
* Merge pull request #1766 from Kriechi/fix-test-raceThomas Kriechbaumer2016-11-201-5/+15
|\
| * tests: fix race conditionThomas Kriechbaumer2016-11-201-5/+15
* | handle SIGINT with a quit prompt (#1760)Edgar Boda-Majer2016-11-201-9/+18
|/
* Merge pull request #1751 from dwfreed/patch-1Thomas Kriechbaumer2016-11-192-3/+6
|\
| * proxy/protocol/base: Allow spoofing fixed sourceDoug Freed2016-11-182-3/+6
* | Merge pull request #1757 from fotinakis/masterThomas Kriechbaumer2016-11-191-1/+1
|\ \ | |/ |/|
| * Remove dead run_scripthooks example reference.Mike Fotinakis2016-11-171-1/+1
* | Merge pull request #1753 from mitmproxy/update-dependenciesThomas Kriechbaumer2016-11-1814-3/+20
|\ \ | |/ |/|
| * lint!Maximilian Hils2016-11-1813-1/+18
| * update dependenciesMaximilian Hils2016-11-181-2/+2
|/
* Merge pull request #1729 from mhils/mitmweb-fixesMaximilian Hils2016-11-169-36/+76
|\
| * fix type checksMaximilian Hils2016-11-161-2/+2
| * mitmweb: start browser on startupMaximilian Hils2016-11-161-3/+34