aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* format codeMaximilian Hils2014-11-2713-296/+306
|
* web++Maximilian Hils2014-11-2712-423/+477
|
* web: update dependenciesMaximilian Hils2014-11-274-13039/+11952
|
* introduce revised views, port over changes from multiple_views branchMaximilian Hils2014-11-2613-327/+679
|
* fix limit_txt, fix #412Maximilian Hils2014-11-231-2/+2
|
* retain raw filter str on filt objectsMaximilian Hils2014-11-222-5/+7
|
* add sni support to LiveConnection.change_serverMaximilian Hils2014-11-191-2/+11
|
* fix testsMaximilian Hils2014-11-152-2/+3
|
* Merge pull request #410 from JustusW/masterMaximilian Hils2014-11-153-1/+217
|\ | | | | Added HAR generation as inline script
| * Added try/except block for import errors with harparser and pytz.Justus Wingert2014-11-151-2/+8
| |
| * Updated setup.py and moved requirements to examples section. Included ↵Justus Wingert2014-11-153-17/+27
| | | | | | | | examples section in requirements.txt. Updated har_extractor to use command line arguments.
| * Switched to pytz. Added comment for clarification on behaviour of ↵Justus Wingert2014-11-152-15/+9
| | | | | | | | HAREncodable. Added missing parameter in reset(). Fixed accessing headers.
| * It seems get_decoded_content can actually be shorter than content due to ↵Justus Wingert2014-11-151-1/+1
| | | | | | | | encoding issues. Since I'm not crazy after all it seems safe to push.
| * Removed the globals and replaced them with internal attributes of _HARLog. ↵Justus Wingert2014-11-151-34/+46
| | | | | | | | Minor bugfixes to make ssl timings work.
| * Hopefully fixed dependency fuckup.Justus Wingert2014-11-151-1/+1
| |
| * Added script dependencie to harparser.Justus Wingert2014-11-151-0/+1
| |
| * Typo...Justus Wingert2014-11-151-1/+1
| |
| * Improved helper method, marginally.Justus Wingert2014-11-151-4/+4
| |
| * Updated documentation and cleaned up the code.Justus Wingert2014-11-151-105/+91
| |
| * Initial checkin with har_extractor script.Justus Wingert2014-11-151-0/+207
| |
* | One common --version flagAldo Cortesi2014-11-151-15/+5
| |
* | Remove last vestiges of argparseAldo Cortesi2014-11-151-7/+6
| |
* | Exclude main.py from coverage analysisAldo Cortesi2014-11-152-1/+4
| |
* | Make sure all command-line arguments have a long formAldo Cortesi2014-11-151-21/+20
| | | | | | | | ... so they can be used in config files
* | Enable config file parsingAldo Cortesi2014-11-152-5/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | We support 4 different config files: ~/.mitmproxy/common.conf: Options that are common to all tools ~/.mitmproxy/mitmproxy.conf: Options for mitmproxy ~/.mitmproxy/mitmdump.conf: Options for mitmdump ~/.mitmproxy/mitmweb.conf: Options for mitmweb Options in the tool-specific config files over-ride options in common.conf. If a non-common option is put in common.conf, an error will be raised if a non-supporting tool is used.
* | Refactor command-line argument definitionAldo Cortesi2014-11-152-122/+124
| | | | | | | | | | - Argument definitions live in cmdline.py - Parsing and initial processing lives in main.py
* | Adjust testsAldo Cortesi2014-11-152-9/+9
| |
* | Remove sortedcontainers from deps - we don't use itAldo Cortesi2014-11-151-1/+0
| |
* | First-order integration of configargparser to add config file supportAldo Cortesi2014-11-156-71/+165
| |
* | Some additions to the release checklistAldo Cortesi2014-11-151-0/+15
|/
* always show error messagesMaximilian Hils2014-11-152-2/+2
|
* Changelog, plus fix date of previous releaseAldo Cortesi2014-11-151-1/+6
|
* bump versionMaximilian Hils2014-11-141-1/+1
|
* fix #409Maximilian Hils2014-11-141-1/+5
|
* handle script hooks in replay, fix tests, fix #402Maximilian Hils2014-11-143-43/+55
|
* fix grideditor bugMaximilian Hils2014-11-141-0/+2
|
* docs++Maximilian Hils2014-11-131-0/+9
|
* fix testsMaximilian Hils2014-11-112-2/+3
|
* Merge branch 'master' of github.com:mitmproxy/mitmproxyMaximilian Hils2014-11-114-19/+11
|\
| * Merge branch 'master' of ssh.github.com:mitmproxy/mitmproxyAldo Cortesi2014-11-117-24/+28
| |\
| * | Remove entry points in favor of vanilla scripts, fix test-releaseAldo Cortesi2014-11-112-17/+9
| | |
| * | Minor doc adjustmentsAldo Cortesi2014-11-072-2/+2
| | |
* | | be more explicit about requirementsMaximilian Hils2014-11-112-2/+6
| |/ |/|
* | fix clear keyMaximilian Hils2014-11-101-4/+5
| |
* | Merge pull request #403 from Lucas-C/masterMaximilian Hils2014-11-101-6/+5
|\ \ | | | | | | Using uppercase C to 'clear' display mode, because lowercase 'c' is used for css
| * | Using uppercase C to 'clear' display mode, because lowercase 'c' is used for cssLucas Cimon2014-11-071-6/+5
| | |
* | | fix #402Maximilian Hils2014-11-101-1/+2
| | |
* | | update change_upstream_proxy exampleMaximilian Hils2014-11-101-2/+2
|/ /
* | fix testsMaximilian Hils2014-11-071-9/+13
| |
* | fix #401Maximilian Hils2014-11-071-8/+4
| |