aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | turns out we need thisMaximilian Hils2016-12-271-0/+1
* | fix url.parse tests for Python 3.6Maximilian Hils2016-12-271-3/+10
* | py36: fix type informationThomas Kriechbaumer2016-12-271-7/+20
* | run tests on Python 3.6Thomas Kriechbaumer2016-12-275-3/+15
* | pyinstaller: use fixed bootloaders on linuxMaximilian Hils2016-12-271-1/+3
|/
* update windows dev scriptMaximilian Hils2016-12-261-1/+6
* add mitmweb explanation to introductionMaximilian Hils2016-12-261-0/+2
* Bump changelog timestampAldo Cortesi2016-12-261-1/+1
* Merge pull request #1865 from cortesi/adminAldo Cortesi2016-12-245-131/+102
|\
| * Merge branch 'master' into adminAldo Cortesi2016-12-2430-110/+310
| |\ | |/ |/|
* | remove output of dumper during testsThomas Kriechbaumer2016-12-214-8/+11
* | remove output of webmaster during testsThomas Kriechbaumer2016-12-211-0/+1
* | reflow docsThomas Kriechbaumer2016-12-212-25/+45
* | Merge pull request #1882 from mhils/docsThomas Kriechbaumer2016-12-214-60/+86
|\ \
| * | update installation pageMaximilian Hils2016-12-201-60/+69
| * | docs: add mitmweb stubMaximilian Hils2016-12-203-0/+17
* | | Merge pull request #1881 from mhils/fix-alpn-bytesThomas Kriechbaumer2016-12-204-6/+26
|\ \ \
| * | | always decode alpn where requiredMaximilian Hils2016-12-204-6/+26
| |/ /
* | | Merge pull request #1880 from mhils/1877Maximilian Hils2016-12-192-1/+14
|\ \ \ | |/ / |/| |
| * | fix #1877Maximilian Hils2016-12-192-1/+14
* | | Merge branch 'rename-log-example'Maximilian Hils2016-12-192-2/+2
|\ \ \
| * | | rename logging.py example. this conflicted with Python's stdlibMaximilian Hils2016-12-192-2/+2
| |/ /
* / / fix io compat with previous releasesMaximilian Hils2016-12-193-4/+99
|/ /
* | 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
| | * add mitmweb and Windows compat to changelogMaximilian Hils2016-12-221-0/+8
| | * Update CHANGELOGThomas Kriechbaumer2016-12-211-6/+7
| | * Update CHANGELOGMaximilian Hils2016-12-211-1/+1
| | * Compat 0.19 -> 1.0Aldo Cortesi2016-12-171-0/+6
| | * Administrivia: docs for new config file, minor adjustmentsAldo Cortesi2016-12-173-81/+11
| | * Release administrivia: changelog stub, contributors, bump to v1.0Aldo Cortesi2016-12-173-52/+78
| |/ |/|
* | 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
| |/