aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of github.com:mitmproxy/mitmproxyMaximilian Hils2014-10-2312-225/+361
|\
| * Document http2https and https2httpAldo Cortesi2014-10-232-1/+30
| * Correct docs - we no longer support change of basic proxy mode in the console...Aldo Cortesi2014-10-232-6/+0
| * More refactoring of installation docsAldo Cortesi2014-10-232-20/+45
| * Keep sidebar ordering alphabetical, add SOCKS documentationAldo Cortesi2014-10-234-5/+17
| * CHANGELOG and CONTRIBUTORSAldo Cortesi2014-10-232-27/+84
| * First redraft of modes documentationAldo Cortesi2014-10-231-143/+155
| * Documentation re-orgAldo Cortesi2014-10-234-34/+41
* | fix typoMaximilian Hils2014-10-231-1/+1
* | update proxy modes diagramsMaximilian Hils2014-10-234-0/+0
|/
* fix #346Maximilian Hils2014-10-222-1/+16
|\
| * reverse proxy: adjust dst when reading flows, fix #346Maximilian Hils2014-09-082-2/+16
* | fix #378Maximilian Hils2014-10-221-3/+19
* | tweak SSL detection heuristicsMaximilian Hils2014-10-212-2/+17
* | fix race conditions in testsMaximilian Hils2014-10-193-0/+17
* | add generic tcp proxying, fix #374Maximilian Hils2014-10-1818-88/+250
* | remove default_caMaximilian Hils2014-10-184-8/+4
* | add test case for #375Maximilian Hils2014-10-171-0/+21
* | fix cert forwardingMaximilian Hils2014-10-091-1/+1
* | Add SOCKS5 mode, fix #305Maximilian Hils2014-10-094-11/+89
* | Merge branch 'cert_chains'Maximilian Hils2014-10-094-13/+15
|\ \
| * | add mini documentationMaximilian Hils2014-10-091-4/+6
| * | fix support for chained certificatesMaximilian Hils2014-10-084-9/+9
* | | fix typoMaximilian Hils2014-10-081-1/+1
|/ /
* | Merge branch 'master' of github.com:mitmproxy/mitmproxyMaximilian Hils2014-10-074-17/+97
|\ \
| * \ Merge pull request #371 from tekii/masterMaximilian Hils2014-10-044-17/+97
| |\ \
| | * | --replay-ignore-content & --replay-ignore-param ported from branch 0.10Marcelo Glezer2014-10-034-17/+97
| |/ /
| * | Merge pull request #369 from mitmproxy/distMaximilian Hils2014-10-012-85/+28
| |\ \
* | | | replay: carry over SNI valueMaximilian Hils2014-10-022-6/+4
| |/ / |/| |
* | | update MANIFEST.inMaximilian Hils2014-10-011-7/+7
* | | distutils -> setuptoolsMaximilian Hils2014-10-011-78/+21
|/ /
* | fix timestamp formatting: end_time may not be setMaximilian Hils2014-09-222-3/+8
* | beef up event logMaximilian Hils2014-09-2211-56/+291
* | web: perf improvementsMaximilian Hils2014-09-227-30/+62
* | web: various improvementsMaximilian Hils2014-09-218-106/+234
* | clean up timestamp handlingMaximilian Hils2014-09-212-8/+12
* | web: minor fixesMaximilian Hils2014-09-202-14/+18
* | web: display flow connection infoMaximilian Hils2014-09-1910-166/+485
* | web: flow iconsMaximilian Hils2014-09-194-10/+102
* | start to fill detailpaneMaximilian Hils2014-09-1911-18/+375
* | basic splitter -> kick-ass splitterMaximilian Hils2014-09-185-28/+94
* | add splitterMaximilian Hils2014-09-1810-100/+210
* | web: detailpane implMaximilian Hils2014-09-1817-265/+688
* | fix #361Maximilian Hils2014-09-183-8/+5
* | flowtable: add selection indicator, add keyboard navigationMaximilian Hils2014-09-1812-154/+376
* | .jsx -> .jsx.jsMaximilian Hils2014-09-187-11/+17
* | undo spritingMaximilian Hils2014-09-1718-109/+63
* | add features to the traffic table, introduce image spritingMaximilian Hils2014-09-1725-41/+396
* | implement FlowStore basicsMaximilian Hils2014-09-1717-66/+458
* | connect eventlog events to uiMaximilian Hils2014-09-1715-103/+89