aboutsummaryrefslogtreecommitdiffstats
path: root/mitmproxy
Commit message (Expand)AuthorAgeFilesLines
* Update remaining old docs url with new one.Fenil Gandhi2018-03-052-3/+3
* Merge pull request #2945 from kajojify/shorteningAldo Cortesi2018-03-052-2/+35
|\
| * Minor fixes.Miroslav2018-03-031-6/+10
| * Addition to the commentMiroslav2018-03-031-1/+1
| * Finalization of tests. Conditions rewritten again.Miroslav2018-03-022-8/+12
| * Initial tests. New conditions.Miroslav2018-03-011-20/+14
| * Shortening notifications in statusbarMiroslav2018-02-282-2/+33
* | Merge pull request #2868 from kira0204/data-crashMaximilian Hils2018-03-041-5/+2
|\ \
| * | Testingkira02042018-02-191-4/+1
| * | Fixing getterkira02042018-02-191-1/+1
| * | fix 2794kira02042018-02-151-1/+1
* | | Merge pull request #2946 from fenilgandhi/masterMaximilian Hils2018-03-041-1/+3
|\ \ \
| * | | Fix for wrapping up extra-long urls in flowdetailviewFenil Gandhi2018-03-031-1/+3
* | | | fix display inconsistency for certstore pathMaximilian Hils2018-03-031-1/+1
|/ / /
* | | clean up ProxyConfigMaximilian Hils2018-02-273-32/+19
* | | add missing client_certs directory expansionMaximilian Hils2018-02-271-0/+1
| |/ |/|
* | Merge pull request #2931 from cortesi/scriptpathAldo Cortesi2018-02-271-1/+2
|\ \
| * | script.run takes a path argumentAldo Cortesi2018-02-271-1/+2
* | | Merge pull request #2875 from fenilgandhi/issue-2872Aldo Cortesi2018-02-271-1/+1
|\ \ \ | |/ / |/| |
| * | Merge branch 'master' into issue-2872ColdFire2018-02-231-3/+19
| |\ \
| * \ \ Merge branch 'master' into issue-2872ColdFire2018-02-2323-58/+19
| |\ \ \
| * | | | Fixed a bug with bytes encoding errorFenil Gandhi2018-02-191-1/+1
* | | | | Merge pull request #2926 from cortesi/coreoptsAldo Cortesi2018-02-277-97/+65
|\ \ \ \ \
| * | | | | Start consolidating core optionsAldo Cortesi2018-02-267-97/+65
* | | | | | Merge pull request #2925 from mhils/clientcert-from-sniAldo Cortesi2018-02-261-1/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | use sni to select clientcertsMaximilian Hils2018-02-251-1/+2
* | | | | | Split dumper_filter off from view_filterAldo Cortesi2018-02-263-14/+12
* | | | | | Revamp verbosity optionsAldo Cortesi2018-02-267-22/+29
* | | | | | Shift option help styling admonition into the appropriate Loader docstringAldo Cortesi2018-02-262-7/+8
|/ / / / /
* | | | | Merge pull request #2919 from fristonio/Fix-2906Maximilian Hils2018-02-251-2/+3
|\ \ \ \ \
| * | | | | Fix --socks option deprecated info in command line args check.Deepesh Pathak2018-02-251-2/+3
* | | | | | 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