Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | fixing logic | kira0204 | 2018-02-07 | 2 | -7/+11 | |
| | | | | | ||||||
* | | | | | Merge pull request #2860 from emedvedev/patch-1 | Thomas Kriechbaumer | 2018-02-11 | 1 | -4/+4 | |
|\ \ \ \ \ | | | | | | | | | | | | | Fix a typo in events.rst | |||||
| * | | | | | Fix a typo in events.rst | Edward Medvedev | 2018-02-11 | 1 | -4/+4 | |
|/ / / / / | | | | | | | | | | | This PR fixes a tiny typo in the documentation. | |||||
* | | | | | Merge pull request #2803 from kajojify/issue-2777 | Maximilian Hils | 2018-02-10 | 3 | -4/+15 | |
|\ \ \ \ \ | | | | | | | | | | | | | Persist flowfilter when editing it, fix #2777 | |||||
| * | | | | | Docs | Miroslav | 2018-02-08 | 1 | -2/+4 | |
| | | | | | | ||||||
| * | | | | | New command | Miroslav | 2018-02-08 | 4 | -20/+13 | |
| | | | | | | ||||||
| * | | | | | Fix #2777 | Miroslav | 2018-01-19 | 2 | -2/+18 | |
| | | | | | | ||||||
* | | | | | | Merge pull request #2851 from mhils/always-use-tls-settings | Maximilian Hils | 2018-02-10 | 5 | -27/+46 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Use TLS options also for request replay | |||||
| * | | | | | | use TLS options also for request replay, refs #2840 | Maximilian Hils | 2018-02-08 | 5 | -27/+46 | |
| | | | | | | | ||||||
* | | | | | | | Merge pull request #2855 from gokulchandra/patch-1 | Thomas Kriechbaumer | 2018-02-09 | 1 | -2/+1 | |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | Fixes issue with the pfctl config on OSX | |||||
| * | | | | | | Updates the pfctl config | Gokul | 2018-02-09 | 1 | -2/+1 | |
|/ / / / / / | | | | | | | | | | | | | The previous config threw a syntax error when saving. | |||||
* | | | | | | Merge pull request #2852 from kajojify/excess_return | Maximilian Hils | 2018-02-08 | 1 | -1/+1 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Excess return was deleted | |||||
| * | | | | | | Excess return was deleted | Miroslav | 2018-02-08 | 1 | -1/+1 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #2842 from mitmproxy/web-timings | Maximilian Hils | 2018-02-07 | 1 | -1/+1 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | [web] fix timing display for keepalive connections | |||||
| * | | | | | | [web] fix timing display for keepalive connections | Maximilian Hils | 2018-02-05 | 1 | -1/+1 | |
| | |_|/ / / | |/| | | | | | | | | | | see https://discourse.mitmproxy.org/t/mitmweb-details-tab-timing/848/3 | |||||
* / | | | | | [requires.io] dependency update on master branch (#2848) | Thomas Kriechbaumer | 2018-02-07 | 1 | -1/+1 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #2835 from MatthewShao/mitmweb-sort | Maximilian Hils | 2018-02-05 | 3 | -3/+10 | |
|\ \ \ \ \ | |_|_|/ / |/| | | | | [web] Fix unstable sorting | |||||
| * | | | | [web] Fix unstable sorting by using 'stable' dependency | Matthew Shao | 2018-02-05 | 3 | -3/+10 | |
| | | | | | ||||||
* | | | | | Extend mypy checking, fix #2194 (#2819) | Arushit Mudgal | 2018-02-03 | 6 | -56/+68 | |
| | | | | | ||||||
* | | | | | don't raise when pyperclip doesn't find a clipboard, fix #2816 | Samoilenko Roman | 2018-02-03 | 4 | -4/+27 | |
| | | | | | ||||||
* | | | | | add shortcuts for console.choose, fix #2785 | Samoilenko Roman | 2018-02-03 | 1 | -6/+25 | |
|/ / / / | ||||||
* | | | | Merge pull request #2833 from mitmproxy/issue-2824 | Maximilian Hils | 2018-02-01 | 2 | -2/+16 | |
|\| | | | | | | | | | | | Improve error message for missing scripts, fix #2824 | |||||
| * | | | remove quotes around filename | Maximilian Hils | 2018-02-01 | 2 | -1/+15 | |
| | | | | ||||||
| * | | | improve error message for missing scripts, fix #2824 | Maximilian Hils | 2018-02-01 | 1 | -1/+1 | |
|/ / / | ||||||
* | | | Merge pull request #2814 from kajojify/issue-2753 | Maximilian Hils | 2018-01-30 | 4 | -12/+21 | |
|\ \ \ | | | | | | | | | Fix #2753. Fix resetting editings. | |||||
| * | | | Fix #2753. Fix resetting editings. | Miroslav | 2018-01-26 | 4 | -12/+21 | |
| |/ / | ||||||
* | | | Merge pull request #2825 from kajojify/realtime_counter | Maximilian Hils | 2018-01-30 | 1 | -1/+2 | |
|\ \ \ | | | | | | | | | Real-time flow counter | |||||
| * | | | Real-time flow counter | Miroslav | 2018-01-30 | 1 | -1/+2 | |
|/ / / | ||||||
* | | | Merge pull request #2820 from aniketpanjwani/master | Maximilian Hils | 2018-01-29 | 1 | -16/+16 | |
|\ \ \ | | | | | | | | | Fix mistakes in examples/simple/Readme.md. | |||||
| * | | | Fix mistakes in examples/simple/Readme.md. | Aniket Panjwani | 2018-01-29 | 1 | -16/+16 | |
|/ / / | | | | | | | | | | | | | 1. Delete row for script_arguments.py. 2. Add row for custom_option.py, using script_arguments.py's Description. | |||||
* | | | Merge pull request #2817 from Kriechi/bump-bugfix-dependencies | Maximilian Hils | 2018-01-29 | 1 | -10/+10 | |
|\ \ \ | | | | | | | | | bump minimum requirements for known bugfix releases | |||||
| * | | | bump minimum requirements for known bugfix releases | Thomas Kriechbaumer | 2018-01-27 | 1 | -10/+10 | |
|/ / / | ||||||
* | | | bump minimum required urwid version, fix #2815 | Maximilian Hils | 2018-01-26 | 1 | -1/+1 | |
| | | | ||||||
* | | | Fix for #2750 and #2783 (#2809) | Samoilenko Roman | 2018-01-25 | 6 | -32/+77 | |
| | | | ||||||
* | | | fix #2800 | Arushit Mudgal | 2018-01-25 | 2 | -3/+20 | |
|/ / | ||||||
* | | Fix #2786 (#2798) | Samoilenko Roman | 2018-01-18 | 1 | -1/+3 | |
| | | ||||||
* | | fix #2752 (#2796) | Samoilenko Roman | 2018-01-18 | 1 | -2/+7 | |
| | | ||||||
* | | [requires.io] dependency update on master branch (#2799) | Thomas Kriechbaumer | 2018-01-18 | 1 | -1/+1 | |
| | | ||||||
* | | Merge pull request #2736 from mitmproxy/posix-commands | Maximilian Hils | 2018-01-18 | 1 | -1/+1 | |
|\ \ | | | | | | | Parse Commands in POSIX mode | |||||
| * | | parse commands in posix mode | Maximilian Hils | 2017-12-31 | 1 | -1/+1 | |
| | | | | | | | | | If posix=False, quotes are not stripped from parsed tokens. | |||||
* | | | update stale URL in README | Maximilian Hils | 2018-01-15 | 1 | -1/+1 | |
| | | | ||||||
* | | | Fix #2765 (#2792) | Samoilenko Roman | 2018-01-14 | 2 | -1/+6 | |
| | | | ||||||
* | | | Fix #2768 (#2778) | Samoilenko Roman | 2018-01-14 | 2 | -3/+12 | |
| | | | ||||||
* | | | Merge pull request #2793 from kajojify/issue-2399 | Maximilian Hils | 2018-01-14 | 2 | -1/+2 | |
|\ \ \ | | | | | | | | | Issue 2399 | |||||
| * | | | Other condition | Miroslav | 2018-01-14 | 1 | -2/+2 | |
| | | | | ||||||
| * | | | Fix #2399 | Miroslav | 2018-01-14 | 2 | -1/+2 | |
| | | | | ||||||
* | | | | Merge pull request #2791 from mhils/tls-extensions | Maximilian Hils | 2018-01-13 | 7 | -10/+28 | |
|\ \ \ \ | | | | | | | | | | | Store ClientHello extensions with client connection | |||||
| * | | | | store ClientHello extensions with client connection | Maximilian Hils | 2018-01-13 | 7 | -10/+28 | |
|/ / / / | ||||||
* | | | | Merge pull request #2790 from mhils/stateobject-improvements | Maximilian Hils | 2018-01-13 | 6 | -106/+190 | |
|\ \ \ \ | | | | | | | | | | | stateobject: use typing, enable tuples and more complex datatypes | |||||
| * | | | | stateobject: use typing, enable tuples and more complex datatypes | Maximilian Hils | 2018-01-13 | 6 | -106/+190 | |
| | | | | |