| Commit message (Expand) | Author | Age | Files | Lines |
... | |
* | | | Merge pull request #1835 from Kriechi/bump | Maximilian Hils | 2016-12-11 | 1 | -5/+5 |
|\ \ \
| |/ /
|/| | |
|
| * | | bump dependencies | Thomas Kriechbaumer | 2016-12-10 | 1 | -5/+5 |
|/ / |
|
* | | Merge pull request #1831 from mhils/contentviews | Aldo Cortesi | 2016-12-11 | 54 | -1011/+1257 |
|\ \
| |/
|/| |
|
| * | minor fixes | Maximilian Hils | 2016-12-10 | 4 | -4/+4 |
| * | add new xml/html pretty-printer :tada: | Maximilian Hils | 2016-12-10 | 12 | -2/+338 |
| * | remove lxml-dependent code | Maximilian Hils | 2016-12-10 | 11 | -130/+30 |
| * | update tests, increase coverage, add type info | Maximilian Hils | 2016-12-09 | 32 | -379/+435 |
| * | split contentviews.py into mitmproxy.contentviews | Maximilian Hils | 2016-12-09 | 17 | -672/+626 |
* | | minor fixes | Maximilian Hils | 2016-12-10 | 1 | -1/+2 |
* | | Merge pull request #1834 from Kriechi/remove_ssl_match_hostname | Maximilian Hils | 2016-12-10 | 2 | -5/+4 |
|\ \
| |/
|/| |
|
| * | remove backport.ssl_match_hostname | Thomas Kriechbaumer | 2016-12-10 | 2 | -5/+4 |
* | | Merge pull request #1827 from mhils/issue-1803 | Maximilian Hils | 2016-12-09 | 1 | -0/+1 |
|\ \ |
|
| * | | fix #1803 | Maximilian Hils | 2016-12-09 | 1 | -0/+1 |
|/ / |
|
* | | Merge pull request #1823 from cortesi/options2 | Aldo Cortesi | 2016-12-08 | 7 | -29/+54 |
|\ \ |
|
| * | | options: add a merge method to assimilate options | Aldo Cortesi | 2016-12-08 | 7 | -29/+54 |
|/ / |
|
* | | Merge pull request #1822 from cortesi/clog | Aldo Cortesi | 2016-12-08 | 1 | -4/+6 |
|\ \ |
|
| * | | console: use an addon to capture logs | Aldo Cortesi | 2016-12-08 | 1 | -4/+6 |
* | | | Merge pull request #1806 from cortesi/options | Aldo Cortesi | 2016-12-08 | 24 | -463/+561 |
|\| |
| |/
|/| |
|
| * | Minor tweaks | Aldo Cortesi | 2016-12-08 | 4 | -19/+21 |
| * | Amalgamate all the Options objects | Aldo Cortesi | 2016-12-08 | 7 | -61/+61 |
| * | Replace configargparse with argparse, enable new options loading | Aldo Cortesi | 2016-12-08 | 7 | -122/+126 |
| * | Add YAML serialization of options | Aldo Cortesi | 2016-12-08 | 1 | -4/+0 |
| * | options: defaults are a class attribute | Aldo Cortesi | 2016-12-08 | 2 | -9/+9 |
| * | Options - avoid mutation, API cleanup, has_changed | Aldo Cortesi | 2016-12-08 | 1 | -0/+1 |
| * | options: save defaults, add .reset() to restore defaults | Aldo Cortesi | 2016-12-08 | 2 | -10/+14 |
| * | Add YAML serialization of options | Aldo Cortesi | 2016-12-08 | 3 | -1/+125 |
| * | options: defaults are a class attribute | Aldo Cortesi | 2016-12-08 | 2 | -10/+23 |
| * | Correct refresh_server_playback option default | Aldo Cortesi | 2016-12-08 | 1 | -1/+1 |
| * | Add OptManager.subscribe, use it to clean up palettes in console | Aldo Cortesi | 2016-12-08 | 4 | -22/+61 |
| * | Options - avoid mutation, API cleanup, has_changed | Aldo Cortesi | 2016-12-08 | 6 | -37/+53 |
| * | Get rid of tfile testing option | Aldo Cortesi | 2016-12-08 | 6 | -38/+31 |
| * | Clean up dump tests | Aldo Cortesi | 2016-12-08 | 3 | -174/+38 |
| * | options: save defaults, add .reset() to restore defaults | Aldo Cortesi | 2016-12-08 | 3 | -16/+58 |
|/ |
|
* | Merge pull request #1817 from Kriechi/fix-1816 | Thomas Kriechbaumer | 2016-12-06 | 5 | -21/+90 |
|\ |
|
| * | tls_parser: allow optional extensions | Thomas Kriechbaumer | 2016-12-06 | 5 | -21/+90 |
|/ |
|
* | Merge pull request #1810 from Kriechi/construct | Maximilian Hils | 2016-12-04 | 4 | -154/+123 |
|\ |
|
| * | upgrade to construct 2.8 and new API | Thomas Kriechbaumer | 2016-12-04 | 4 | -154/+123 |
* | | Merge pull request #1813 from dwfreed/patch-1 | Maximilian Hils | 2016-12-04 | 1 | -1/+1 |
|\ \ |
|
| * | | release: fix dropping _main suffix | Doug Freed | 2016-12-04 | 1 | -1/+1 |
|/ / |
|
* | | Merge pull request #1801 from Kriechi/simplify-alpn-openssl | Thomas Kriechbaumer | 2016-12-04 | 10 | -116/+151 |
|\ \
| |/
|/| |
|
| * | simplify ALPN and OpenSSL on macOS | Thomas Kriechbaumer | 2016-12-04 | 10 | -116/+151 |
|/ |
|
* | fix whitespace | Thomas Kriechbaumer | 2016-12-03 | 1 | -0/+1 |
* | fix indentation | Thomas Kriechbaumer | 2016-12-03 | 1 | -2/+2 |
* | fix ALPN usage | Thomas Kriechbaumer | 2016-12-02 | 1 | -2/+2 |
* | Merge pull request #1797 from Kriechi/websocket++ | Maximilian Hils | 2016-12-01 | 3 | -22/+67 |
|\ |
|
| * | websocket: update close handshake tests | Thomas Kriechbaumer | 2016-11-29 | 1 | -0/+4 |
| * | websocket: make flowfilter work | Thomas Kriechbaumer | 2016-11-29 | 1 | -6/+15 |
| * | websocket: carry over per-message compression bit | Thomas Kriechbaumer | 2016-11-29 | 1 | -0/+2 |
| * | websocket: reduce connection timeout | Thomas Kriechbaumer | 2016-11-29 | 1 | -1/+1 |
| * | websocket: fix message type on chunking | Thomas Kriechbaumer | 2016-11-29 | 1 | -2/+5 |