| Commit message (Expand) | Author | Age | Files | Lines |
* | 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 | 1 | -1/+1 |
* | Release administrivia: changelog stub, contributors, bump to v1.0 | Aldo Cortesi | 2016-12-17 | 1 | -1/+1 |
* | Addon test docs, remove stray deprecated events | Aldo Cortesi | 2016-12-17 | 1 | -3/+0 |
* | 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 | 6 | -26/+27 |
|\ \ |
|
| * | | remove intercept events, update view manually | Maximilian Hils | 2016-12-16 | 6 | -26/+27 |
* | | | Merge pull request #1861 from cortesi/marking | Aldo Cortesi | 2016-12-16 | 2 | -3/+7 |
|\ \ \
| |_|/
|/| | |
|
| * | | console: mark view indiciator, fix empty flow list behaviour | Aldo Cortesi | 2016-12-16 | 2 | -3/+7 |
| |/ |
|
* / | Catch occasional protocol errors in regular connect | Aldo Cortesi | 2016-12-16 | 1 | -11/+11 |
|/ |
|
* | Merge pull request #1845 from mhils/mitmweb-improvements | Aldo Cortesi | 2016-12-16 | 7 | -493/+58563 |
|\ |
|
| * | [web] various fixes | Maximilian Hils | 2016-12-12 | 6 | -354/+542 |
| * | [web] show proxy address, add websocket toggle | Maximilian Hils | 2016-12-11 | 5 | -488/+58370 |
* | | Merge pull request #1852 from mhils/simplenamespace | Maximilian Hils | 2016-12-13 | 1 | -15/+3 |
|\ \ |
|
| * | | use types.SimpleNamespace instead of custom NS class | Maximilian Hils | 2016-12-13 | 1 | -15/+3 |
* | | | fix #1850 | Maximilian Hils | 2016-12-13 | 4 | -35/+45 |
|/ / |
|
* | | console: respect follow in eventlog | Doug Freed | 2016-12-12 | 2 | -1/+5 |
* | | console: increase eventlog size limit to 10000 | Doug Freed | 2016-12-12 | 1 | -1/+1 |
* | | Minor fixes | Aldo Cortesi | 2016-12-12 | 1 | -5/+4 |
* | | Merge branch 'master' into optsave | Aldo Cortesi | 2016-12-12 | 2 | -13/+18 |
|\ \ |
|
| * \ | Merge pull request #1838 from mhils/http2-is-difficult | Aldo Cortesi | 2016-12-12 | 1 | -13/+15 |
| |\ \ |
|
| | * | | disable http2 by default, add explicit on/off switches | Maximilian Hils | 2016-12-11 | 1 | -13/+15 |
| | |/ |
|
| * | | Merge pull request #1837 from mhils/1809 | Maximilian Hils | 2016-12-11 | 1 | -0/+3 |
| |\ \ |
|
| | * | | fix version sourcing in setup.py | Maximilian Hils | 2016-12-11 | 1 | -1/+1 |
| | * | | fix #1809 | Maximilian Hils | 2016-12-10 | 1 | -0/+3 |
* | | | | console: clean path prompt handling | Aldo Cortesi | 2016-12-12 | 5 | -26/+39 |
* | | | | Replacements and SetHeaders are both defined as text in Options | Aldo Cortesi | 2016-12-12 | 1 | -5/+5 |
* | | | | Extend type checker validate Sequence specs | Aldo Cortesi | 2016-12-12 | 1 | -6/+12 |
* | | | | console: add saving of config file | Aldo Cortesi | 2016-12-12 | 2 | -1/+15 |
|/ / / |
|
* | | | Merge pull request #1840 from mhils/1829 | Maximilian Hils | 2016-12-11 | 1 | -9/+12 |
|\ \ \ |
|
| * | | | fix #1829 | Maximilian Hils | 2016-12-11 | 1 | -9/+12 |
| | |/
| |/| |
|
* / | | fix #1830 | Maximilian Hils | 2016-12-11 | 2 | -5/+7 |
|/ / |
|
* | | Merge pull request #1831 from mhils/contentviews | Aldo Cortesi | 2016-12-11 | 18 | -672/+822 |
|\ \
| |/
|/| |
|
| * | minor fixes | Maximilian Hils | 2016-12-10 | 1 | -1/+1 |
| * | add new xml/html pretty-printer :tada: | Maximilian Hils | 2016-12-10 | 2 | -1/+236 |
| * | remove lxml-dependent code | Maximilian Hils | 2016-12-10 | 4 | -91/+19 |
| * | update tests, increase coverage, add type info | Maximilian Hils | 2016-12-09 | 9 | -45/+78 |
| * | split contentviews.py into mitmproxy.contentviews | Maximilian Hils | 2016-12-09 | 17 | -672/+626 |
* | | minor fixes | Maximilian Hils | 2016-12-10 | 1 | -1/+2 |
* | | Merge pull request #1834 from Kriechi/remove_ssl_match_hostname | Maximilian Hils | 2016-12-10 | 1 | -4/+4 |
|\ \
| |/
|/| |
|
| * | remove backport.ssl_match_hostname | Thomas Kriechbaumer | 2016-12-10 | 1 | -4/+4 |
* | | fix #1803 | Maximilian Hils | 2016-12-09 | 1 | -0/+1 |
* | | options: add a merge method to assimilate options | Aldo Cortesi | 2016-12-08 | 4 | -24/+31 |
* | | console: use an addon to capture logs | Aldo Cortesi | 2016-12-08 | 1 | -4/+6 |
* | | Minor tweaks | Aldo Cortesi | 2016-12-08 | 2 | -6/+8 |
* | | Amalgamate all the Options objects | Aldo Cortesi | 2016-12-08 | 4 | -53/+50 |
* | | Replace configargparse with argparse, enable new options loading | Aldo Cortesi | 2016-12-08 | 4 | -119/+123 |
* | | Add YAML serialization of options | Aldo Cortesi | 2016-12-08 | 1 | -4/+0 |
* | | options: defaults are a class attribute | Aldo Cortesi | 2016-12-08 | 1 | -9/+4 |