| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | don't print message bodies when -v is passed. | Maximilian Hils | 2018-02-22 | 1 | -1/+1 |
| | | | | In contrast to headers, they will almost never help uncover issues. | ||||
| * | don't log for --commands or --options. | Maximilian Hils | 2018-02-22 | 1 | -1/+3 |
| | | |||||
| * | Fix verbosity mode | Miroslav | 2018-02-21 | 1 | -1/+4 |
| | | |||||
| * | Merge pull request #2884 from kajojify/hotkeys-cleanup | Maximilian Hils | 2018-02-20 | 18 | -61/+1 |
| |\ | | | | | Hotkeys cleanup. #2877 | ||||
| | * | Flake, be happy | Miroslav | 2018-02-20 | 1 | -2/+0 |
| | | | |||||
| | * | one more cleanup | Miroslav | 2018-02-20 | 1 | -1/+0 |
| | | | |||||
| | * | Hotkeys cleanup | Miroslav | 2018-02-20 | 18 | -58/+1 |
| | | | |||||
| * | | update log_events example documentation | Maximilian Hils | 2018-02-20 | 1 | -3/+1 |
| | | | |||||
| * | | add documentation for custom_option.py | Maximilian Hils | 2018-02-20 | 1 | -0/+10 |
| |/ | |||||
| * | Merge pull request #2873 from kajojify/contentviews_items | Maximilian Hils | 2018-02-20 | 1 | -1/+2 |
| |\ | | | | | Fix a bug with two-words contentview modes | ||||
| | * | shlex.quote | Miroslav | 2018-02-19 | 1 | -1/+2 |
| | | | |||||
| | * | quotes instead of join | Miroslav | 2018-02-19 | 1 | -3/+2 |
| | | | |||||
| | * | Fix a bug with two-words contentview modes | Miroslav | 2018-02-19 | 1 | -1/+2 |
| | | | |||||
| * | | Merge pull request #2881 from cortesi/refreshopt | Maximilian Hils | 2018-02-19 | 7 | -15/+15 |
| |\ \ | | | | | | | option refresh_server_playback -> server_replay_refresh | ||||
| | * | | option replay_kill_extra -> server_replay_kill_extra | Aldo Cortesi | 2018-02-20 | 7 | -8/+8 |
| | | | | | | | | | | | | | Continuing effort to collect all sever replay options under a commmon prefix. | ||||
| | * | | option refresh_server_playback -> server_replay_refresh | Aldo Cortesi | 2018-02-20 | 5 | -7/+7 |
| | | | | | | | | | | | | | All other server playback options have this form. | ||||
| * | | | Merge pull request #2878 from PaleNeutron/patch-1 | Maximilian Hils | 2018-02-19 | 1 | -3/+1 |
| |\ \ \ | |_|/ |/| | | Remove heading_key of [script:n] | ||||
| | * | | Remove heading_key of [script:n] | John Lyu | 2018-02-19 | 1 | -3/+1 |
| |/ / | |||||
| * | | Merge pull request #2757 from mhils/issue-2720 | Maximilian Hils | 2018-02-16 | 1 | -0/+1 |
| |\ \ | | | | | | | Add alternative keybindings for changing the layout pane on WSL (#2720) | ||||
| | * | | add ctrl + right as an alias, fix #2720 | Maximilian Hils | 2018-02-16 | 1 | -0/+1 |
| |/ / | |||||
| * | | Merge pull request #2870 from mhils/transparent-ipv6 | Maximilian Hils | 2018-02-16 | 1 | -6/+28 |
| |\ \ | | | | | | | Linux: support IPv6 destinations in transparent mode | ||||
| | * | | linux: support IPv6 destinations in transparent mode | Maximilian Hils | 2018-02-16 | 1 | -6/+28 |
| |/ / | | | | | | | This fixes #2869 with the help of @aniketpanjwani. | ||||
| * | | Merge pull request #2841 from aniketpanjwani/fix_linux_transparent_proxy_docs | Maximilian Hils | 2018-02-13 | 1 | -1/+3 |
| |\ \ | | | | | | | Modify Linux transparent proxy docs to include ipv6 configuration. | ||||
| | * | | docs: don't set accept_redirects. | Maximilian Hils | 2018-02-13 | 1 | -2/+0 |
| | | | | | | | | | | | | | | | | | | | it's not really clear why we are even doing this, so let's just remove it entirely and see what happens. Discussion: https://github.com/mitmproxy/mitmproxy/pull/2841#discussion_r165928492 | ||||
| | * | | Modify Linux transparent proxy docs to include ipv6 configuration. | Aniket Panjwani | 2018-02-04 | 1 | -0/+4 |
| | | | | |||||
| * | | | Merge pull request #2858 from kajojify/revert_flow | Maximilian Hils | 2018-02-13 | 2 | -0/+5 |
| |\ \ \ | | | | | | | | | Fix reverting of a flow | ||||
| | * | | | backup for flow.decode/encode | Miroslav | 2018-02-12 | 2 | -1/+4 |
| | | | | | |||||
| | * | | | Fix reverting of a flow | Miroslav | 2018-02-10 | 2 | -0/+2 |
| | | | | | |||||
| * | | | | Merge pull request #2863 from mitmproxy/requires-io-master | Maximilian Hils | 2018-02-13 | 1 | -1/+1 |
| |\ \ \ \ | | | | | | | | | | | [requires.io] dependency update on master branch | ||||
| | * | | | | [requires.io] dependency update | requires.io | 2018-02-12 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Merge pull request #2847 from kira0204/key-cookie-issue | Maximilian Hils | 2018-02-12 | 3 | -34/+49 |
| |\ \ \ \ \ | |/ / / / |/| | | | | Handling empty key with value for cookies, fix #2827 | ||||
| | * | | | | keeping consistency, better testing | kira0204 | 2018-02-11 | 3 | -36/+47 |
| | | | | | | |||||
| | * | | | | 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 |
| | | | | | | |||||
 |
index : cloud-email/mitmproxy | |
| clone of mitm proxy | James |
| aboutsummaryrefslogtreecommitdiffstats |