Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Update install.rst | Maximilian Hils | 2016-08-02 | 1 | -1/+1 |
* | fix #1465, fix ssl_insecure | Maximilian Hils | 2016-08-02 | 3 | -8/+16 |
* | Revert "Add missing ssl_insecure option" | Maximilian Hils | 2016-08-02 | 1 | -1/+0 |
* | Merge pull request #1463 from dufferzafar/options-hotfix | Thomas Kriechbaumer | 2016-08-02 | 1 | -0/+1 |
|\ | |||||
| * | Add missing ssl_insecure option | Shadab Zafar | 2016-08-02 | 1 | -0/+1 |
|/ | |||||
* | Merge pull request #1457 from mkagenius/interger_division | Thomas Kriechbaumer | 2016-08-01 | 1 | -1/+1 |
|\ | |||||
| * | integer division for python 3 compatibility | Manish Kumar | 2016-08-01 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #1453 from dufferzafar/limit-to-filter | Maximilian Hils | 2016-07-31 | 9 | -37/+37 |
|\ | |||||
| * | Rename "Limit" feature to "Filter View" | Shadab Zafar | 2016-07-31 | 9 | -37/+37 |
* | | Merge pull request #1447 from mitmproxy/secure-by-default | Aldo Cortesi | 2016-08-01 | 25 | -231/+303 |
|\ \ | |||||
| * | | fix cert verification tests, remove leftovers | Maximilian Hils | 2016-07-27 | 11 | -165/+209 |
| * | | improve invalid certificate ux | Maximilian Hils | 2016-07-27 | 9 | -50/+70 |
| * | | verify upstream certificates by default (#1111) | Sachin Kelkar | 2016-07-27 | 8 | -44/+52 |
* | | | Merge pull request #1449 from mhils/fix-1448 | Maximilian Hils | 2016-07-30 | 4 | -7/+12 |
|\ \ \ | |||||
| * | | | add escape_single_quotes=False arg to bytes_to_escaped_str | Maximilian Hils | 2016-07-29 | 4 | -7/+12 |
| | |/ | |/| | |||||
* | | | Merge pull request #1451 from YanchWare/master | Maximilian Hils | 2016-07-30 | 6 | -4/+30 |
|\ \ \ | |||||
| * | | | Integrated encode/decoder for brotli | Angelo Agatino Nicolosi | 2016-07-30 | 6 | -4/+30 |
| |/ / | |||||
* | | | Merge pull request #1450 from vhaupert/master | Maximilian Hils | 2016-07-30 | 2 | -1/+3 |
|\ \ \ | |/ / |/| | | |||||
| * | | Substitute tilde with user's home. | Vincent Haupert | 2016-07-30 | 1 | -0/+1 |
| * | | Fix platform import on Linux using python3 | Vincent Haupert | 2016-07-30 | 1 | -1/+2 |
|/ / | |||||
* | | minor fixes | Maximilian Hils | 2016-07-29 | 3 | -6/+6 |
* | | clean up release tool, build linux binaries | Maximilian Hils | 2016-07-29 | 4 | -188/+168 |
* | | Merge pull request #1436 from dufferzafar/jsbeautifier | Maximilian Hils | 2016-07-28 | 11 | -1586/+20 |
|\ \ | |||||
| * | | Use replace while decoding | dufferzafar | 2016-07-28 | 2 | -5/+8 |
| * | | Set upper bound on jsbeautifier package to 1.7 | dufferzafar | 2016-07-28 | 1 | -1/+1 |
| * | | Use strutils.native before sending data to jsbeautifier | dufferzafar | 2016-07-27 | 1 | -1/+1 |
| * | | Re-order imports etc. | dufferzafar | 2016-07-27 | 1 | -17/+11 |
| * | | Remove jsbeautifier files | dufferzafar | 2016-07-27 | 8 | -1564/+0 |
| * | | Make contentview requirements mandatory | dufferzafar | 2016-07-27 | 1 | -2/+2 |
| * | | Use jsbeautifier from pip | dufferzafar | 2016-07-27 | 2 | -2/+3 |
* | | | minor fixes | Maximilian Hils | 2016-07-27 | 2 | -3/+4 |
| |/ |/| | |||||
* | | Merge pull request #1446 from cortesi/state | Aldo Cortesi | 2016-07-28 | 2 | -1/+18 |
|\ \ | |||||
| * | | console: add replace_view_state, fix statusbar issues | Aldo Cortesi | 2016-07-28 | 2 | -1/+18 |
* | | | Merge pull request #1442 from cortesi/scripts | Aldo Cortesi | 2016-07-28 | 1 | -0/+1 |
|\| | | |||||
| * | | mitmdump: send script .done when terminating after flow read | Aldo Cortesi | 2016-07-28 | 1 | -0/+1 |
* | | | Merge pull request #1406 from gzzhanghao/fix36 | Maximilian Hils | 2016-07-27 | 7 | -19/+52 |
|\ \ \ | |||||
| * | | | [web] change test files | Jason | 2016-07-27 | 8 | -7/+1 |
| * | | | [web] bug fix and add test | Jason | 2016-07-26 | 4 | -13/+37 |
| * | | | [web] fix: Flow update changes list order #36 | Jason | 2016-07-24 | 1 | -10/+25 |
* | | | | add favicon to mitmweb (#1440) | Clemens Brunner | 2016-07-27 | 4 | -2/+4 |
| |_|/ |/| | | |||||
* | | | update dependencies (#1435) | Maximilian Hils | 2016-07-25 | 3 | -5/+5 |
* | | | restrict accepted lxml versions to fix builds | Maximilian Hils | 2016-07-25 | 1 | -1/+1 |
* | | | fix #1432 | Maximilian Hils | 2016-07-25 | 1 | -2/+8 |
* | | | Merge pull request #1428 from dufferzafar/replay | Aldo Cortesi | 2016-07-26 | 2 | -22/+33 |
|\ \ \ | |_|/ |/| | | |||||
| * | | Consolidate replay under R | Shadab Zafar | 2016-07-25 | 2 | -22/+33 |
* | | | Merge pull request #1427 from mhils/grideditor | Aldo Cortesi | 2016-07-26 | 9 | -728/+884 |
|\ \ \ | |||||
| * | | | py2: silence abc metaclass warnings | Maximilian Hils | 2016-07-24 | 1 | -3/+1 |
| * | | | refactor grideditor for py3 compatibility | Maximilian Hils | 2016-07-24 | 9 | -728/+886 |
* | | | | Merge branch 'flow_editing_v2' | Maximilian Hils | 2016-07-25 | 19 | -202/+305 |
|\ \ \ \ | |||||
| * | | | | add up/download button to ContentTooLarge view | Maximilian Hils | 2016-07-25 | 1 | -4/+14 |