Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | web: fixes | Maximilian Hils | 2014-11-27 | 3 | -26/+42 |
| | |||||
* | format code | Maximilian Hils | 2014-11-27 | 13 | -296/+306 |
| | |||||
* | web++ | Maximilian Hils | 2014-11-27 | 12 | -423/+477 |
| | |||||
* | web: update dependencies | Maximilian Hils | 2014-11-27 | 4 | -13039/+11952 |
| | |||||
* | introduce revised views, port over changes from multiple_views branch | Maximilian Hils | 2014-11-26 | 13 | -327/+679 |
| | |||||
* | fix limit_txt, fix #412 | Maximilian Hils | 2014-11-23 | 1 | -2/+2 |
| | |||||
* | retain raw filter str on filt objects | Maximilian Hils | 2014-11-22 | 2 | -5/+7 |
| | |||||
* | add sni support to LiveConnection.change_server | Maximilian Hils | 2014-11-19 | 1 | -2/+11 |
| | |||||
* | fix tests | Maximilian Hils | 2014-11-15 | 2 | -2/+3 |
| | |||||
* | Merge pull request #410 from JustusW/master | Maximilian Hils | 2014-11-15 | 3 | -1/+217 |
|\ | | | | | Added HAR generation as inline script | ||||
| * | Added try/except block for import errors with harparser and pytz. | Justus Wingert | 2014-11-15 | 1 | -2/+8 |
| | | |||||
| * | Updated setup.py and moved requirements to examples section. Included ↵ | Justus Wingert | 2014-11-15 | 3 | -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 Wingert | 2014-11-15 | 2 | -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 Wingert | 2014-11-15 | 1 | -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 Wingert | 2014-11-15 | 1 | -34/+46 |
| | | | | | | | | Minor bugfixes to make ssl timings work. | ||||
| * | Hopefully fixed dependency fuckup. | Justus Wingert | 2014-11-15 | 1 | -1/+1 |
| | | |||||
| * | Added script dependencie to harparser. | Justus Wingert | 2014-11-15 | 1 | -0/+1 |
| | | |||||
| * | Typo... | Justus Wingert | 2014-11-15 | 1 | -1/+1 |
| | | |||||
| * | Improved helper method, marginally. | Justus Wingert | 2014-11-15 | 1 | -4/+4 |
| | | |||||
| * | Updated documentation and cleaned up the code. | Justus Wingert | 2014-11-15 | 1 | -105/+91 |
| | | |||||
| * | Initial checkin with har_extractor script. | Justus Wingert | 2014-11-15 | 1 | -0/+207 |
| | | |||||
* | | One common --version flag | Aldo Cortesi | 2014-11-15 | 1 | -15/+5 |
| | | |||||
* | | Remove last vestiges of argparse | Aldo Cortesi | 2014-11-15 | 1 | -7/+6 |
| | | |||||
* | | Exclude main.py from coverage analysis | Aldo Cortesi | 2014-11-15 | 2 | -1/+4 |
| | | |||||
* | | Make sure all command-line arguments have a long form | Aldo Cortesi | 2014-11-15 | 1 | -21/+20 |
| | | | | | | | | ... so they can be used in config files | ||||
* | | Enable config file parsing | Aldo Cortesi | 2014-11-15 | 2 | -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 definition | Aldo Cortesi | 2014-11-15 | 2 | -122/+124 |
| | | | | | | | | | | - Argument definitions live in cmdline.py - Parsing and initial processing lives in main.py | ||||
* | | Adjust tests | Aldo Cortesi | 2014-11-15 | 2 | -9/+9 |
| | | |||||
* | | Remove sortedcontainers from deps - we don't use it | Aldo Cortesi | 2014-11-15 | 1 | -1/+0 |
| | | |||||
* | | First-order integration of configargparser to add config file support | Aldo Cortesi | 2014-11-15 | 6 | -71/+165 |
| | | |||||
* | | Some additions to the release checklist | Aldo Cortesi | 2014-11-15 | 1 | -0/+15 |
|/ | |||||
* | always show error messages | Maximilian Hils | 2014-11-15 | 2 | -2/+2 |
| | |||||
* | Changelog, plus fix date of previous release | Aldo Cortesi | 2014-11-15 | 1 | -1/+6 |
| | |||||
* | bump version | Maximilian Hils | 2014-11-14 | 1 | -1/+1 |
| | |||||
* | fix #409 | Maximilian Hils | 2014-11-14 | 1 | -1/+5 |
| | |||||
* | handle script hooks in replay, fix tests, fix #402 | Maximilian Hils | 2014-11-14 | 3 | -43/+55 |
| | |||||
* | fix grideditor bug | Maximilian Hils | 2014-11-14 | 1 | -0/+2 |
| | |||||
* | docs++ | Maximilian Hils | 2014-11-13 | 1 | -0/+9 |
| | |||||
* | fix tests | Maximilian Hils | 2014-11-11 | 2 | -2/+3 |
| | |||||
* | Merge branch 'master' of github.com:mitmproxy/mitmproxy | Maximilian Hils | 2014-11-11 | 4 | -19/+11 |
|\ | |||||
| * | Merge branch 'master' of ssh.github.com:mitmproxy/mitmproxy | Aldo Cortesi | 2014-11-11 | 7 | -24/+28 |
| |\ | |||||
| * | | Remove entry points in favor of vanilla scripts, fix test-release | Aldo Cortesi | 2014-11-11 | 2 | -17/+9 |
| | | | |||||
| * | | Minor doc adjustments | Aldo Cortesi | 2014-11-07 | 2 | -2/+2 |
| | | | |||||
* | | | be more explicit about requirements | Maximilian Hils | 2014-11-11 | 2 | -2/+6 |
| |/ |/| | |||||
* | | fix clear key | Maximilian Hils | 2014-11-10 | 1 | -4/+5 |
| | | |||||
* | | Merge pull request #403 from Lucas-C/master | Maximilian Hils | 2014-11-10 | 1 | -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 css | Lucas Cimon | 2014-11-07 | 1 | -6/+5 |
| | | | |||||
* | | | fix #402 | Maximilian Hils | 2014-11-10 | 1 | -1/+2 |
| | | | |||||
* | | | update change_upstream_proxy example | Maximilian Hils | 2014-11-10 | 1 | -2/+2 |
|/ / | |||||
* | | fix tests | Maximilian Hils | 2014-11-07 | 1 | -9/+13 |
| | |