Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | style fixes | Thomas Kriechbaumer | 2016-08-14 | 1 | -3/+3 |
* | Merge pull request #1441 from mitmproxy/integrate_mitmproxy_contentviews | Maximilian Hils | 2016-08-13 | 3 | -619/+63980 |
|\ | |||||
| * | merge with master | Clemens | 2016-08-09 | 35 | -1657/+116 |
| |\ | |||||
| * | | added hints from mhils | Clemens | 2016-08-09 | 3 | -636/+63959 |
| * | | fix get contentview in mitmweb | Clemens | 2016-08-04 | 1 | -2/+4 |
| * | | integrate simplified contentviews | Clemens | 2016-08-03 | 3 | -84/+71 |
| * | | replace get_content_view in dumper and flowview | Clemens | 2016-08-01 | 2 | -43/+7 |
| * | | moved getlines to contentviews | Clemens | 2016-07-29 | 2 | -32/+33 |
| * | | combine clientside and serverside contentviews | Clemens | 2016-07-29 | 1 | -30/+49 |
| * | | mitmproxy.contentviews added | Clemens | 2016-07-28 | 1 | -3/+47 |
| * | | add parameter to content requests | Clemens | 2016-07-27 | 1 | -0/+1 |
| * | | add contentviews to settings | Clemens | 2016-07-27 | 1 | -1/+4 |
* | | | fix #1430 | Thomas Kriechbaumer | 2016-08-13 | 2 | -13/+15 |
* | | | clean up code, improve DummyReply | Maximilian Hils | 2016-08-09 | 7 | -12/+30 |
* | | | finalize Reply semantics, fix tests | Maximilian Hils | 2016-08-09 | 13 | -42/+63 |
* | | | make Reply.state readonly | Maximilian Hils | 2016-08-09 | 1 | -5/+19 |
* | | | improve reply semantics | Maximilian Hils | 2016-08-08 | 1 | -57/+57 |
* | | | fix reply concurrency | Maximilian Hils | 2016-08-04 | 1 | -2/+22 |
| |/ |/| | |||||
* | | fix tests | Maximilian Hils | 2016-08-04 | 2 | -3/+0 |
* | | minor improvements | Maximilian Hils | 2016-08-04 | 2 | -1/+2 |
* | | simplify contentview logic | Maximilian Hils | 2016-08-04 | 3 | -83/+69 |
* | | 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 |
* | | Add missing ssl_insecure option | Shadab Zafar | 2016-08-02 | 1 | -0/+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 | 7 | -28/+28 |
|\ \ | |||||
| * | | Rename "Limit" feature to "Filter View" | Shadab Zafar | 2016-07-31 | 7 | -28/+28 |
* | | | Merge pull request #1447 from mitmproxy/secure-by-default | Aldo Cortesi | 2016-08-01 | 10 | -45/+40 |
|\ \ \ | |||||
| * | | | improve invalid certificate ux | Maximilian Hils | 2016-07-27 | 7 | -25/+20 |
| * | | | verify upstream certificates by default (#1111) | Sachin Kelkar | 2016-07-27 | 4 | -21/+21 |
* | | | | Merge pull request #1451 from YanchWare/master | Maximilian Hils | 2016-07-30 | 1 | -0/+2 |
|\ \ \ \ | |||||
| * | | | | Integrated encode/decoder for brotli | Angelo Agatino Nicolosi | 2016-07-30 | 1 | -0/+2 |
| | |/ / | |/| | | |||||
* | | | | 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 |
|/ / / | |||||
* | | | Merge pull request #1436 from dufferzafar/jsbeautifier | Maximilian Hils | 2016-07-28 | 9 | -1582/+13 |
|\ \ \ | |||||
| * | | | Use replace while decoding | dufferzafar | 2016-07-28 | 1 | -2/+3 |
| * | | | 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 |
| * | | | Use jsbeautifier from pip | dufferzafar | 2016-07-27 | 1 | -2/+2 |
| | |/ | |/| | |||||
* | | | 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 |
* | | | add favicon to mitmweb (#1440) | Clemens Brunner | 2016-07-27 | 2 | -1/+2 |
| |/ |/| | |||||
* | | 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 |
|\ \ |