Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #2793 from kajojify/issue-2399 | Maximilian Hils | 2018-01-14 | 2 | -1/+2 |
|\ | |||||
| * | Other condition | Miroslav | 2018-01-14 | 1 | -2/+2 |
| * | Fix #2399 | Miroslav | 2018-01-14 | 2 | -1/+2 |
* | | Merge pull request #2791 from mhils/tls-extensions | Maximilian Hils | 2018-01-13 | 7 | -10/+28 |
|\ \ | |||||
| * | | store ClientHello extensions with client connection | Maximilian Hils | 2018-01-13 | 7 | -10/+28 |
|/ / | |||||
* | | Merge pull request #2790 from mhils/stateobject-improvements | Maximilian Hils | 2018-01-13 | 6 | -106/+190 |
|\ \ | |||||
| * | | stateobject: use typing, enable tuples and more complex datatypes | Maximilian Hils | 2018-01-13 | 6 | -106/+190 |
* | | | Merge pull request #2789 from mhils/move-clienthello | Maximilian Hils | 2018-01-13 | 6 | -155/+240 |
|\ \ \ | |/ / |/| | | |||||
| * | | improve net.tls.ClientHello API, fix bugs, add tests | Maximilian Hils | 2018-01-13 | 4 | -19/+95 |
| * | | move ClientHello and related functions to mitmproxy.net.tls | Maximilian Hils | 2018-01-12 | 6 | -155/+164 |
|/ / | |||||
* | | Merge pull request #2784 from ujjwal96/kaitai | Maximilian Hils | 2018-01-11 | 1 | -3/+5 |
|\ \ | |||||
| * | | Update GIF parser | Ujjwal Verma | 2018-01-11 | 1 | -3/+5 |
* | | | Merge pull request #2780 from ujjwal96/console-fix | Maximilian Hils | 2018-01-11 | 2 | -2/+2 |
|\ \ \ | |||||
| * | | | Fix crash when searching | Ujjwal Verma | 2018-01-11 | 2 | -2/+2 |
* | | | | Merge pull request #2781 from MatthewShao/fix#2766 | Maximilian Hils | 2018-01-11 | 2 | -0/+7 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Add test for fix#2766. | Matthew Shao | 2018-01-11 | 1 | -0/+4 |
| * | | | Fix #2766. | Matthew Shao | 2018-01-11 | 1 | -0/+3 |
|/ / / | |||||
* | | | Merge pull request #2773 from MatthewShao/fix#2760 | Thomas Kriechbaumer | 2018-01-08 | 2 | -1/+8 |
|\ \ \ | |||||
| * | | | Raise a CommandError for the exception | Matthew Shao | 2018-01-08 | 2 | -5/+5 |
| * | | | Fix #2760 | Matthew Shao | 2018-01-08 | 2 | -1/+8 |
|/ / / | |||||
* | | | Fix #2767 (#2770) | Samoilenko Roman | 2018-01-07 | 2 | -5/+5 |
* | | | only use annotated tags for version calculation | Maximilian Hils | 2018-01-07 | 3 | -2/+6 |
* | | | Merge pull request #2764 from Kriechi/ssl-tls | Maximilian Hils | 2018-01-07 | 31 | -163/+173 |
|\ \ \ | |||||
| * | | | avoid TLS/SSL ambiguity for Cert class | Thomas Kriechbaumer | 2018-01-07 | 10 | -33/+33 |
| * | | | 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 |
| | |/ / / | |/| | | |