aboutsummaryrefslogtreecommitdiffstats
path: root/libmproxy/main.py
Commit message (Collapse)AuthorAgeFilesLines
* Added CLI argument to enable "follow flow list" modeGuillem Anguera2016-01-221-0/+1
|
* Revert "make setup.py wheel-ready"Maximilian Hils2015-12-031-4/+0
| | | | This reverts commit 51bd98d5b17e3d8d49f12a7f63545e8dac61959a.
* make setup.py wheel-readyMaximilian Hils2015-12-031-0/+4
|
* Catch and ignore thread errors on exitAldo Cortesi2015-11-061-3/+4
| | | | | | Keyboard interrupts bugger up Queues in some way, which causes a traceback on exit in many of our tools. The issue seems easiest to reproduce with binary builds on OSX.
* Merge remote-tracking branch 'origin/master' into proxy-refactor-cbMaximilian Hils2015-08-301-0/+1
|\
| * console: add command line flag to disable mouse interactionTimothy Elliott2015-08-191-0/+1
| | | | | | | | | | | | Adds the --no-mouse command line option to disable the mouse. Fixes #685
* | minor fixesMaximilian Hils2015-08-301-3/+3
|/
* fix #705Maximilian Hils2015-08-031-4/+8
|
* Appease the code style gods.Aldo Cortesi2015-05-311-1/+2
|
* Remove dependency on PyOpenSSL, move version check into netlib.Aldo Cortesi2015-05-311-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 Cortesi2015-05-301-1/+1
|
* console: add a -l flag to set the limit on startupAldo Cortesi2015-04-151-0/+1
|
* Merge branch 'master' of github.com:mitmproxy/mitmproxyMaximilian Hils2015-04-081-0/+1
|\
| * console: All palettes now explicitly set a background colourAldo Cortesi2015-04-071-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.mainMaximilian Hils2015-04-081-6/+6
|/
* Exclude main.py from coverage analysisAldo Cortesi2014-11-151-0/+3
|
* Refactor command-line argument definitionAldo Cortesi2014-11-151-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 supportAldo Cortesi2014-11-151-22/+55
|
* connect eventlog events to uiMaximilian Hils2014-09-171-1/+0
|
* Basic web service and optionsAldo Cortesi2014-09-141-2/+26
|
* Super-basic outline for web io loopAldo Cortesi2014-09-141-0/+42
|
* re-add mitmproxy/mitmdump scripts for convenienceMaximilian Hils2014-09-081-1/+1
|
* mitmproxy -> libmproxy.main. do some leanup on the wayMaximilian Hils2014-09-081-0/+165