Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | 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 | |
|\ \ | | | | | | | Docs: Add mitmweb, restructure installation | |||||
| * | | update installation page | Maximilian Hils | 2016-12-20 | 1 | -60/+69 | |
| | | | | | | | | | | | | | | | We emphasize the binary installation because that is usually the simplest method to install mitmproxy on all major platforms. | |||||
| * | | 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 | |||||
| * | | | 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 | |||||
| * | | 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 | |||||
| * | | 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 | |||||
| * | | | 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 | |||||
| * | | | bump h2 | Thomas Kriechbaumer | 2016-12-17 | 1 | -1/+1 | |
|/ / / | | | | | | | | | | This takes care of https://github.com/python-hyper/hyper-h2/issues/422 | |||||
* | | | Merge pull request #1871 from Kriechi/http2-gui | Maximilian Hils | 2016-12-17 | 4 | -3/+23 | |
|\ \ \ | | | | | | | | | display ALPN information | |||||
| * | | | 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 | |||||
| * | | 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 | |||||
| * | | 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 | |||||
| | * | Update CHANGELOG | Maximilian Hils | 2016-12-21 | 1 | -1/+1 | |
| | | | ||||||
| | * | Compat 0.19 -> 1.0 | Aldo Cortesi | 2016-12-17 | 1 | -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 adjustments | Aldo Cortesi | 2016-12-17 | 3 | -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.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 | |||||
| * | Addon test docs, remove stray deprecated events | Aldo Cortesi | 2016-12-17 | 2 | -3/+17 | |
|/ | | | | Fixes #1572 | |||||
* | Merge pull request #1863 from Kriechi/disable-h2c | Aldo Cortesi | 2016-12-17 | 2 | -0/+23 | |
|\ | | | | | disable h2c upgrades | |||||
| * | 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 | |||||
| * | | 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 | |||||
| * | | console: mark view indiciator, fix empty flow list behaviour | Aldo Cortesi | 2016-12-16 | 3 | -3/+12 | |
| |/ | | | | | | | Fixes #1782 | |||||
* | | Merge pull request #1860 from cortesi/smokey | Maximilian Hils | 2016-12-16 | 1 | -11/+11 | |
|\ \ | |/ |/| | Catch occasional protocol errors in regular connect | |||||
| * | Catch occasional protocol errors in regular connect | Aldo Cortesi | 2016-12-16 | 1 | -11/+11 | |
|/ | | | | Fixes #1843 and #1847 | |||||
* | Merge pull request #1845 from mhils/mitmweb-improvements | Aldo Cortesi | 2016-12-16 | 29 | -687/+59004 | |
|\ | | | | | Mitmweb Improvements | |||||
| * | [web] various fixes | Maximilian Hils | 2016-12-12 | 20 | -411/+677 | |
| | | ||||||
| * | [web] style flow menu | Maximilian Hils | 2016-12-11 | 5 | -86/+158 | |
| | | ||||||
| * | [web] style start menu | Maximilian Hils | 2016-12-11 | 3 | -4/+18 | |
| | | ||||||
| * | [web] style options menu | Maximilian Hils | 2016-12-11 | 10 | -133/+203 | |
| | | | | | | | | The other menus are WIP. | |||||
| * | [web] show proxy address, add websocket toggle | Maximilian Hils | 2016-12-11 | 8 | -492/+58387 | |
| | | ||||||
* | | Merge pull request #1857 from mitmproxy/bump-cryptography | Thomas Kriechbaumer | 2016-12-14 | 1 | -1/+1 | |
|\ \ | | | | | | | update dependencies | |||||
| * | | update dependencies | Maximilian Hils | 2016-12-14 | 1 | -1/+1 | |
|/ / | ||||||
* | | Merge pull request #1852 from mhils/simplenamespace | Maximilian Hils | 2016-12-13 | 3 | -23/+4 | |
|\ \ | | | | | | | Use types.SimpleNamespace instead of custom NS class | |||||
| * | | use types.SimpleNamespace instead of custom NS class | Maximilian Hils | 2016-12-13 | 3 | -23/+4 | |
| | | |