aboutsummaryrefslogtreecommitdiffstats
path: root/mitmproxy
Commit message (Expand)AuthorAgeFilesLines
* addon options: setheaders, stickyauthAldo Cortesi2018-02-244-13/+20
* addon options: readfile, save, scriptAldo Cortesi2018-02-244-22/+23
* addon options: migrate replace, simplify taddons.contextAldo Cortesi2018-02-243-12/+13
* addon options: shift server_replay optionsAldo Cortesi2018-02-242-63/+54
* addon options: shift keepserving and onboarding optionsAldo Cortesi2018-02-243-29/+30
* client options: migrate allowremote and clientplaybackAldo Cortesi2018-02-242-34/+34
* Start moving addon options into /addonsAldo Cortesi2018-02-245-14/+27
* bump versionMaximilian Hils2018-02-221-1/+1
* don't print message bodies when -v is passed.Maximilian Hils2018-02-221-1/+1
* don't log for --commands or --options.Maximilian Hils2018-02-221-1/+3
* Fix verbosity modeMiroslav2018-02-211-1/+4
* Hotkeys cleanupMiroslav2018-02-2016-44/+1
* Merge pull request #2873 from kajojify/contentviews_itemsMaximilian Hils2018-02-201-1/+2
|\
| * shlex.quoteMiroslav2018-02-191-1/+2
| * quotes instead of joinMiroslav2018-02-191-3/+2
| * Fix a bug with two-words contentview modesMiroslav2018-02-191-1/+2
* | Merge pull request #2881 from cortesi/refreshoptMaximilian Hils2018-02-194-9/+9
|\ \
| * | option replay_kill_extra -> server_replay_kill_extraAldo Cortesi2018-02-204-5/+5
| * | option refresh_server_playback -> server_replay_refreshAldo Cortesi2018-02-203-4/+4
* | | Remove heading_key of [script:n]John Lyu2018-02-191-3/+1
| |/ |/|
* | add ctrl + right as an alias, fix #2720Maximilian Hils2018-02-161-0/+1
* | linux: support IPv6 destinations in transparent modeMaximilian Hils2018-02-161-6/+28
* | Merge pull request #2858 from kajojify/revert_flowMaximilian Hils2018-02-132-0/+5
|\ \
| * | backup for flow.decode/encodeMiroslav2018-02-122-1/+4
| * | Fix reverting of a flowMiroslav2018-02-102-0/+2
* | | Merge pull request #2847 from kira0204/key-cookie-issueMaximilian Hils2018-02-121-28/+23
|\ \ \
| * | | keeping consistency, better testingkira02042018-02-111-30/+25
| * | | fixing logickira02042018-02-071-7/+7
| |/ /
* | | Merge pull request #2803 from kajojify/issue-2777Maximilian Hils2018-02-103-4/+15
|\ \ \
| * | | DocsMiroslav2018-02-081-2/+4
| * | | New commandMiroslav2018-02-083-11/+12
| * | | Fix #2777Miroslav2018-01-191-1/+9
* | | | Merge pull request #2851 from mhils/always-use-tls-settingsMaximilian Hils2018-02-104-22/+42
|\ \ \ \ | |_|/ / |/| | |
| * | | use TLS options also for request replay, refs #2840Maximilian Hils2018-02-084-22/+42
* | | | don't raise when pyperclip doesn't find a clipboard, fix #2816Samoilenko Roman2018-02-032-2/+8
* | | | add shortcuts for console.choose, fix #2785Samoilenko Roman2018-02-031-6/+25
|/ / /
* | | remove quotes around filenameMaximilian Hils2018-02-011-1/+3
* | | 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.Miroslav2018-01-264-12/+21
| |/ /
* | | Real-time flow counterMiroslav2018-01-301-1/+2
* | | Fix for #2750 and #2783 (#2809)Samoilenko Roman2018-01-253-32/+42
* | | fix #2800Arushit Mudgal2018-01-251-2/+3
|/ /
* | Fix #2786 (#2798)Samoilenko Roman2018-01-181-1/+3
* | fix #2752 (#2796)Samoilenko Roman2018-01-181-2/+7
* | Merge pull request #2736 from mitmproxy/posix-commandsMaximilian Hils2018-01-181-1/+1
|\ \
| * | parse commands in posix modeMaximilian Hils2017-12-311-1/+1
* | | Fix #2765 (#2792)Samoilenko Roman2018-01-141-1/+2
* | | Fix #2768 (#2778)Samoilenko Roman2018-01-141-3/+4
* | | Merge pull request #2793 from kajojify/issue-2399Maximilian Hils2018-01-141-1/+1
|\ \ \