Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | generalize store | Maximilian Hils | 2014-12-09 | 5 | -241/+259 | |
| | | ||||||
| * | always use the app dispatcher | Maximilian Hils | 2014-12-09 | 24 | -16210/+2491 | |
| | | ||||||
| * | web: various improvements | Maximilian Hils | 2014-11-29 | 7 | -58/+168 | |
| | | ||||||
| * | event log: virtual scrolling | Maximilian Hils | 2014-11-28 | 5 | -75/+137 | |
| | | ||||||
| * | web: add virtualscroll mixin | Maximilian Hils | 2014-11-28 | 4 | -96/+143 | |
| | | ||||||
| * | web: various fixes, add clear button | Maximilian Hils | 2014-11-28 | 9 | -70/+156 | |
| | | ||||||
| * | web: virtual scrolling | Maximilian Hils | 2014-11-28 | 4 | -96/+190 | |
| | | ||||||
| * | 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 | |
| | | ||||||
* | | Merge pull request #425 from tekii/master | Maximilian Hils | 2014-12-11 | 3 | -10/+23 | |
|\ \ | | | | | | | append option added to dump (flow file is open in append mode instead of overwrite) | |||||
| * | | append file mode for saving flows merged to master | Marcelo Glezer | 2014-12-11 | 3 | -10/+23 | |
| | | | ||||||
| * | | Merge remote-tracking branch 'base/master' | Marcelo Glezer | 2014-12-11 | 70 | -781/+1979 | |
| |\ \ | |/ / |/| | | ||||||
* | | | fix #304 | Maximilian Hils | 2014-12-09 | 1 | -1/+25 | |
| | | | ||||||
* | | | fix #411 | Maximilian Hils | 2014-12-08 | 1 | -3/+3 | |
| | | | ||||||
* | | | fix #419 | Maximilian Hils | 2014-12-08 | 1 | -1/+10 | |
| | | | ||||||
* | | | fix HTTPResponse creation | Maximilian Hils | 2014-12-04 | 1 | -2/+1 | |
| | | | ||||||
* | | | fix tests | Maximilian Hils | 2014-12-01 | 2 | -9/+17 | |
| | | | ||||||
* | | | Merge branch 'master' of github.com:mitmproxy/mitmproxy | Maximilian Hils | 2014-12-01 | 2 | -8/+2 | |
|\ \ \ | ||||||
| * \ \ | Merge pull request #416 from elimisteve/patch-1 | Maximilian Hils | 2014-11-29 | 1 | -7/+1 | |
| |\ \ \ | | | | | | | | | | | README: Fixed double-quote and whitespace issues | |||||
| | * | | | README: Fixed double-quote and whitespace issues | Steve Phillips | 2014-11-29 | 1 | -7/+1 | |
| |/ / / | ||||||
| * | | | Merge pull request #415 from gabe-k/flowbasic-fix | Maximilian Hils | 2014-11-28 | 1 | -1/+1 | |
| |\ \ \ | | | | | | | | | | | Changed argument name from confdir to cadir in flowbasic example | |||||
| | * | | | Changed argument name from confdir to cadir in flowbasic example | Gabriel Kirkpatrick | 2014-11-28 | 1 | -1/+1 | |
| |/ / / | ||||||
* | | | | add inline script example for websocket passthrough, fix #340 | Maximilian Hils | 2014-12-01 | 2 | -0/+33 | |
| | | | | ||||||
* | | | | make header processing configurable by inline scripts, refs #340 | Maximilian Hils | 2014-12-01 | 1 | -11/+15 | |
|/ / / | ||||||
* | | | fix #413 | Maximilian Hils | 2014-11-28 | 1 | -3/+4 | |
| | | | ||||||
* | | | fix error html | Maximilian Hils | 2014-11-26 | 1 | -1/+1 | |
| |/ |/| | ||||||
* | | 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. |