Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add tests | lymanZerga11 | 2017-03-09 | 1 | -0/+1 |
* | add type hints | Maximilian Hils | 2017-03-08 | 1 | -2/+2 |
* | Update proxyauth.py | lymanZerga11 | 2017-03-08 | 1 | -1/+1 |
* | Update proxyauth.py | lymanZerga11 | 2017-03-08 | 1 | -2/+3 |
* | Merge pull request #2108 from ayamamori/patch-1 | Maximilian Hils | 2017-03-07 | 9 | -11/+11 |
|\ | |||||
| * | fix other occurences of options shortcut | Maximilian Hils | 2017-03-07 | 8 | -10/+10 |
| * | Update tcpproxy.rst | Yamamori Akihiro | 2017-03-07 | 1 | -1/+1 |
* | | Revert "clearly indentify git-checkout as dev version" | Maximilian Hils | 2017-03-07 | 1 | -1/+1 |
* | | Merge pull request #2106 from davidpshaw/python_3_to_master | Maximilian Hils | 2017-03-07 | 3 | -4/+4 |
|\ \ | |/ |/| | |||||
| * | Updated for python 3 | David Shaw | 2017-03-06 | 3 | -4/+4 |
* | | Merge pull request #2101 from s4chin/add-websocket-filter-to-web | Maximilian Hils | 2017-03-06 | 2 | -84/+111 |
|\ \ | |||||
| * | | web: Add websocket filter | Sachin Kelkar | 2017-03-06 | 2 | -84/+111 |
| |/ | |||||
* | | Merge pull request #2104 from lymanZerga11/patch-2 | Maximilian Hils | 2017-03-06 | 1 | -1/+1 |
|\ \ | |||||
| * | | Update flowlist.py | lymanZerga11 | 2017-03-06 | 1 | -1/+1 |
| |/ | |||||
* | | Merge pull request #2105 from Kriechi/dev-version | Maximilian Hils | 2017-03-06 | 1 | -1/+1 |
|\ \ | |/ |/| | |||||
| * | clearly indentify git-checkout as dev version | Thomas Kriechbaumer | 2017-03-06 | 1 | -1/+1 |
* | | Merge pull request #2085 from MatthewShao/dev | Maximilian Hils | 2017-03-05 | 3 | -2/+15 |
|\ \ | |||||
| * | | [web] Retain focus on input field after selecting. (#2085) | Matthew Shao | 2017-03-04 | 1 | -0/+1 |
| * | | [web] Simplify the code. (#2085) | Matthew Shao | 2017-03-03 | 1 | -6/+2 |
| * | | [web] Add mouse support for FilterInput popover. | Matthew Shao | 2017-03-02 | 3 | -3/+19 |
| |/ | |||||
* | | Merge pull request #2095 from MatthewShao/fix-#2083 | Clemens Brunner | 2017-03-04 | 1 | -2/+1 |
|\ \ | |||||
| * | | [web] fix scroll bug in flow detail. (#2083) | Matthew Shao | 2017-03-04 | 1 | -2/+1 |
* | | | Merge pull request #2082 from tarnacious/master | Maximilian Hils | 2017-03-04 | 1 | -0/+2 |
|\ \ \ | |/ / |/| | | |||||
| * | | Call error handler and mark flow on HTTPException | tarnacious | 2017-03-01 | 1 | -0/+2 |
| |/ | |||||
* | | update release docs | Maximilian Hils | 2017-03-04 | 5 | -16718/+18855 |
* | | Merge pull request #2081 from s4chin/add-pretty-host | Maximilian Hils | 2017-03-04 | 2 | -5/+2 |
|\ \ | |||||
| * | | web: Fix #1888 | Sachin Kelkar | 2017-03-03 | 2 | -5/+2 |
* | | | Merge pull request #2053 from krsoninikhil/on-issues | Maximilian Hils | 2017-03-04 | 7 | -13/+35 |
|\ \ \ | |||||
| * | | | update docs wording | Maximilian Hils | 2017-03-04 | 1 | -2/+2 |
| * | | | Merge branch 'master' into on-issues | Nikhil Soni | 2017-03-03 | 56 | -680/+1674 |
| |\ \ \ | |/ / / |/| | | | |||||
* | | | | docs: fix cert install link | Maximilian Hils | 2017-03-02 | 1 | -1/+1 |
* | | | | docs: http -> https where possible | Maximilian Hils | 2017-03-02 | 1 | -6/+6 |
* | | | | Merge pull request #2087 from TomTasche/patch-1 | Maximilian Hils | 2017-03-02 | 1 | -1/+1 |
|\ \ \ \ | |_|_|/ |/| | | | |||||
| * | | | link to stackoverflow for chrome certificate management | Thomas Taschauer | 2017-03-02 | 1 | -1/+1 |
|/ / / | |||||
* | / | http2: fix h2 header normalization test (#2080) | Thomas Kriechbaumer | 2017-03-01 | 2 | -72/+0 |
| |/ |/| | |||||
* | | added XSS scanner example (#1907) | David Dworken | 2017-02-27 | 2 | -0/+775 |
* | | Merge pull request #2072 from MatthewShao/dev | Thomas Kriechbaumer | 2017-02-27 | 1 | -0/+1 |
|\ \ | |||||
| * | | Fix #2071, remove client_connect.mitmcert when dumping flow into json. | Matthew Shao | 2017-02-27 | 1 | -0/+1 |
|/ / | |||||
* | | Merge pull request #2069 from JordanLoehr/iss2068 | Maximilian Hils | 2017-02-27 | 1 | -2/+2 |
|\ \ | |||||
| * | | Added console_ prefix to options in palettepicket to resolve issue #2068 | Jordan Loehr | 2017-02-26 | 1 | -2/+2 |
* | | | Merge pull request #2067 from whackashoe/fix-2065 | Maximilian Hils | 2017-02-26 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | fix #2065 by setting correct content encoding for brotli | Jett | 2017-02-26 | 1 | -1/+1 |
| |/ / | |||||
* | | | Merge pull request #2066 from Kriechi/certs-tests | Thomas Kriechbaumer | 2017-02-26 | 4 | -17/+39 |
|\ \ \ | |||||
| * | | | do not return IP addresses in SSLCert.altnames | Thomas Kriechbaumer | 2017-02-26 | 2 | -2/+3 |
| * | | | certs: coverage++ | Thomas Kriechbaumer | 2017-02-26 | 4 | -17/+38 |
|/ / / | |||||
* | | | connections: coverage++ (#2064) | Thomas Kriechbaumer | 2017-02-26 | 5 | -41/+211 |
* | | | Merge pull request #2063 from ujjwal96/hardump-support | Maximilian Hils | 2017-02-26 | 2 | -8/+3 |
|\ \ \ | |/ / |/| | | |||||
| * | | Remove pytz in hardump | Ujjwal Verma | 2017-02-25 | 2 | -8/+3 |
|/ / | |||||
* | | optmanager: coverage++ (#2062) | Thomas Kriechbaumer | 2017-02-25 | 2 | -9/+15 |
* | | http: coverage++ (#2060) | Thomas Kriechbaumer | 2017-02-24 | 2 | -2/+25 |