Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/master' into proxy-refactor-cb | Maximilian Hils | 2015-08-30 | 1 | -0/+1 |
|\ | |||||
| * | console: add command line flag to disable mouse interaction | Timothy Elliott | 2015-08-19 | 1 | -0/+1 |
| | | | | | | | | | | | | Adds the --no-mouse command line option to disable the mouse. Fixes #685 | ||||
* | | minor fixes | Maximilian Hils | 2015-08-30 | 1 | -3/+3 |
|/ | |||||
* | fix #705 | Maximilian Hils | 2015-08-03 | 1 | -4/+8 |
| | |||||
* | Appease the code style gods. | Aldo Cortesi | 2015-05-31 | 1 | -1/+2 |
| | |||||
* | Remove dependency on PyOpenSSL, move version check into netlib. | Aldo Cortesi | 2015-05-31 | 1 | -44/+4 |
| | | | | | There are a few more functions in the code that accesses PyOpenSSL directly that should probably also be moved to netlib. Later. | ||||
* | Add coding style check, reformat. | Aldo Cortesi | 2015-05-30 | 1 | -1/+1 |
| | |||||
* | console: add a -l flag to set the limit on startup | Aldo Cortesi | 2015-04-15 | 1 | -0/+1 |
| | |||||
* | Merge branch 'master' of github.com:mitmproxy/mitmproxy | Maximilian Hils | 2015-04-08 | 1 | -0/+1 |
|\ | |||||
| * | console: All palettes now explicitly set a background colour | Aldo Cortesi | 2015-04-07 | 1 | -0/+1 |
| | | | | | | | | | | There's a new option --palette-transparent to turn this off if you want to use your own terminal background. | ||||
* | | allow passing custom argv to libmproxy.main | Maximilian Hils | 2015-04-08 | 1 | -6/+6 |
|/ | |||||
* | Exclude main.py from coverage analysis | Aldo Cortesi | 2014-11-15 | 1 | -0/+3 |
| | |||||
* | Refactor command-line argument definition | Aldo Cortesi | 2014-11-15 | 1 | -115/+10 |
| | | | | | - Argument definitions live in cmdline.py - Parsing and initial processing lives in main.py | ||||
* | First-order integration of configargparser to add config file support | Aldo Cortesi | 2014-11-15 | 1 | -22/+55 |
| | |||||
* | connect eventlog events to ui | Maximilian Hils | 2014-09-17 | 1 | -1/+0 |
| | |||||
* | Basic web service and options | Aldo Cortesi | 2014-09-14 | 1 | -2/+26 |
| | |||||
* | Super-basic outline for web io loop | Aldo Cortesi | 2014-09-14 | 1 | -0/+42 |
| | |||||
* | re-add mitmproxy/mitmdump scripts for convenience | Maximilian Hils | 2014-09-08 | 1 | -1/+1 |
| | |||||
* | mitmproxy -> libmproxy.main. do some leanup on the way | Maximilian Hils | 2014-09-08 | 1 | -0/+165 |