aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* fix #1877Maximilian Hils2016-12-192-1/+14
* Merge pull request #1876 from mhils/1858Maximilian Hils2016-12-195-20/+29
|\
| * fix #1858Maximilian Hils2016-12-195-20/+29
* | Merge pull request #1875 from Kriechi/dont-log-tracebacksThomas Kriechbaumer2016-12-173-9/+3
|\ \
| * | don't log full tracebacksThomas Kriechbaumer2016-12-173-9/+3
* | | fix #1867 (#1873)Maximilian Hils2016-12-171-2/+1
* | | Merge pull request #1874 from Kriechi/bump-h2Thomas Kriechbaumer2016-12-171-1/+1
|\ \ \ | |/ / |/| |
| * | bump h2Thomas Kriechbaumer2016-12-171-1/+1
|/ /
* | Merge pull request #1871 from Kriechi/http2-guiMaximilian Hils2016-12-174-3/+23
|\ \
| * | display ALPN informationThomas Kriechbaumer2016-12-174-3/+23
* | | Merge pull request #1872 from mhils/appveyorThomas Kriechbaumer2016-12-171-1/+1
|\ \ \ | |/ / |/| / | |/
| * appveyor: don't build installer for PRsMaximilian Hils2016-12-171-1/+1
* | Merge pull request #1870 from Kriechi/http2-timeoutsThomas Kriechbaumer2016-12-171-2/+2
|\ \ | |/ |/|
| * http2: faster timeoutsThomas Kriechbaumer2016-12-171-2/+2
* | Merge pull request #1864 from cortesi/tdocsAldo Cortesi2016-12-172-3/+17
|\ \ | |/ |/|
| * 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-09 11:34:35 +0000