| Commit message (Expand) | Author | Age | Files | Lines |
* | add --stream options, various fixes | Maximilian Hils | 2014-07-21 | 1 | -51/+51 |
* | fix command line help | Maximilian Hils | 2014-07-06 | 1 | -2/+2 |
* | Fix proxy options | Aldo Cortesi | 2014-04-12 | 1 | -2/+2 |
* | forward proxy -> upstream proxy | Maximilian Hils | 2014-03-14 | 1 | -6/+6 |
* | order command line options, add disting proxy option group | Maximilian Hils | 2014-03-13 | 1 | -64/+65 |
* | adjust command line docs, fix log typo | Maximilian Hils | 2014-03-13 | 1 | -2/+2 |
* | adjust tests, fix option handling | Maximilian Hils | 2014-03-13 | 1 | -1/+0 |
* | add -d switch to mitmdump to compensate for old verbosity functionality | Maximilian Hils | 2014-03-12 | 1 | -0/+1 |
* | restrict -e to mitmproxy only (not mitmdump) | Maximilian Hils | 2014-03-12 | 1 | -6/+0 |
* | always use relative imports, fix status bar bug | Maximilian Hils | 2014-03-10 | 1 | -2/+4 |
* | update docs, fix #215 | Maximilian Hils | 2014-03-10 | 1 | -1/+1 |
* | add advanced proxying options, add SSL-terminating capability to mitmproxy | Maximilian Hils | 2014-03-10 | 1 | -14/+65 |
* | finish proxy.py split up | Maximilian Hils | 2014-03-09 | 1 | -2/+2 |
* | Improve explicit certificate specification | Aldo Cortesi | 2014-03-02 | 1 | -1/+1 |
* | Use the mitm.it domain for the app, turn it on by default. | Aldo Cortesi | 2014-01-27 | 1 | -3/+3 |
* | Silence pyflakes | Aldo Cortesi | 2014-01-19 | 1 | -2/+0 |
* | Script refactoring: move script command parsing into script module. | Aldo Cortesi | 2014-01-12 | 1 | -1/+1 |
* | Fix app in mitmproxy console, update to bootstrap 3. | Aldo Cortesi | 2014-01-03 | 1 | -1/+3 |
* | Merge branch 'master' into 0.10 | Maximilian Hils | 2013-12-08 | 1 | -0/+5 |
|\ |
|
| * | Merge pull request #134 from mhils/scripts_improvements | Aldo Cortesi | 2013-12-08 | 1 | -3/+6 |
| |\ |
|
| * | | Added -F http[s]://server:port option that allows MITM to forward traffic to ... | JC | 2013-08-30 | 1 | -0/+5 |
* | | | add option to expose webapp externally, remove distinct ip setting | Maximilian Hils | 2013-08-18 | 1 | -11/+16 |
* | | | Merge branch 'master' into 0.10 | Maximilian Hils | 2013-08-17 | 1 | -15/+18 |
|\| | |
|
| * | | Remove GPL notices left in source files after our change to the MIT license. | Aldo Cortesi | 2013-08-01 | 1 | -15/+0 |
| * | | Move app instantiation out of proxy.py. | Aldo Cortesi | 2013-07-24 | 1 | -0/+18 |
* | | | Merge remote-tracking branch 'origin/scripts_improvements' into 0.10 | Maximilian Hils | 2013-06-16 | 1 | -3/+6 |
|\ \ \
| |/ /
|/| /
| |/ |
|
| * | add support for multiple scripts and script arguments. refs #76 | Maximilian Hils | 2013-06-13 | 1 | -3/+6 |
* | | always read files in binary mode | Maximilian Hils | 2013-06-16 | 1 | -1/+1 |
|/ |
|
* | Add a basic built-in web app. | Aldo Cortesi | 2013-03-25 | 1 | -1/+8 |
* | Add the --host option, which uses the value in the Host header for dispaly URLs. | Aldo Cortesi | 2013-03-17 | 1 | -0/+6 |
* | Remove cert_wait_time flag. | Aldo Cortesi | 2013-01-06 | 1 | -5/+0 |
* | Refactor proxy auth a bit | Aldo Cortesi | 2013-01-02 | 1 | -25/+8 |
* | adding some simple authetication code to limit proxy access | israel | 2012-12-30 | 1 | -1/+47 |
* | Command-line options for header setting. | Aldo Cortesi | 2012-08-19 | 1 | -25/+78 |
* | add dummy cert dir | Maximilian Hils | 2012-08-17 | 1 | -2/+2 |
* | use argparse instead of optparse | Maximilian Hils | 2012-08-17 | 1 | -42/+38 |
* | Adds --dummy-certs option to specify certdir | Jim Lloyd | 2012-08-06 | 1 | -0/+6 |
* | Make upstream-cert the default. There's now a --no-upstream-cert option to tu... | Aldo Cortesi | 2012-07-03 | 1 | -3/+3 |
* | Move palette option getting/setting to mitmproxy. | Aldo Cortesi | 2012-07-03 | 1 | -7/+0 |
* | Add --palette option to select color palette | Alexis Hildebrandt | 2012-07-01 | 1 | -0/+7 |
* | Transparent proxy command-line flag stub. | Aldo Cortesi | 2012-06-26 | 1 | -0/+5 |
* | Remove -T and -U command-line options. | Aldo Cortesi | 2012-06-26 | 1 | -16/+2 |
* | add missing parser.add_option_group(group) | Maximilian Hils | 2012-06-06 | 1 | -0/+1 |
* | Minor cruft removal. | Aldo Cortesi | 2012-04-09 | 1 | -1/+1 |
* | Docs: replacements, upstream certs. | Aldo Cortesi | 2012-04-04 | 1 | -1/+1 |
* | Add specification of replacement patterns on the command line. | Aldo Cortesi | 2012-03-17 | 1 | -1/+96 |
* | Adds space between sentences on no-pop's help | Valtteri Virtanen | 2012-03-05 | 1 | -1/+1 |
* | Adds no-pop option to server-side replay | Valtteri Virtanen | 2012-03-05 | 1 | -0/+7 |
* | Rationalise upstream cert flag and variable names. | Aldo Cortesi | 2012-02-28 | 1 | -3/+3 |
* | Add upstream certificate lookup. | Aldo Cortesi | 2012-02-27 | 1 | -6/+11 |