Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | | | |||||
* | | | Merge pull request #1851 from mhils/1850 | Maximilian Hils | 2016-12-13 | 5 | -36/+47 |
|\ \ \ | |/ / |/| | | fix #1850 | ||||
| * | | fix #1850 | Maximilian Hils | 2016-12-13 | 5 | -36/+47 |
|/ / | |||||
* | | console: respect follow in eventlog | Doug Freed | 2016-12-12 | 2 | -1/+5 |
| | | | | | | | | Also make it possible to toggle the option when the eventlog window has focus. | ||||
* | | console: increase eventlog size limit to 10000 | Doug Freed | 2016-12-12 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #1842 from cortesi/optsave | Aldo Cortesi | 2016-12-12 | 10 | -37/+80 |
|\ \ | | | | | | | Save options to file from console & related work | ||||
| * | | Minor fixes | Aldo Cortesi | 2016-12-12 | 1 | -5/+4 |
| | | | |||||
| * | | Merge branch 'master' into optsave | Aldo Cortesi | 2016-12-12 | 16 | -31/+240 |
| |\ \ | |/ / |/| | | |||||
* | | | InstallBuilder (#1826) | Maximilian Hils | 2016-12-11 | 13 | -14/+216 |
| | | | |||||
* | | | Merge pull request #1838 from mhils/http2-is-difficult | Aldo Cortesi | 2016-12-12 | 1 | -13/+15 |
|\ \ \ | | | | | | | | | Disable HTTP/2 by default, add explicit on/off switches | ||||
| * | | | disable http2 by default, add explicit on/off switches | Maximilian Hils | 2016-12-11 | 1 | -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/1809 | Maximilian Hils | 2016-12-11 | 2 | -4/+9 |
|\ \ \ \ | | | | | | | | | | | Fix #1809 | ||||
| * | | | | fix version sourcing in setup.py | Maximilian Hils | 2016-12-11 | 2 | -5/+7 |
| | | | | | |||||
| * | | | | fix #1809 | Maximilian Hils | 2016-12-10 | 1 | -0/+3 |
| | | | | | |||||
| | | * | | console: clean path prompt handling | Aldo Cortesi | 2016-12-12 | 6 | -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 Options | Aldo Cortesi | 2016-12-12 | 1 | -5/+5 |
| | | | | | | | | | | | | | | | | | | | | Bytes don't play well with our config serialization or command-line args. | ||||
| | | * | | Extend type checker validate Sequence specs | Aldo Cortesi | 2016-12-12 | 2 | -7/+24 |
| | | | | | |||||
| | | * | | console: add saving of config file | Aldo Cortesi | 2016-12-12 | 2 | -1/+15 |
| |_|/ / |/| | | | |||||
* | | | | Merge pull request #1841 from mitmproxy/fix-docs-tests | Maximilian Hils | 2016-12-11 | 2 | -0/+5 |
|\ \ \ \ | | | | | | | | | | | pin docutils version to fix docs tests | ||||
| * | | | | fix install.rst | Maximilian Hils | 2016-12-11 | 1 | -0/+4 |
| | | | | | |||||
| * | | | | pin docutils version to fix docs tests | Maximilian Hils | 2016-12-11 | 1 | -0/+1 |
|/ / / / | |||||
* | | | | Merge pull request #1840 from mhils/1829 | Maximilian Hils | 2016-12-11 | 1 | -9/+12 |
|\ \ \ \ | | | | | | | | | | | fix #1829 | ||||
| * | | | | fix #1829 | Maximilian Hils | 2016-12-11 | 1 | -9/+12 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #1839 from mhils/1830 | Maximilian Hils | 2016-12-11 | 2 | -5/+7 |
|\ \ \ \ | |/ / / |/| | | | fix #1830 | ||||
| * | | | fix #1830 | Maximilian Hils | 2016-12-11 | 2 | -5/+7 |
|/ / / | |||||
* | | | Merge pull request #1836 from Kriechi/wipeout-lxml | Maximilian Hils | 2016-12-11 | 1 | -49/+37 |
|\ \ \ | | | | | | | | | docs: update installation | ||||
| * | | | docs: update installation | Thomas Kriechbaumer | 2016-12-11 | 1 | -49/+37 |
| | |/ | |/| | |||||
* | | | Merge pull request #1835 from Kriechi/bump | Maximilian Hils | 2016-12-11 | 1 | -5/+5 |
|\ \ \ | |/ / |/| | | bump dependencies | ||||
| * | | bump dependencies | Thomas Kriechbaumer | 2016-12-10 | 1 | -5/+5 |
|/ / | |||||
* | | Merge pull request #1831 from mhils/contentviews | Aldo Cortesi | 2016-12-11 | 54 | -1011/+1257 |
|\ \ | |/ |/| | Split contentviews.py into mitmproxy.contentviews | ||||
| * | minor fixes | Maximilian Hils | 2016-12-10 | 4 | -4/+4 |
| | | |||||
| * | add new xml/html pretty-printer :tada: | Maximilian Hils | 2016-12-10 | 12 | -2/+338 |
| | | |||||
| * | remove lxml-dependent code | Maximilian Hils | 2016-12-10 | 11 | -130/+30 |
| | | |||||
| * | update tests, increase coverage, add type info | Maximilian Hils | 2016-12-09 | 32 | -379/+435 |
| | | |||||
| * | 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 | 2 | -5/+4 |
|\ \ | |/ |/| | remove backport.ssl_match_hostname | ||||
| * | remove backport.ssl_match_hostname | Thomas Kriechbaumer | 2016-12-10 | 2 | -5/+4 |
| | | | | | | | | This is already included in Python 3.5+ | ||||
* | | Merge pull request #1827 from mhils/issue-1803 | Maximilian Hils | 2016-12-09 | 1 | -0/+1 |
|\ \ | | | | | | | Fix #1803 | ||||
| * | | fix #1803 | Maximilian Hils | 2016-12-09 | 1 | -0/+1 |
|/ / | |||||
* | | Merge pull request #1823 from cortesi/options2 | Aldo Cortesi | 2016-12-08 | 7 | -29/+54 |
|\ \ | | | | | | | options: add a merge method to assimilate options |