Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | py3++ | Maximilian Hils | 2016-04-13 | 11 | -33/+36 |
* | Merge branch 'master' of https://github.com/mitmproxy/mitmproxy | Maximilian Hils | 2016-04-13 | 2 | -3/+3 |
|\ | |||||
| * | gulp-minify-css is deprecated. Adding gulp-clean-css | Israel Blancas | 2016-04-11 | 2 | -3/+3 |
* | | fix #1082 | Maximilian Hils | 2016-04-13 | 1 | -1/+1 |
* | | minor improvements | Maximilian Hils | 2016-04-13 | 5 | -29/+13 |
|/ | |||||
* | Merge branch 'master' of https://github.com/mitmproxy/mitmproxy | Maximilian Hils | 2016-04-11 | 1 | -0/+11 |
|\ | |||||
| * | Add installation instructions for Arch Linux (#1079) | Felix Yan | 2016-04-11 | 1 | -0/+11 |
* | | peer_address -> ip_address | Maximilian Hils | 2016-04-11 | 9 | -23/+16 |
* | | docs: better data structure docs | Maximilian Hils | 2016-04-11 | 7 | -76/+66 |
|/ | |||||
* | docs: fix logo | Maximilian Hils | 2016-04-10 | 2 | -0/+0 |
* | update README | Maximilian Hils | 2016-04-09 | 1 | -1/+1 |
* | bump version | Maximilian Hils | 2016-04-09 | 2 | -1/+7 |
* | update CHANGELOG | Maximilian Hils | 2016-04-09 | 1 | -1/+26 |
* | server replay: keep --kill active | Maximilian Hils | 2016-04-09 | 3 | -16/+6 |
* | Merge branch 'master' of https://github.com/mitmproxy/mitmproxy | Maximilian Hils | 2016-04-09 | 1 | -1/+1 |
|\ | |||||
| * | Fix being unable to export binary data in requests (#1069) | Anthony Zhang | 2016-04-09 | 1 | -1/+1 |
* | | fix client playback logic | Maximilian Hils | 2016-04-09 | 1 | -7/+8 |
|/ | |||||
* | fix server replay shutdown | Maximilian Hils | 2016-04-09 | 1 | -11/+19 |
* | add sphinx_rtd_theme as a dependency | Maximilian Hils | 2016-04-03 | 1 | -0/+1 |
* | Merge branch 'better-replace' | Maximilian Hils | 2016-04-03 | 10 | -65/+100 |
|\ | |||||
| * | improve .replace() and move it into netlib | Maximilian Hils | 2016-04-02 | 10 | -65/+100 |
* | | update dependencies | Maximilian Hils | 2016-04-03 | 1 | -6/+5 |
* | | Merge pull request #1076 from mitmproxy/issue-1061 | Thomas Kriechbaumer | 2016-04-03 | 2 | -21/+19 |
|\ \ | |||||
| * | | fix #1061 | Maximilian Hils | 2016-04-02 | 2 | -21/+19 |
* | | | Merge pull request #1074 from mitmproxy/move-response-refresh | Thomas Kriechbaumer | 2016-04-03 | 6 | -93/+107 |
|\ \ \ | |||||
| * | | | move HTTPResponse.refresh into netlib | Maximilian Hils | 2016-04-02 | 6 | -93/+107 |
* | | | | Merge pull request #1073 from mitmproxy/first-line-format | Thomas Kriechbaumer | 2016-04-03 | 9 | -76/+37 |
|\ \ \ \ | |||||
| * | | | | form_(in|out) -> first_line_format | Maximilian Hils | 2016-04-02 | 9 | -76/+37 |
* | | | | | Merge pull request #1072 from mitmproxy/remove-response-msg | Thomas Kriechbaumer | 2016-04-03 | 5 | -15/+4 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | response.msg -> response.reason | Maximilian Hils | 2016-04-02 | 5 | -15/+4 |
|/ / / / | |||||
* / / / | minor simplifications | Maximilian Hils | 2016-04-02 | 2 | -4/+1 |
|/ / / | |||||
* | | | improve timing display | Maximilian Hils | 2016-04-02 | 2 | -58/+64 |
* | | | fix FlowMaster.create_request, add test | Maximilian Hils | 2016-04-02 | 2 | -0/+6 |
* | | | fix #1052 | Maximilian Hils | 2016-04-02 | 1 | -1/+1 |
|/ / | |||||
* | | fix #1067 | Maximilian Hils | 2016-04-02 | 1 | -1/+1 |
* | | Merge branch 'master' of https://github.com/mitmproxy/mitmproxy | Maximilian Hils | 2016-04-02 | 1 | -1/+2 |
|\ \ | |/ |/| | |||||
| * | Merge pull request #1066 from fimad/master | Maximilian Hils | 2016-03-31 | 1 | -1/+2 |
| |\ | |||||
| | * | Fix XSS vulnerability in HTTP errors | Will Coster | 2016-03-31 | 1 | -1/+2 |
| |/ | |||||
* / | add Serializeable.copy | Maximilian Hils | 2016-04-02 | 7 | -19/+34 |
|/ | |||||
* | travis: checkout full repo for builds | Maximilian Hils | 2016-03-31 | 1 | -0/+2 |
* | Merge branch 'master' of https://github.com/mitmproxy/mitmproxy | Maximilian Hils | 2016-03-31 | 29 | -90/+377 |
|\ | |||||
| * | Merge pull request #1050 from zlorb/master | Maximilian Hils | 2016-03-29 | 5 | -2/+281 |
| |\ | |||||
| | * | Merge remote-tracking branch 'mitmproxy/master' | Zohar Lorberbaum | 2016-03-28 | 0 | -0/+0 |
| | |\ | | |/ | |/| | |||||
| * | | add safeguard | Thomas Kriechbaumer | 2016-03-27 | 1 | -1/+2 |
| * | | improve flow export tests | Thomas Kriechbaumer | 2016-03-27 | 1 | -2/+23 |
| * | | s/nocover/no cover/g | Thomas Kriechbaumer | 2016-03-27 | 12 | -33/+32 |
| * | | increase test timeout | Thomas Kriechbaumer | 2016-03-27 | 1 | -1/+1 |
| * | | Merge pull request #1055 from MatthewShao/issue#963 | Thomas Kriechbaumer | 2016-03-27 | 15 | -51/+38 |
| |\ \ | |||||
| | * | | minor fix about if-else statement | Matthew Shao | 2016-03-27 | 1 | -3/+1 |
| | * | | update comments | Matthew Shao | 2016-03-26 | 3 | -7/+7 |