| Commit message (Expand) | Author | Age | Files | Lines |
... | |
* | fix issue #260 | Maximilian Hils | 2014-04-07 | 1 | -1/+3 |
* | Merge pull request #252 from jeanregisser/master | Maximilian Hils | 2014-03-26 | 1 | -1/+0 |
|\ |
|
| * | Fixed palette forced to light in mitmproxywrapper.py | Jean Regisser | 2014-03-26 | 1 | -1/+0 |
|/ |
|
* | beef up error messages | Maximilian Hils | 2014-03-26 | 1 | -1/+1 |
* | add requests to requrements, improve error logging | Maximilian Hils | 2014-03-19 | 2 | -1/+5 |
* | fix minor version string | Maximilian Hils | 2014-03-19 | 1 | -1/+1 |
* | fix display bugs (fixes #243) | Maximilian Hils | 2014-03-18 | 2 | -2/+7 |
* | Merge pull request #239 from mitmproxy/options_cleanup | Maximilian Hils | 2014-03-18 | 9 | -85/+85 |
|\ |
|
| * | forward proxy -> upstream proxy | Maximilian Hils | 2014-03-14 | 7 | -20/+20 |
| * | remove debug switch | Maximilian Hils | 2014-03-13 | 2 | -7/+1 |
| * | order command line options, add disting proxy option group | Maximilian Hils | 2014-03-13 | 2 | -64/+70 |
* | | Merge pull request #238 from mitmproxy/log_levels | Maximilian Hils | 2014-03-18 | 16 | -99/+105 |
|\| |
|
| * | adjust command line docs, fix log typo | Maximilian Hils | 2014-03-13 | 3 | -4/+4 |
| * | fix linux tests... | Maximilian Hils | 2014-03-13 | 1 | -6/+6 |
| * | adjust tests, fix option handling | Maximilian Hils | 2014-03-13 | 5 | -17/+11 |
| * | add support for log levels | Maximilian Hils | 2014-03-13 | 10 | -60/+65 |
| * | add -d switch to mitmdump to compensate for old verbosity functionality | Maximilian Hils | 2014-03-12 | 4 | -15/+24 |
| * | restrict -e to mitmproxy only (not mitmdump) | Maximilian Hils | 2014-03-12 | 6 | -16/+14 |
* | | fix #240 | Maximilian Hils | 2014-03-18 | 1 | -1/+1 |
|/ |
|
* | Merge branch 'master' of github.com:mitmproxy/mitmproxy | Maximilian Hils | 2014-03-11 | 4 | -24/+45 |
|\ |
|
| * | Certificate forwarding. | Aldo Cortesi | 2014-03-11 | 4 | -24/+45 |
* | | fix temporary server change, coverage++ | Maximilian Hils | 2014-03-11 | 4 | -15/+70 |
|/ |
|
* | always use relative imports, fix status bar bug | Maximilian Hils | 2014-03-10 | 27 | -30/+54 |
* | split up protocol\__init__.py | Maximilian Hils | 2014-03-10 | 8 | -116/+113 |
* | Merge branch 'absolutely_relative_proxying' | Maximilian Hils | 2014-03-10 | 18 | -233/+260 |
|\ |
|
| * | update docs, fix #215 | Maximilian Hils | 2014-03-10 | 5 | -27/+29 |
| * | add advanced proxying options, add SSL-terminating capability to mitmproxy | Maximilian Hils | 2014-03-10 | 14 | -164/+182 |
| * | lay the foundations for --(in|out)(abs|rel) command line switches, as propose... | Maximilian Hils | 2014-03-10 | 6 | -61/+68 |
* | | Merge pull request #231 from benwa/patch-1 | Aldo Cortesi | 2014-03-10 | 1 | -0/+3 |
|\ \ |
|
| * | | Update webapp.html | Bennett Blodinger | 2014-03-08 | 1 | -0/+3 |
* | | | Merge pull request #232 from benwa/patch-2 | Aldo Cortesi | 2014-03-10 | 1 | -6/+0 |
|\ \ \ |
|
| * | | | Update layout.html | Bennett Blodinger | 2014-03-08 | 1 | -6/+0 |
| |/ / |
|
* | | | Merge pull request #233 from mitmproxy/untangle_circular_dependencies | Aldo Cortesi | 2014-03-10 | 23 | -668/+690 |
|\ \ \
| |/ /
|/| /
| |/ |
|
| * | fix mentions of CONTENT_MISSING in libmproxy.console | Maximilian Hils | 2014-03-09 | 2 | -5/+7 |
| * | finish proxy.py split up | Maximilian Hils | 2014-03-09 | 22 | -288/+289 |
| * | split up proxy.py | Maximilian Hils | 2014-03-09 | 13 | -188/+207 |
|/ |
|
* | fix windows tests, include improvements from 0.10.1 | Maximilian Hils | 2014-03-08 | 4 | -5/+8 |
* | Merge branch 'master' of github.com:mitmproxy/mitmproxy | Maximilian Hils | 2014-03-08 | 15 | -227/+384 |
|\ |
|
| * | Revert to old cert names, use a subdir for test conf dir. | Aldo Cortesi | 2014-03-07 | 3 | -5/+5 |
| * | Merge branch 'master' of ssh.github.com:cortesi/mitmproxy | Aldo Cortesi | 2014-03-07 | 1 | -1/+0 |
| |\ |
|
| | * | Merge pull request #230 from sergeychipiga/fix/remove-redundant-codeline | Maximilian Hils | 2014-03-05 | 1 | -1/+0 |
| | |\ |
|
| | | * | remove redundant codeline | Sergey Chipiga | 2014-03-05 | 1 | -1/+0 |
| | |/ |
|
| * / | Use the right conf dir... | Aldo Cortesi | 2014-03-07 | 1 | -1/+1 |
| |/ |
|
| * | Much more sophisticated cert handling | Aldo Cortesi | 2014-03-05 | 7 | -80/+63 |
| * | Minor cleanups. | Aldo Cortesi | 2014-03-02 | 6 | -16/+13 |
| * | Cipher specification. | Aldo Cortesi | 2014-03-02 | 1 | -5/+20 |
| * | Improve explicit certificate specification | Aldo Cortesi | 2014-03-02 | 4 | -16/+36 |
| * | Update for pathod.SSLOptions changes. | Aldo Cortesi | 2014-03-02 | 1 | -1/+1 |
| * | Adapt for new pathod and netlib APIs. | Aldo Cortesi | 2014-03-02 | 4 | -9/+12 |
| * | Merge pull request #223 from droope/improve-backwards-search | Aldo Cortesi | 2014-02-26 | 3 | -141/+281 |
| |\ |
|