aboutsummaryrefslogtreecommitdiffstats
path: root/mitmproxy
Commit message (Expand)AuthorAgeFilesLines
* Misc. typosluz.paz2018-02-2416-22/+22
* Merge pull request #2907 from cortesi/optionscompAldo Cortesi2018-02-257-57/+52
|\
| * addon options: proxyauth to /addonsAldo Cortesi2018-02-242-11/+12
| * Split default_contentview into dumper_* and console_* varietiesAldo Cortesi2018-02-244-11/+14
| * Move intercept options to addonAldo Cortesi2018-02-244-22/+14
| * flow_detail option to /addons/dumperAldo Cortesi2018-02-242-13/+12
* | Merge branch 'master' into optsAldo Cortesi2018-02-243-27/+56
|\ \ | |/ |/|
| * Merge pull request #2886 from tran-tien-dat/set-cookieAldo Cortesi2018-02-241-5/+9
| |\
| | * Fix #2829Tran Tien Dat2018-02-211-5/+9
| * | Merge pull request #2904 from cortesi/bumpAldo Cortesi2018-02-241-1/+1
| |\ \
| | * | Bump versionAldo Cortesi2018-02-241-1/+1
| * | | Merge pull request #2903 from cortesi/3.0.2Aldo Cortesi2018-02-241-1/+1
| |\| |
| | * | Tag 3.0.2Aldo Cortesi2018-02-241-1/+1
| * | | Merge pull request #2902 from cortesi/spawnfixAldo Cortesi2018-02-241-19/+28
| |\ \ \
| | * | | Fix loss of keyboard control after spawnAldo Cortesi2018-02-241-19/+28
| | |/ /
| * | | bump version againMaximilian Hils2018-02-231-1/+1
| * | | Prep for v3.0.1Aldo Cortesi2018-02-231-1/+1
| * | | Fix an issue with quoting and commandsAldo Cortesi2018-02-231-3/+19
| |/ /
* | | addon options: upstream_authAldo Cortesi2018-02-242-16/+10
* | | addon options: stickycookie, streambodiesAldo Cortesi2018-02-243-23/+25
* | | 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