Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | rename TLS/SSL-related functions | Thomas Kriechbaumer | 2018-01-06 | 19 | -63/+63 | |
| * | | | | | rename TLS/SSL-related attributes | Thomas Kriechbaumer | 2018-01-06 | 17 | -69/+79 | |
* | | | | | | Merge pull request #2769 from kajojify/issue-2688 | Maximilian Hils | 2018-01-07 | 5 | -5/+10 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Fix #2688 | Miroslav | 2018-01-07 | 5 | -5/+10 | |
| | |_|/ / / | |/| | | | | ||||||
* | | | | | | Fix #2762 (#2763) | Samoilenko Roman | 2018-01-06 | 4 | -7/+7 | |
| |/ / / / |/| | | | | ||||||
* | | | | | Merge pull request #2759 from mhils/issue-1833 | Maximilian Hils | 2018-01-05 | 13 | -148/+184 | |
|\ \ \ \ \ | ||||||
| * | | | | | fix #1833 | Maximilian Hils | 2018-01-05 | 1 | -1/+24 | |
| * | | | | | refactor common.format_keyvals | Maximilian Hils | 2018-01-05 | 6 | -98/+117 | |
| * | | | | | minor fixes | Maximilian Hils | 2018-01-05 | 3 | -20/+18 | |
| * | | | | | fix test flow timestamps to values that don't overflow in certain timezones | Maximilian Hils | 2018-01-05 | 6 | -29/+25 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #2754 from mhils/issue-2470 | Thomas Kriechbaumer | 2018-01-04 | 2 | -2/+5 | |
|\ \ \ \ \ | ||||||
| * | | | | | fix #2470 | Maximilian Hils | 2018-01-04 | 2 | -2/+5 | |
* | | | | | | dependency update | Maximilian Hils | 2018-01-04 | 1 | -1/+1 | |
* | | | | | | Bugs with console fixed. (#2746) | Samoilenko Roman | 2018-01-04 | 1 | -1/+10 | |
* | | | | | | Merge pull request #2755 from mhils/fix-unfocused-pane-click | Maximilian Hils | 2018-01-04 | 1 | -14/+20 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| * | | | | | fix #2738 | Maximilian Hils | 2018-01-04 | 1 | -14/+20 | |
* | | | | | | Merge pull request #2756 from mitmproxy/pyinstaller | Maximilian Hils | 2018-01-04 | 8 | -4/+12 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | do not add leading zeroes to .dev version part. | Maximilian Hils | 2018-01-04 | 2 | -2/+2 | |
| * | | | | | | pin snapshot server hostkey, update pysftp | Maximilian Hils | 2018-01-04 | 6 | -2/+10 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #2745 from bksahu/patch-1 | Maximilian Hils | 2018-01-04 | 5 | -49/+125 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | don't use red text for informational message | Maximilian Hils | 2018-01-04 | 1 | -1/+1 | |
| * | | | | | | Added favicon and logos in /static/images | bksahu | 2018-01-02 | 2 | -0/+0 | |
| * | | | | | | Added logos to mitm.it | bksahu | 2018-01-02 | 3 | -6/+6 | |
| * | | | | | | Additional OSes/software added to the list | bksahu | 2018-01-02 | 3 | -44/+120 | |
* | | | | | | | Merge pull request #2742 from mhils/dataviewer-fix-edit | Maximilian Hils | 2018-01-04 | 4 | -75/+52 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | dataviewer: disable (broken) edit | Maximilian Hils | 2018-01-02 | 4 | -75/+52 | |
| | |/ / / / / | |/| | | | | | ||||||
* | | | | | | | fix broken link | Maximilian Hils | 2018-01-02 | 1 | -1/+1 | |
* | | | | | | | Fix crash when using body filters (#2744) | Wouter Visser | 2018-01-02 | 2 | -7/+7 | |
| |_|/ / / / |/| | | | | | ||||||
* | | | | | | docs: minor improvements | Maximilian Hils | 2018-01-01 | 1 | -1/+1 | |
* | | | | | | Merge pull request #2741 from Kriechi/unvendor-wsproto | Thomas Kriechbaumer | 2018-01-01 | 9 | -1440/+11 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| * | | | | | unvendor wsproto | Thomas Kriechbaumer | 2018-01-01 | 9 | -1440/+11 | |
|/ / / / / | ||||||
* | | / / | minor fixes | Maximilian Hils | 2017-12-31 | 2 | -1/+5 | |
| |_|/ / |/| | | | ||||||
* | | | | Merge pull request #2733 from mitmproxy/pyinstaller | Maximilian Hils | 2017-12-30 | 11 | -118/+165 | |
|\ \ \ \ | ||||||
| * | | | | update installbuilder | Maximilian Hils | 2017-12-30 | 1 | -1/+1 | |
| * | | | | fix #2470 | Maximilian Hils | 2017-12-30 | 1 | -2/+3 | |
| * | | | | fix appveyor build script | Maximilian Hils | 2017-12-30 | 3 | -4/+2 | |
| * | | | | single-source version processing | Maximilian Hils | 2017-12-30 | 6 | -67/+95 | |
| * | | | | rtool: include dev version in binaries | Maximilian Hils | 2017-12-29 | 4 | -37/+77 | |
| * | | | | tox.ini: python3 -> python | Maximilian Hils | 2017-12-29 | 1 | -2/+2 | |
| * | | | | remove rtool's setup.py, embrace tox | Maximilian Hils | 2017-12-29 | 2 | -23/+3 | |
| * | | | | update rtool dependencies | Maximilian Hils | 2017-12-26 | 1 | -1/+1 | |
| * | | | | make sure that mitmproxy/rtool dependencies don't clash | Maximilian Hils | 2017-12-26 | 1 | -0/+1 | |
| * | | | | update pyinstaller :pray: | Maximilian Hils | 2017-12-26 | 1 | -2/+1 | |
* | | | | | Merge pull request #2703 from mhils/test-defaultkeys | Maximilian Hils | 2017-12-30 | 2 | -6/+33 | |
|\ \ \ \ \ | |_|/ / / |/| | | | | ||||||
| * | | | | test that defaultkeys are valid commands | Maximilian Hils | 2017-12-29 | 2 | -6/+33 | |
| |/ / / | ||||||
* | | | | Merge pull request #2732 from mitmproxy/websocket-flow-kill | Maximilian Hils | 2017-12-29 | 4 | -16/+32 | |
|\ \ \ \ | ||||||
| * | | | | fix Flow.kill behaviour | Maximilian Hils | 2017-12-29 | 4 | -18/+15 | |
| * | | | | websocket: add flow kill test | Thomas Kriechbaumer | 2017-12-29 | 1 | -0/+19 | |
|/ / / / | ||||||
* | | | | Merge pull request #2728 from Kriechi/websocket++ | Thomas Kriechbaumer | 2017-12-29 | 5 | -15/+68 | |
|\ \ \ \ | ||||||
| * | | | | websocket: test killable | Thomas Kriechbaumer | 2017-12-28 | 1 | -0/+15 |