aboutsummaryrefslogtreecommitdiffstats
path: root/mitmproxy
Commit message (Expand)AuthorAgeFilesLines
* Compat 0.19 -> 1.0Aldo Cortesi2016-12-171-0/+6
* Administrivia: docs for new config file, minor adjustmentsAldo Cortesi2016-12-171-1/+1
* Release administrivia: changelog stub, contributors, bump to v1.0Aldo Cortesi2016-12-171-1/+1
* Addon test docs, remove stray deprecated eventsAldo Cortesi2016-12-171-3/+0
* Merge pull request #1863 from Kriechi/disable-h2cAldo Cortesi2016-12-172-0/+23
|\
| * disable h2c upgradesThomas Kriechbaumer2016-12-162-0/+23
* | Merge pull request #1862 from mhils/remove-intercept-eventsAldo Cortesi2016-12-176-26/+27
|\ \
| * | remove intercept events, update view manuallyMaximilian Hils2016-12-166-26/+27
* | | Merge pull request #1861 from cortesi/markingAldo Cortesi2016-12-162-3/+7
|\ \ \ | |_|/ |/| |
| * | console: mark view indiciator, fix empty flow list behaviourAldo Cortesi2016-12-162-3/+7
| |/
* / Catch occasional protocol errors in regular connectAldo Cortesi2016-12-161-11/+11
|/
* Merge pull request #1845 from mhils/mitmweb-improvementsAldo Cortesi2016-12-167-493/+58563
|\
| * [web] various fixesMaximilian Hils2016-12-126-354/+542
| * [web] show proxy address, add websocket toggleMaximilian Hils2016-12-115-488/+58370
* | Merge pull request #1852 from mhils/simplenamespaceMaximilian Hils2016-12-131-15/+3
|\ \
| * | use types.SimpleNamespace instead of custom NS classMaximilian Hils2016-12-131-15/+3
* | | fix #1850Maximilian Hils2016-12-134-35/+45
|/ /
* | console: respect follow in eventlogDoug Freed2016-12-122-1/+5
* | console: increase eventlog size limit to 10000Doug Freed2016-12-121-1/+1
* | Minor fixesAldo Cortesi2016-12-121-5/+4
* | Merge branch 'master' into optsaveAldo Cortesi2016-12-122-13/+18
|\ \
| * \ Merge pull request #1838 from mhils/http2-is-difficultAldo Cortesi2016-12-121-13/+15
| |\ \
| | * | disable http2 by default, add explicit on/off switchesMaximilian Hils2016-12-111-13/+15
| | |/
| * | Merge pull request #1837 from mhils/1809Maximilian Hils2016-12-111-0/+3
| |\ \
| | * | fix version sourcing in setup.pyMaximilian Hils2016-12-111-1/+1
| | * | fix #1809Maximilian Hils2016-12-101-0/+3
* | | | console: clean path prompt handlingAldo Cortesi2016-12-125-26/+39
* | | | Replacements and SetHeaders are both defined as text in OptionsAldo Cortesi2016-12-121-5/+5
* | | | Extend type checker validate Sequence specsAldo Cortesi2016-12-121-6/+12
* | | | console: add saving of config fileAldo Cortesi2016-12-122-1/+15
|/ / /
* | | Merge pull request #1840 from mhils/1829Maximilian Hils2016-12-111-9/+12
|\ \ \
| * | | fix #1829Maximilian Hils2016-12-111-9/+12
| | |/ | |/|
* / | fix #1830Maximilian Hils2016-12-112-5/+7
|/ /
* | Merge pull request #1831 from mhils/contentviewsAldo Cortesi2016-12-1118-672/+822
|\ \ | |/ |/|
| * minor fixesMaximilian Hils2016-12-101-1/+1
| * add new xml/html pretty-printer :tada:Maximilian Hils2016-12-102-1/+236
| * remove lxml-dependent codeMaximilian Hils2016-12-104-91/+19
| * update tests, increase coverage, add type infoMaximilian Hils2016-12-099-45/+78
| * split contentviews.py into mitmproxy.contentviewsMaximilian Hils2016-12-0917-672/+626
* | minor fixesMaximilian Hils2016-12-101-1/+2
* | Merge pull request #1834 from Kriechi/remove_ssl_match_hostnameMaximilian Hils2016-12-101-4/+4
|\ \ | |/ |/|
| * remove backport.ssl_match_hostnameThomas Kriechbaumer2016-12-101-4/+4
* | fix #1803Maximilian Hils2016-12-091-0/+1
* | options: add a merge method to assimilate optionsAldo Cortesi2016-12-084-24/+31
* | console: use an addon to capture logsAldo Cortesi2016-12-081-4/+6
* | Minor tweaksAldo Cortesi2016-12-082-6/+8
* | Amalgamate all the Options objectsAldo Cortesi2016-12-084-53/+50
* | Replace configargparse with argparse, enable new options loadingAldo Cortesi2016-12-084-119/+123
* | Add YAML serialization of optionsAldo Cortesi2016-12-081-4/+0
* | options: defaults are a class attributeAldo Cortesi2016-12-081-9/+4