Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | bump flake8 | Thomas Kriechbaumer | 2017-10-31 | 2 | -2/+2 |
* | Merge pull request #2608 from mhils/web | Maximilian Hils | 2017-10-29 | 23 | -1075/+1371 |
|\ | |||||
| * | [web] adjust tests | Maximilian Hils | 2017-10-26 | 10 | -180/+80 |
| * | [web] move options editor from file menu to options menu | Maximilian Hils | 2017-10-25 | 2 | -59/+34 |
| * | [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 #2610 from mhils/log-threadsafe | Maximilian Hils | 2017-10-26 | 2 | -3/+11 |
|\ \ | |||||
| * | | make safecall threadsafe. | Maximilian Hils | 2017-10-26 | 2 | -3/+11 |
|/ / | |||||
* | | re-add discourse link in issue template | Maximilian Hils | 2017-10-25 | 1 | -0/+3 |
* | | Merge pull request #2606 from mhils/issue-2563 | Maximilian Hils | 2017-10-25 | 4 | -63/+29 |
|\ \ | |/ |/| | |||||
| * | fix #2563 | Maximilian Hils | 2017-10-24 | 4 | -23/+29 |
| * | remove old dntree implementation | Maximilian Hils | 2017-10-24 | 1 | -40/+0 |
|/ | |||||
* | Merge pull request #2602 from mhils/simplify-version | Maximilian Hils | 2017-10-24 | 3 | -56/+41 |
|\ | |||||
| * | 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 | 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 | 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 |
| |/ |