Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | py36: fix type information | Thomas Kriechbaumer | 2016-12-27 | 1 | -7/+20 |
* | run tests on Python 3.6 | Thomas Kriechbaumer | 2016-12-27 | 5 | -3/+15 |
* | pyinstaller: use fixed bootloaders on linux | Maximilian Hils | 2016-12-27 | 1 | -1/+3 |
* | update windows dev script | Maximilian Hils | 2016-12-26 | 1 | -1/+6 |
* | add mitmweb explanation to introduction | Maximilian Hils | 2016-12-26 | 1 | -0/+2 |
* | Bump changelog timestamp | Aldo Cortesi | 2016-12-26 | 1 | -1/+1 |
* | Merge pull request #1865 from cortesi/admin | Aldo Cortesi | 2016-12-24 | 5 | -131/+102 |
|\ | |||||
| * | Merge branch 'master' into admin | Aldo Cortesi | 2016-12-24 | 30 | -110/+310 |
| |\ | |/ |/| | |||||
* | | remove output of dumper during tests | Thomas Kriechbaumer | 2016-12-21 | 4 | -8/+11 |
* | | remove output of webmaster during tests | Thomas Kriechbaumer | 2016-12-21 | 1 | -0/+1 |
* | | reflow docs | Thomas Kriechbaumer | 2016-12-21 | 2 | -25/+45 |
* | | Merge pull request #1882 from mhils/docs | Thomas Kriechbaumer | 2016-12-21 | 4 | -60/+86 |
|\ \ | |||||
| * | | update installation page | Maximilian Hils | 2016-12-20 | 1 | -60/+69 |
| * | | docs: add mitmweb stub | Maximilian Hils | 2016-12-20 | 3 | -0/+17 |
* | | | Merge pull request #1881 from mhils/fix-alpn-bytes | Thomas Kriechbaumer | 2016-12-20 | 4 | -6/+26 |
|\ \ \ | |||||
| * | | | always decode alpn where required | Maximilian Hils | 2016-12-20 | 4 | -6/+26 |
| |/ / | |||||
* | | | Merge pull request #1880 from mhils/1877 | Maximilian Hils | 2016-12-19 | 2 | -1/+14 |
|\ \ \ | |/ / |/| | | |||||
| * | | fix #1877 | Maximilian Hils | 2016-12-19 | 2 | -1/+14 |
* | | | Merge branch 'rename-log-example' | Maximilian Hils | 2016-12-19 | 2 | -2/+2 |
|\ \ \ | |||||
| * | | | rename logging.py example. this conflicted with Python's stdlib | Maximilian Hils | 2016-12-19 | 2 | -2/+2 |
| |/ / | |||||
* / / | fix io compat with previous releases | Maximilian Hils | 2016-12-19 | 3 | -4/+99 |
|/ / | |||||
* | | Merge pull request #1876 from mhils/1858 | Maximilian Hils | 2016-12-19 | 5 | -20/+29 |
|\ \ | |||||
| * | | fix #1858 | Maximilian Hils | 2016-12-19 | 5 | -20/+29 |
* | | | Merge pull request #1875 from Kriechi/dont-log-tracebacks | Thomas Kriechbaumer | 2016-12-17 | 3 | -9/+3 |
|\ \ \ | |||||
| * | | | don't log full tracebacks | Thomas Kriechbaumer | 2016-12-17 | 3 | -9/+3 |
* | | | | fix #1867 (#1873) | Maximilian Hils | 2016-12-17 | 1 | -2/+1 |
* | | | | Merge pull request #1874 from Kriechi/bump-h2 | Thomas Kriechbaumer | 2016-12-17 | 1 | -1/+1 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | bump h2 | Thomas Kriechbaumer | 2016-12-17 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge pull request #1871 from Kriechi/http2-gui | Maximilian Hils | 2016-12-17 | 4 | -3/+23 |
|\ \ \ | |||||
| * | | | display ALPN information | Thomas Kriechbaumer | 2016-12-17 | 4 | -3/+23 |
* | | | | Merge pull request #1872 from mhils/appveyor | Thomas Kriechbaumer | 2016-12-17 | 1 | -1/+1 |
|\ \ \ \ | |/ / / |/| / / | |/ / | |||||
| * | | appveyor: don't build installer for PRs | Maximilian Hils | 2016-12-17 | 1 | -1/+1 |
* | | | Merge pull request #1870 from Kriechi/http2-timeouts | Thomas Kriechbaumer | 2016-12-17 | 1 | -2/+2 |
|\ \ \ | |/ / |/| | | |||||
| * | | http2: faster timeouts | Thomas Kriechbaumer | 2016-12-17 | 1 | -2/+2 |
| | * | add mitmweb and Windows compat to changelog | Maximilian Hils | 2016-12-22 | 1 | -0/+8 |
| | * | Update CHANGELOG | Thomas Kriechbaumer | 2016-12-21 | 1 | -6/+7 |
| | * | Update CHANGELOG | Maximilian Hils | 2016-12-21 | 1 | -1/+1 |
| | * | Compat 0.19 -> 1.0 | Aldo Cortesi | 2016-12-17 | 1 | -0/+6 |
| | * | Administrivia: docs for new config file, minor adjustments | Aldo Cortesi | 2016-12-17 | 3 | -81/+11 |
| | * | Release administrivia: changelog stub, contributors, bump to v1.0 | Aldo Cortesi | 2016-12-17 | 3 | -52/+78 |
| |/ |/| | |||||
* | | Merge pull request #1864 from cortesi/tdocs | Aldo Cortesi | 2016-12-17 | 2 | -3/+17 |
|\ \ | |/ |/| | |||||
| * | Addon test docs, remove stray deprecated events | Aldo Cortesi | 2016-12-17 | 2 | -3/+17 |
|/ | |||||
* | Merge pull request #1863 from Kriechi/disable-h2c | Aldo Cortesi | 2016-12-17 | 2 | -0/+23 |
|\ | |||||
| * | disable h2c upgrades | Thomas Kriechbaumer | 2016-12-16 | 2 | -0/+23 |
* | | Merge pull request #1862 from mhils/remove-intercept-events | Aldo Cortesi | 2016-12-17 | 8 | -34/+33 |
|\ \ | |||||
| * | | remove intercept events, update view manually | Maximilian Hils | 2016-12-16 | 8 | -34/+33 |
* | | | Merge pull request #1861 from cortesi/marking | Aldo Cortesi | 2016-12-16 | 3 | -3/+12 |
|\ \ \ | |_|/ |/| | | |||||
| * | | console: mark view indiciator, fix empty flow list behaviour | Aldo Cortesi | 2016-12-16 | 3 | -3/+12 |
| |/ | |||||
* | | Merge pull request #1860 from cortesi/smokey | Maximilian Hils | 2016-12-16 | 1 | -11/+11 |
|\ \ | |/ |/| | |||||
| * | Catch occasional protocol errors in regular connect | Aldo Cortesi | 2016-12-16 | 1 | -11/+11 |
|/ |