aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | |
* | | Merge pull request #1851 from mhils/1850Maximilian Hils2016-12-135-36/+47
|\ \ \ | |/ / |/| | fix #1850
| * | fix #1850Maximilian Hils2016-12-135-36/+47
|/ /
* | console: respect follow in eventlogDoug Freed2016-12-122-1/+5
| | | | | | | | Also make it possible to toggle the option when the eventlog window has focus.
* | console: increase eventlog size limit to 10000Doug Freed2016-12-121-1/+1
| |
* | Merge pull request #1842 from cortesi/optsaveAldo Cortesi2016-12-1210-37/+80
|\ \ | | | | | | Save options to file from console & related work
| * | Minor fixesAldo Cortesi2016-12-121-5/+4
| | |
| * | Merge branch 'master' into optsaveAldo Cortesi2016-12-1216-31/+240
| |\ \ | |/ / |/| |
* | | InstallBuilder (#1826)Maximilian Hils2016-12-1113-14/+216
| | |
* | | Merge pull request #1838 from mhils/http2-is-difficultAldo Cortesi2016-12-121-13/+15
|\ \ \ | | | | | | | | Disable HTTP/2 by default, add explicit on/off switches
| * | | disable http2 by default, add explicit on/off switchesMaximilian Hils2016-12-111-13/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As long as major HTTP/2 implementers fail to implement the spec correctly, we need to disable HTTP/2 by default. We expect this to be fixed with the next release and re-enabled by default. https://github.com/mitmproxy/mitmproxy/issues/1745 https://github.com/mitmproxy/mitmproxy/issues/1824
* | | | Merge pull request #1837 from mhils/1809Maximilian Hils2016-12-112-4/+9
|\ \ \ \ | | | | | | | | | | Fix #1809
| * | | | fix version sourcing in setup.pyMaximilian Hils2016-12-112-5/+7
| | | | |
| * | | | fix #1809Maximilian Hils2016-12-101-0/+3
| | | | |
| | | * | console: clean path prompt handlingAldo Cortesi2016-12-126-27/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Don't trigger callback if no path is specified - Expand userdir centrally - Catch IO errors from callbacks and turn them into status messages
| | | * | Replacements and SetHeaders are both defined as text in OptionsAldo Cortesi2016-12-121-5/+5
| | | | | | | | | | | | | | | | | | | | Bytes don't play well with our config serialization or command-line args.
| | | * | Extend type checker validate Sequence specsAldo Cortesi2016-12-122-7/+24
| | | | |
| | | * | console: add saving of config fileAldo Cortesi2016-12-122-1/+15
| |_|/ / |/| | |
* | | | Merge pull request #1841 from mitmproxy/fix-docs-testsMaximilian Hils2016-12-112-0/+5
|\ \ \ \ | | | | | | | | | | pin docutils version to fix docs tests
| * | | | fix install.rstMaximilian Hils2016-12-111-0/+4
| | | | |
| * | | | pin docutils version to fix docs testsMaximilian Hils2016-12-111-0/+1
|/ / / /
* | | | Merge pull request #1840 from mhils/1829Maximilian Hils2016-12-111-9/+12
|\ \ \ \ | | | | | | | | | | fix #1829
| * | | | fix #1829Maximilian Hils2016-12-111-9/+12
| | |_|/ | |/| |
* | | | Merge pull request #1839 from mhils/1830Maximilian Hils2016-12-112-5/+7
|\ \ \ \ | |/ / / |/| | | fix #1830
| * | | fix #1830Maximilian Hils2016-12-112-5/+7
|/ / /
* | | Merge pull request #1836 from Kriechi/wipeout-lxmlMaximilian Hils2016-12-111-49/+37
|\ \ \ | | | | | | | | docs: update installation
| * | | docs: update installationThomas Kriechbaumer2016-12-111-49/+37
| | |/ | |/|
* | | Merge pull request #1835 from Kriechi/bumpMaximilian Hils2016-12-111-5/+5
|\ \ \ | |/ / |/| | bump dependencies
| * | bump dependenciesThomas Kriechbaumer2016-12-101-5/+5
|/ /
* | Merge pull request #1831 from mhils/contentviewsAldo Cortesi2016-12-1154-1011/+1257
|\ \ | |/ |/| Split contentviews.py into mitmproxy.contentviews
| * minor fixesMaximilian Hils2016-12-104-4/+4
| |
| * add new xml/html pretty-printer :tada:Maximilian Hils2016-12-1012-2/+338
| |
| * remove lxml-dependent codeMaximilian Hils2016-12-1011-130/+30
| |
| * update tests, increase coverage, add type infoMaximilian Hils2016-12-0932-379/+435
| |
| * split contentviews.py into mitmproxy.contentviewsMaximilian Hils2016-12-0917-672/+626
| |
* | minor fixesMaximilian Hils2016-12-101-1/+2
| |
* | Merge pull request #1834 from Kriechi/remove_ssl_match_hostnameMaximilian Hils2016-12-102-5/+4
|\ \ | |/ |/| remove backport.ssl_match_hostname
| * remove backport.ssl_match_hostnameThomas Kriechbaumer2016-12-102-5/+4
| | | | | | | | This is already included in Python 3.5+
* | Merge pull request #1827 from mhils/issue-1803Maximilian Hils2016-12-091-0/+1
|\ \ | | | | | | Fix #1803
| * | fix #1803Maximilian Hils2016-12-091-0/+1
|/ /
* | Merge pull request #1823 from cortesi/options2Aldo Cortesi2016-12-087-29/+54
|\ \ | | | | | | options: add a merge method to assimilate options