aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* addon options: shift server_replay optionsAldo Cortesi2018-02-243-79/+70
* addon options: shift keepserving and onboarding optionsAldo Cortesi2018-02-246-41/+43
* client options: migrate allowremote and clientplaybackAldo Cortesi2018-02-244-39/+38
* Clean up un-necessary arguments to taddons.contextAldo Cortesi2018-02-245-16/+15
* Add .pytest_cache to .gitignoreAldo Cortesi2018-02-241-0/+1
* Start moving addon options into /addonsAldo Cortesi2018-02-2410-26/+40
* bump versionMaximilian Hils2018-02-221-1/+1
* update release instructionsMaximilian Hils2018-02-221-2/+3
* Merge pull request #2891 from cortesi/changelogMaximilian Hils2018-02-221-8/+184
|\
| * minor changelog improvementsMaximilian Hils2018-02-221-2/+2
| * Update changelog for 3.0Aldo Cortesi2018-02-221-8/+184
|/
* Merge pull request #2890 from mitmproxy/newdocsAldo Cortesi2018-02-22181-3981/+12808
|\
| * All new documentationAldo Cortesi2018-02-22181-3981/+12808
|/
* Merge pull request #2888 from kajojify/issue-2885Maximilian Hils2018-02-221-0/+5
|\
| * 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
|/
* Merge pull request #2884 from kajojify/hotkeys-cleanupMaximilian Hils2018-02-2018-61/+1
|\
| * Flake, be happyMiroslav2018-02-201-2/+0
| * one more cleanupMiroslav2018-02-201-1/+0
| * Hotkeys cleanupMiroslav2018-02-2018-58/+1
* | update log_events example documentationMaximilian Hils2018-02-201-3/+1
* | add documentation for custom_option.pyMaximilian Hils2018-02-201-0/+10
|/
* 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-197-15/+15
|\ \
| * | option replay_kill_extra -> server_replay_kill_extraAldo Cortesi2018-02-207-8/+8
| * | option refresh_server_playback -> server_replay_refreshAldo Cortesi2018-02-205-7/+7
* | | Merge pull request #2878 from PaleNeutron/patch-1Maximilian Hils2018-02-191-3/+1
|\ \ \ | |_|/ |/| |
| * | Remove heading_key of [script:n]John Lyu2018-02-191-3/+1
|/ /
* | Merge pull request #2757 from mhils/issue-2720Maximilian Hils2018-02-161-0/+1
|\ \
| * | add ctrl + right as an alias, fix #2720Maximilian Hils2018-02-161-0/+1
|/ /
* | Merge pull request #2870 from mhils/transparent-ipv6Maximilian Hils2018-02-161-6/+28
|\ \
| * | linux: support IPv6 destinations in transparent modeMaximilian Hils2018-02-161-6/+28
|/ /
* | Merge pull request #2841 from aniketpanjwani/fix_linux_transparent_proxy_docsMaximilian Hils2018-02-131-1/+3
|\ \
| * | docs: don't set accept_redirects.Maximilian Hils2018-02-131-2/+0
| * | Modify Linux transparent proxy docs to include ipv6 configuration.Aniket Panjwani2018-02-041-0/+4
* | | 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 #2863 from mitmproxy/requires-io-masterMaximilian Hils2018-02-131-1/+1
|\ \ \ \
| * | | | [requires.io] dependency updaterequires.io2018-02-121-1/+1
* | | | | Merge pull request #2847 from kira0204/key-cookie-issueMaximilian Hils2018-02-123-34/+49
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | 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.rstEdward Medvedev2018-02-111-4/+4
|/ / / / /
* | | | | Merge pull request #2803 from kajojify/issue-2777Maximilian Hils2018-02-103-4/+15
|\ \ \ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-03 13:43:27 +0000