aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Addon test docs, remove stray deprecated eventsAldo Cortesi2016-12-172-3/+17
* 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-178-34/+33
|\ \
| * | remove intercept events, update view manuallyMaximilian Hils2016-12-168-34/+33
* | | Merge pull request #1861 from cortesi/markingAldo Cortesi2016-12-163-3/+12
|\ \ \ | |_|/ |/| |
| * | console: mark view indiciator, fix empty flow list behaviourAldo Cortesi2016-12-163-3/+12
| |/
* | Merge pull request #1860 from cortesi/smokeyMaximilian Hils2016-12-161-11/+11
|\ \ | |/ |/|
| * Catch occasional protocol errors in regular connectAldo Cortesi2016-12-161-11/+11
|/
* Merge pull request #1845 from mhils/mitmweb-improvementsAldo Cortesi2016-12-1629-687/+59004
|\
| * [web] various fixesMaximilian Hils2016-12-1220-411/+677
| * [web] style flow menuMaximilian Hils2016-12-115-86/+158
| * [web] style start menuMaximilian Hils2016-12-113-4/+18
| * [web] style options menuMaximilian Hils2016-12-1110-133/+203
| * [web] show proxy address, add websocket toggleMaximilian Hils2016-12-118-492/+58387
* | Merge pull request #1857 from mitmproxy/bump-cryptographyThomas Kriechbaumer2016-12-141-1/+1
|\ \
| * | update dependenciesMaximilian Hils2016-12-141-1/+1
|/ /
* | Merge pull request #1852 from mhils/simplenamespaceMaximilian Hils2016-12-133-23/+4
|\ \
| * | use types.SimpleNamespace instead of custom NS classMaximilian Hils2016-12-133-23/+4
* | | Merge pull request #1851 from mhils/1850Maximilian Hils2016-12-135-36/+47
|\ \ \ | |/ / |/| |
| * | fix #1850Maximilian Hils2016-12-135-36/+47
|/ /
* | console: respect follow in eventlogDoug Freed2016-12-122-1/+5
* | console: increase eventlog size limit to 10000Doug Freed2016-12-121-1/+1
* | Merge pull request #1842 from cortesi/optsaveAldo Cortesi2016-12-1210-37/+80
|\ \
| * | Minor fixesAldo Cortesi2016-12-121-5/+4
| * | Merge branch 'master' into optsaveAldo Cortesi2016-12-1216-31/+240
| |\ \ | |/ / |/| |
* | | InstallBuilder (#1826)Maximilian Hils2016-12-1113-14/+216
* | | 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-112-4/+9
|\ \ \ \
| * | | | fix version sourcing in setup.pyMaximilian Hils2016-12-112-5/+7
| * | | | fix #1809Maximilian Hils2016-12-101-0/+3
| | | * | console: clean path prompt handlingAldo Cortesi2016-12-126-27/+40
| | | * | Replacements and SetHeaders are both defined as text in OptionsAldo Cortesi2016-12-121-5/+5
| | | * | Extend type checker validate Sequence specsAldo Cortesi2016-12-122-7/+24
| | | * | console: add saving of config fileAldo Cortesi2016-12-122-1/+15
| |_|/ / |/| | |
* | | | Merge pull request #1841 from mitmproxy/fix-docs-testsMaximilian Hils2016-12-112-0/+5
|\ \ \ \
| * | | | fix install.rstMaximilian Hils2016-12-111-0/+4
| * | | | pin docutils version to fix docs testsMaximilian Hils2016-12-111-0/+1
|/ / / /
* | | | Merge pull request #1840 from mhils/1829Maximilian Hils2016-12-111-9/+12
|\ \ \ \
| * | | | fix #1829Maximilian Hils2016-12-111-9/+12
| | |_|/ | |/| |
* | | | Merge pull request #1839 from mhils/1830Maximilian Hils2016-12-112-5/+7
|\ \ \ \ | |/ / / |/| | |
| * | | fix #1830Maximilian Hils2016-12-112-5/+7
|/ / /
* | | Merge pull request #1836 from Kriechi/wipeout-lxmlMaximilian Hils2016-12-111-49/+37
|\ \ \
| * | | docs: update installationThomas Kriechbaumer2016-12-111-49/+37
| | |/ | |/|
* | | Merge pull request #1835 from Kriechi/bumpMaximilian Hils2016-12-111-5/+5
|\ \ \ | |/ / |/| |
| * | bump dependenciesThomas Kriechbaumer2016-12-101-5/+5
|/ /
* | Merge pull request #1831 from mhils/contentviewsAldo Cortesi2016-12-1154-1011/+1257
|\ \ | |/ |/|
| * minor fixesMaximilian Hils2016-12-104-4/+4
| * add new xml/html pretty-printer :tada:Maximilian Hils2016-12-1012-2/+338