aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1813 from dwfreed/patch-1Maximilian Hils2016-12-041-1/+1
|\
| * release: fix dropping _main suffixDoug Freed2016-12-041-1/+1
|/
* Merge pull request #1801 from Kriechi/simplify-alpn-opensslThomas Kriechbaumer2016-12-0410-116/+151
|\
| * simplify ALPN and OpenSSL on macOSThomas Kriechbaumer2016-12-0410-116/+151
|/
* fix whitespaceThomas Kriechbaumer2016-12-031-0/+1
* fix indentationThomas Kriechbaumer2016-12-031-2/+2
* fix ALPN usageThomas Kriechbaumer2016-12-021-2/+2
* Merge pull request #1797 from Kriechi/websocket++Maximilian Hils2016-12-013-22/+67
|\
| * websocket: update close handshake testsThomas Kriechbaumer2016-11-291-0/+4
| * websocket: make flowfilter workThomas Kriechbaumer2016-11-291-6/+15
| * websocket: carry over per-message compression bitThomas Kriechbaumer2016-11-291-0/+2
| * websocket: reduce connection timeoutThomas Kriechbaumer2016-11-291-1/+1
| * websocket: fix message type on chunkingThomas Kriechbaumer2016-11-291-2/+5
| * websocket: fix close handshake and re-chunkingThomas Kriechbaumer2016-11-291-14/+33
| * websocket: fix empty frame with fin=1Thomas Kriechbaumer2016-11-291-1/+9
|/
* fix #1783 (#1794)Maximilian Hils2016-11-282-1/+20
* Merge pull request #1792 from Kriechi/mitmdump-filter-helpMaximilian Hils2016-11-282-2/+9
|\
| * improve mitmdump filter helpThomas Kriechbaumer2016-11-252-2/+9
* | 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
|/