Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | Fix AppVeyor builds (#2604) | Maximilian Hils | 2017-10-24 | 1 | -3/+7 | |
|/ / | ||||||
* | | [requires.io] dependency update on master branch (#2586) | Thomas Kriechbaumer | 2017-10-22 | 1 | -3/+3 | |
* | | Merge pull request #2591 from ddworken/master | Maximilian Hils | 2017-10-22 | 2 | -6/+17 | |
|\ \ | ||||||
| * | | Added scanning for CSS injection and iframe injection | David Dworken | 2017-10-17 | 2 | -6/+17 | |
* | | | Merge pull request #2596 from mhils/fix-travis | Maximilian Hils | 2017-10-20 | 2 | -0/+18 | |
|\ \ \ | ||||||
| * | | | skip ipv6 tests on sudo-enabled travis builds | Maximilian Hils | 2017-10-20 | 2 | -0/+18 | |
|/ / / | ||||||
* | | | Merge pull request #2593 from rst0git/patch-1 | Maximilian Hils | 2017-10-19 | 1 | -1/+1 | |
|\ \ \ | ||||||
| * | | | docs-certinstall: Certificate pinning update link | rst0git | 2017-10-19 | 1 | -1/+1 | |
|/ / / | ||||||
* | | | Merge pull request #2592 from rst0git/patch-1 | Thomas Kriechbaumer | 2017-10-18 | 1 | -1/+1 | |
|\ \ \ | |/ / |/| | | ||||||
| * | | docs-install: Fix typo | rst0git | 2017-10-18 | 1 | -1/+1 | |
|/ / | ||||||
* | | allow pyOpenSSL 17.2 | Maximilian Hils | 2017-10-17 | 1 | -1/+1 | |
* | | Merge pull request #2581 from mitmproxy/requires-io-master | Maximilian Hils | 2017-10-10 | 1 | -2/+2 | |
|\ \ | ||||||
| * | | [requires.io] dependency update | requires.io | 2017-10-06 | 1 | -1/+1 | |
| * | | [requires.io] dependency update | requires.io | 2017-10-02 | 1 | -1/+1 | |
* | | | Merge pull request #2583 from rgerganov/fix-typo | Maximilian Hils | 2017-10-10 | 1 | -1/+1 | |
|\ \ \ | |/ / |/| | | ||||||
| * | | Fix typo in the docstring of flowfilter | Radoslav Gerganov | 2017-10-10 | 1 | -1/+1 | |
|/ / | ||||||
* | | Merge pull request #2573 from mhils/remove-html-outline | Maximilian Hils | 2017-09-15 | 4 | -29/+1 | |
|\ \ | ||||||
| * | | remove html outline contentview, fix #2572 | Maximilian Hils | 2017-09-14 | 4 | -29/+1 | |
|/ / | ||||||
* | | Merge pull request #2571 from mitmproxy/requires-io-master | Maximilian Hils | 2017-09-13 | 1 | -1/+1 | |
|\ \ | ||||||
| * | | [requires.io] dependency update | requires.io | 2017-09-14 | 1 | -1/+1 | |
|/ / | ||||||
* | | Merge pull request #2537 from ujjwal96/content-view | Maximilian Hils | 2017-09-04 | 11 | -34/+164 | |
|\ \ | ||||||
| * | | do not fail CI for missing newlines | Maximilian Hils | 2017-09-04 | 1 | -1/+1 | |
| * | | pyinstaller: add passlib hook | Maximilian Hils | 2017-09-04 | 1 | -0/+1 | |
| * | | remove jsbeautifier dependency | Maximilian Hils | 2017-09-03 | 2 | -7/+1 | |
| * | | make split_special_areas more flexible, refs #2537 | Maximilian Hils | 2017-09-03 | 3 | -20/+18 | |
| * | | Added test | Ujjwal Verma | 2017-09-03 | 3 | -70/+92 | |
| * | | JS beautifier | Ujjwal Verma | 2017-09-03 | 3 | -5/+120 | |
* | | | Merge pull request #2560 from mhils/mitmproxy-net-tls | Maximilian Hils | 2017-09-04 | 13 | -396/+447 | |
|\ \ \ | ||||||
| * | | | move hostname validation into mitmproxy.net.tls | Maximilian Hils | 2017-09-04 | 7 | -136/+145 | |
| * | | | split TLS parts from net.tcp into net.tls | Maximilian Hils | 2017-09-03 | 10 | -313/+355 | |
| |/ / | ||||||
* | | | Merge pull request #2558 from Kriechi/linux-docs | Thomas Kriechbaumer | 2017-09-04 | 1 | -82/+75 | |
|\ \ \ | ||||||
| * | | | update installation docs | Thomas Kriechbaumer | 2017-09-04 | 1 | -82/+75 | |
| |/ / | ||||||
* | | | Merge pull request #2561 from mhils/no-tornado-warnings | Maximilian Hils | 2017-09-04 | 1 | -0/+14 | |
|\ \ \ | |/ / |/| | | ||||||
| * | | suppress tornado logging in tests | Maximilian Hils | 2017-09-03 | 1 | -0/+14 | |
|/ / | ||||||
* | | fix #2477 (#2556) | Suraj Tripathi | 2017-09-01 | 1 | -1/+1 | |
* | | Merge pull request #2551 from MatthewShao/static-viewer | Maximilian Hils | 2017-08-31 | 3 | -0/+13 | |
|\ \ | ||||||
| * | | [web] Update test for static viewer. | Matthew Shao | 2017-08-30 | 1 | -0/+6 | |
| * | | [web] Add settings.json to static viewer, so it can display version. | Matthew Shao | 2017-08-30 | 2 | -0/+7 | |
|/ / | ||||||
* | | Merge pull request #2542 from mhils/fast-css | Maximilian Hils | 2017-08-26 | 25 | -37/+425 | |
|\ \ | ||||||
| * | | fix strutils.split_special_areas | Maximilian Hils | 2017-08-26 | 2 | -2/+10 | |
| * | | remove cssutils dependency | Maximilian Hils | 2017-08-24 | 1 | -1/+0 | |
| * | | add new, faster css prettifier :tada: | Maximilian Hils | 2017-08-24 | 22 | -35/+309 | |
| * | | add strutils.escape_special_areas | Maximilian Hils | 2017-08-24 | 2 | -1/+108 | |
|/ / | ||||||
* | | update mitmweb assets (gulp prod) | Maximilian Hils | 2017-08-22 | 4 | -70540/+294 | |
* | | [web] make it possible to run static viewer in subdirectories | Maximilian Hils | 2017-08-22 | 2 | -1/+4 | |
* | | Merge pull request #2540 from mhils/relatively-static | Maximilian Hils | 2017-08-22 | 16 | -24/+28 | |
|\ \ | ||||||
| * | | [web] make it possible to run static viewer in subdirectories | Maximilian Hils | 2017-08-21 | 16 | -24/+28 | |
* | | | Merge pull request #2539 from mhils/fix-mitmweb-shutdown | Maximilian Hils | 2017-08-22 | 3 | -1/+28 | |
|\ \ \ | |/ / |/| | | ||||||
| * | | fix mitmweb master shutdown, tests++ | Maximilian Hils | 2017-08-21 | 3 | -1/+28 | |
* | | | fix gulpfile copy mistake | Maximilian Hils | 2017-08-21 | 1 | -1/+1 | |
|/ / |