aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of https://github.com/kira0204/mitmproxy into update-re...kira02042018-02-24258-4409/+13438
|\
| * Merge pull request #2905 from cortesi/optsAldo Cortesi2018-02-2444-311/+313
| |\
| | * Merge branch 'master' into optsAldo Cortesi2018-02-247-28/+98
| | |\ | | |/ | |/|
| * | Merge pull request #2886 from tran-tien-dat/set-cookieAldo Cortesi2018-02-242-5/+30
| |\ \
| | * | Fix #2829Tran Tien Dat2018-02-212-5/+30
| * | | 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
| * | | | Merge pull request #2898 from yan12125/patch-1Maximilian Hils2018-02-231-1/+1
| |\ \ \ \
| | * | | | Explicitly declare pyperclip requirementChih-Hsuan Yen2018-02-241-1/+1
| |/ / / /
| * | | | Merge pull request #2897 from cortesi/pointAldo Cortesi2018-02-232-1/+5
| |\ \ \ \
| | * | | | Prep for v3.0.1Aldo Cortesi2018-02-232-1/+5
| * | | | | Merge pull request #2896 from cortesi/cmdescAldo Cortesi2018-02-232-3/+35
| |\| | | | | | |/ / / | |/| | |
| | * | | Fix an issue with quoting and commandsAldo Cortesi2018-02-232-3/+35
| |/ / /
| | | * Resolve some left-over cross-addon dependenciesAldo Cortesi2018-02-242-6/+3
| | | * addon options: upstream_authAldo Cortesi2018-02-243-18/+12
| | | * addon options: stickycookie, streambodiesAldo Cortesi2018-02-245-32/+34
| | | * addon options: setheaders, stickyauthAldo Cortesi2018-02-248-35/+36
| | | * addon options: readfile, save, scriptAldo Cortesi2018-02-245-27/+28
| | | * addon options: migrate replace, simplify taddons.contextAldo Cortesi2018-02-244-17/+18
| | | * 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-01 06:27:19 +0000