Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [web] minor fixes and cleanup | Maximilian Hils | 2017-10-25 | 6 | -170/+60 |
| | |||||
* | [web] remove prompt | Maximilian Hils | 2017-10-25 | 5 | -100/+4 |
| | |||||
* | [web] minor fixes | Maximilian Hils | 2017-10-25 | 2 | -2/+2 |
| | |||||
* | [web] update to react 16.0 | Maximilian Hils | 2017-10-25 | 2 | -586/+1213 |
| | |||||
* | Merge pull request #2602 from mhils/simplify-version | Maximilian Hils | 2017-10-24 | 3 | -56/+41 |
|\ | | | | | Simplify version output | ||||
| * | simplify version output | Maximilian Hils | 2017-10-24 | 3 | -56/+41 |
| | | |||||
* | | Merge pull request #2603 from mhils/wsl | Maximilian Hils | 2017-10-24 | 3 | -2/+19 |
|\ \ | | | | | | | Fix urwid display on WSL | ||||
| * | | fix urwid display on WSL | Maximilian Hils | 2017-10-23 | 3 | -2/+19 |
| |/ | |||||
* / | 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 to XSS scanner | ||||
| * | 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 | ||||
| * | | 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 | ||||
| * | | docs-certinstall: Certificate pinning update link | rst0git | 2017-10-19 | 1 | -1/+1 |
|/ / | | | | | Certificate pinning (HTTP Public Key Pinning) is better described on Wikipedia | ||||
* | | Merge pull request #2592 from rst0git/patch-1 | Thomas Kriechbaumer | 2017-10-18 | 1 | -1/+1 |
|\ \ | |/ |/| | docs-install: Fix typo | ||||
| * | 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 on master branch | ||||
| * | [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 | ||||
| * | Fix typo in the docstring of flowfilter | Radoslav Gerganov | 2017-10-10 | 1 | -1/+1 |
|/ | | | | The expression for body of response is "bs", not "bq". | ||||
* | Merge pull request #2573 from mhils/remove-html-outline | Maximilian Hils | 2017-09-15 | 4 | -29/+1 |
|\ | | | | | Remove HTML Outline Contentview, fix #2572 | ||||
| * | 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 on master branch | ||||
| * | [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 |
|\ | | | | | JS beautifier | ||||
| * | do not fail CI for missing newlines | Maximilian Hils | 2017-09-04 | 1 | -1/+1 |
| | | | | | | | | | | this regularly stalls pull requests and serves no further purpose, so it needs to go. | ||||
| * | 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 |
| | | | | | | | | (cherry picked from commit 31ef7f149e4553eb9403634c0eec6de4d0123386) | ||||
| * | 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 |
|\ \ | | | | | | | Split TLS parts from net.tcp into net.tls | ||||
| * | | 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 | ||||
| * | | 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 | ||||
| * | 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] Add settings.json to Static viewer | ||||
| * | [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 |
|\ | | | | | Replace cssutils with custom, faster, css prettifier | ||||
| * | 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 |
| | |