aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix --socks option deprecated info in command line args check.Deepesh Pathak2018-02-251-2/+3
* Merge pull request #2907 from cortesi/optionscompAldo Cortesi2018-02-2514-89/+70
|\
| * addon options: proxyauth to /addonsAldo Cortesi2018-02-244-18/+20
| * Split default_contentview into dumper_* and console_* varietiesAldo Cortesi2018-02-245-12/+15
| * Move intercept options to addonAldo Cortesi2018-02-246-38/+15
| * flow_detail option to /addons/dumperAldo Cortesi2018-02-244-21/+20
* | Merge pull request #2880 from kira0204/update-readmeAldo Cortesi2018-02-251-0/+6
|\ \
| * \ Merge branch 'master' of https://github.com/kira0204/mitmproxy into update-re...kira02042018-02-24258-4409/+13438
| |\ \
| * | | Better languagekira02042018-02-241-1/+1
| * | | Extensive testingkira02042018-02-191-0/+6
* | | | Merge pull request #2914 from kira0204/docs-2913Aldo Cortesi2018-02-251-4/+4
|\ \ \ \
| * | | | Fixing #2913kira02042018-02-241-4/+4
| | |/ / | |/| |
* | | | Merge pull request #2912 from smonami/patch-1Maximilian Hils2018-02-241-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Spelling corrected for think*Monami Sharma2018-02-241-1/+1
|/ / /
* | | 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
|/ / /