aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | reflow docsThomas Kriechbaumer2016-12-212-25/+45
| |
* | Merge pull request #1882 from mhils/docsThomas Kriechbaumer2016-12-214-60/+86
|\ \ | | | | | | Docs: Add mitmweb, restructure installation
| * | update installation pageMaximilian Hils2016-12-201-60/+69
| | | | | | | | | | | | | | | We emphasize the binary installation because that is usually the simplest method to install mitmproxy on all major platforms.
| * | 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 Required
| * | | always decode alpn where requiredMaximilian Hils2016-12-204-6/+26
| |/ /
* | | Merge pull request #1880 from mhils/1877Maximilian Hils2016-12-192-1/+14
|\ \ \ | |/ / |/| | Fix #1877
| * | 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 #1858
| * | 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 tracebacks
| * | | 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 h2
| * | | bump h2Thomas Kriechbaumer2016-12-171-1/+1
|/ / / | | | | | | | | | This takes care of https://github.com/python-hyper/hyper-h2/issues/422
* | | Merge pull request #1871 from Kriechi/http2-guiMaximilian Hils2016-12-174-3/+23
|\ \ \ | | | | | | | | display ALPN information
| * | | 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 PRs
| * | 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 timeouts
| * | 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 changelog
| | * Update CHANGELOGMaximilian Hils2016-12-211-1/+1
| | |
| | * Compat 0.19 -> 1.0Aldo Cortesi2016-12-171-0/+6
| | | | | | | | | | | | | | | 0.19 was never released, but let's include a conversion for it anyway, since it was the master version.
| | * Administrivia: docs for new config file, minor adjustmentsAldo Cortesi2016-12-173-81/+11
| | | | | | | | | | | | | | | For now, the config file docs basically say "it's YAML, read the source". We should do better for the next release.
| | * 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 events
| * Addon test docs, remove stray deprecated eventsAldo Cortesi2016-12-172-3/+17
|/ | | | Fixes #1572
* Merge pull request #1863 from Kriechi/disable-h2cAldo Cortesi2016-12-172-0/+23
|\ | | | | disable h2c upgrades
| * 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 manually
| * | 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 behaviour
| * | console: mark view indiciator, fix empty flow list behaviourAldo Cortesi2016-12-163-3/+12
| |/ | | | | | | Fixes #1782
* | Merge pull request #1860 from cortesi/smokeyMaximilian Hils2016-12-161-11/+11
|\ \ | |/ |/| Catch occasional protocol errors in regular connect
| * Catch occasional protocol errors in regular connectAldo Cortesi2016-12-161-11/+11
|/ | | | Fixes #1843 and #1847
* Merge pull request #1845 from mhils/mitmweb-improvementsAldo Cortesi2016-12-1629-687/+59004
|\ | | | | Mitmweb Improvements
| * [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
| | | | | | | | The other menus are WIP.
| * [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 dependencies
| * | 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 class
| * | use types.SimpleNamespace instead of custom NS classMaximilian Hils2016-12-133-23/+4
| | |