aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | Fix reverting of a flowMiroslav2018-02-102-0/+2
| | | |
* | | | Merge pull request #2863 from mitmproxy/requires-io-masterMaximilian Hils2018-02-131-1/+1
|\ \ \ \ | | | | | | | | | | [requires.io] dependency update on master branch
| * | | | [requires.io] dependency updaterequires.io2018-02-121-1/+1
| | | | |
* | | | | Merge pull request #2847 from kira0204/key-cookie-issueMaximilian Hils2018-02-123-34/+49
|\ \ \ \ \ | |/ / / / |/| | | | Handling empty key with value for cookies, fix #2827
| * | | | keeping consistency, better testingkira02042018-02-113-36/+47
| | | | |
| * | | | fixing logickira02042018-02-072-7/+11
| | | | |
* | | | | Merge pull request #2860 from emedvedev/patch-1Thomas Kriechbaumer2018-02-111-4/+4
|\ \ \ \ \ | | | | | | | | | | | | Fix a typo in events.rst
| * | | | | Fix a typo in events.rstEdward Medvedev2018-02-111-4/+4
|/ / / / / | | | | | | | | | | This PR fixes a tiny typo in the documentation.
* | | | | Merge pull request #2803 from kajojify/issue-2777Maximilian Hils2018-02-103-4/+15
|\ \ \ \ \ | | | | | | | | | | | | Persist flowfilter when editing it, fix #2777
| * | | | | DocsMiroslav2018-02-081-2/+4
| | | | | |
| * | | | | New commandMiroslav2018-02-084-20/+13
| | | | | |
| * | | | | Fix #2777Miroslav2018-01-192-2/+18
| | | | | |
* | | | | | Merge pull request #2851 from mhils/always-use-tls-settingsMaximilian Hils2018-02-105-27/+46
|\ \ \ \ \ \ | | | | | | | | | | | | | | Use TLS options also for request replay
| * | | | | | use TLS options also for request replay, refs #2840Maximilian Hils2018-02-085-27/+46
| | | | | | |
* | | | | | | Merge pull request #2855 from gokulchandra/patch-1Thomas Kriechbaumer2018-02-091-2/+1
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | Fixes issue with the pfctl config on OSX
| * | | | | | Updates the pfctl configGokul2018-02-091-2/+1
|/ / / / / / | | | | | | | | | | | | The previous config threw a syntax error when saving.
* | | | | | Merge pull request #2852 from kajojify/excess_returnMaximilian Hils2018-02-081-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Excess return was deleted
| * | | | | | Excess return was deletedMiroslav2018-02-081-1/+1
|/ / / / / /
* | | | | | Merge pull request #2842 from mitmproxy/web-timingsMaximilian Hils2018-02-071-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | [web] fix timing display for keepalive connections
| * | | | | | [web] fix timing display for keepalive connectionsMaximilian Hils2018-02-051-1/+1
| | |_|/ / / | |/| | | | | | | | | | see https://discourse.mitmproxy.org/t/mitmweb-details-tab-timing/848/3
* / | | | | [requires.io] dependency update on master branch (#2848)Thomas Kriechbaumer2018-02-071-1/+1
|/ / / / /
* | | | | Merge pull request #2835 from MatthewShao/mitmweb-sortMaximilian Hils2018-02-053-3/+10
|\ \ \ \ \ | |_|_|/ / |/| | | | [web] Fix unstable sorting
| * | | | [web] Fix unstable sorting by using 'stable' dependencyMatthew Shao2018-02-053-3/+10
| | | | |
* | | | | Extend mypy checking, fix #2194 (#2819)Arushit Mudgal2018-02-036-56/+68
| | | | |
* | | | | don't raise when pyperclip doesn't find a clipboard, fix #2816Samoilenko Roman2018-02-034-4/+27
| | | | |
* | | | | add shortcuts for console.choose, fix #2785Samoilenko Roman2018-02-031-6/+25
|/ / / /
* | | | Merge pull request #2833 from mitmproxy/issue-2824Maximilian Hils2018-02-012-2/+16
|\| | | | | | | | | | | Improve error message for missing scripts, fix #2824
| * | | remove quotes around filenameMaximilian Hils2018-02-012-1/+15
| | | |
| * | | improve error message for missing scripts, fix #2824Maximilian Hils2018-02-011-1/+1
|/ / /
* | | Merge pull request #2814 from kajojify/issue-2753Maximilian Hils2018-01-304-12/+21
|\ \ \ | | | | | | | | Fix #2753. Fix resetting editings.
| * | | Fix #2753. Fix resetting editings.Miroslav2018-01-264-12/+21
| |/ /
* | | Merge pull request #2825 from kajojify/realtime_counterMaximilian Hils2018-01-301-1/+2
|\ \ \ | | | | | | | | Real-time flow counter
| * | | Real-time flow counterMiroslav2018-01-301-1/+2
|/ / /
* | | Merge pull request #2820 from aniketpanjwani/masterMaximilian Hils2018-01-291-16/+16
|\ \ \ | | | | | | | | Fix mistakes in examples/simple/Readme.md.
| * | | Fix mistakes in examples/simple/Readme.md.Aniket Panjwani2018-01-291-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-dependenciesMaximilian Hils2018-01-291-10/+10
|\ \ \ | | | | | | | | bump minimum requirements for known bugfix releases
| * | | bump minimum requirements for known bugfix releasesThomas Kriechbaumer2018-01-271-10/+10
|/ / /
* | | bump minimum required urwid version, fix #2815Maximilian Hils2018-01-261-1/+1
| | |
* | | Fix for #2750 and #2783 (#2809)Samoilenko Roman2018-01-256-32/+77
| | |
* | | fix #2800Arushit Mudgal2018-01-252-3/+20
|/ /
* | Fix #2786 (#2798)Samoilenko Roman2018-01-181-1/+3
| |
* | fix #2752 (#2796)Samoilenko Roman2018-01-181-2/+7
| |
* | [requires.io] dependency update on master branch (#2799)Thomas Kriechbaumer2018-01-181-1/+1
| |
* | Merge pull request #2736 from mitmproxy/posix-commandsMaximilian Hils2018-01-181-1/+1
|\ \ | | | | | | Parse Commands in POSIX mode
| * | parse commands in posix modeMaximilian Hils2017-12-311-1/+1
| | | | | | | | | If posix=False, quotes are not stripped from parsed tokens.
* | | update stale URL in READMEMaximilian Hils2018-01-151-1/+1
| | |
* | | Fix #2765 (#2792)Samoilenko Roman2018-01-142-1/+6
| | |
* | | Fix #2768 (#2778)Samoilenko Roman2018-01-142-3/+12
| | |
* | | Merge pull request #2793 from kajojify/issue-2399Maximilian Hils2018-01-142-1/+2
|\ \ \ | | | | | | | | Issue 2399
| * | | Other conditionMiroslav2018-01-141-2/+2
| | | |