aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Add testslymanZerga112017-03-091-0/+1
* add type hintsMaximilian Hils2017-03-081-2/+2
* Update proxyauth.pylymanZerga112017-03-081-1/+1
* Update proxyauth.pylymanZerga112017-03-081-2/+3
* Merge pull request #2108 from ayamamori/patch-1Maximilian Hils2017-03-079-11/+11
|\
| * fix other occurences of options shortcutMaximilian Hils2017-03-078-10/+10
| * Update tcpproxy.rstYamamori Akihiro2017-03-071-1/+1
* | Revert "clearly indentify git-checkout as dev version"Maximilian Hils2017-03-071-1/+1
* | Merge pull request #2106 from davidpshaw/python_3_to_masterMaximilian Hils2017-03-073-4/+4
|\ \ | |/ |/|
| * Updated for python 3David Shaw2017-03-063-4/+4
* | Merge pull request #2101 from s4chin/add-websocket-filter-to-webMaximilian Hils2017-03-062-84/+111
|\ \
| * | web: Add websocket filterSachin Kelkar2017-03-062-84/+111
| |/
* | Merge pull request #2104 from lymanZerga11/patch-2Maximilian Hils2017-03-061-1/+1
|\ \
| * | Update flowlist.pylymanZerga112017-03-061-1/+1
| |/
* | Merge pull request #2105 from Kriechi/dev-versionMaximilian Hils2017-03-061-1/+1
|\ \ | |/ |/|
| * clearly indentify git-checkout as dev versionThomas Kriechbaumer2017-03-061-1/+1
* | Merge pull request #2085 from MatthewShao/devMaximilian Hils2017-03-053-2/+15
|\ \
| * | [web] Retain focus on input field after selecting. (#2085)Matthew Shao2017-03-041-0/+1
| * | [web] Simplify the code. (#2085)Matthew Shao2017-03-031-6/+2
| * | [web] Add mouse support for FilterInput popover.Matthew Shao2017-03-023-3/+19
| |/
* | Merge pull request #2095 from MatthewShao/fix-#2083Clemens Brunner2017-03-041-2/+1
|\ \
| * | [web] fix scroll bug in flow detail. (#2083)Matthew Shao2017-03-041-2/+1
* | | Merge pull request #2082 from tarnacious/masterMaximilian Hils2017-03-041-0/+2
|\ \ \ | |/ / |/| |
| * | Call error handler and mark flow on HTTPExceptiontarnacious2017-03-011-0/+2
| |/
* | update release docsMaximilian Hils2017-03-045-16718/+18855
* | Merge pull request #2081 from s4chin/add-pretty-hostMaximilian Hils2017-03-042-5/+2
|\ \
| * | web: Fix #1888Sachin Kelkar2017-03-032-5/+2
* | | Merge pull request #2053 from krsoninikhil/on-issuesMaximilian Hils2017-03-047-13/+35
|\ \ \
| * | | update docs wordingMaximilian Hils2017-03-041-2/+2
| * | | Merge branch 'master' into on-issuesNikhil Soni2017-03-0356-680/+1674
| |\ \ \ | |/ / / |/| | |
* | | | docs: fix cert install linkMaximilian Hils2017-03-021-1/+1
* | | | docs: http -> https where possibleMaximilian Hils2017-03-021-6/+6
* | | | Merge pull request #2087 from TomTasche/patch-1Maximilian Hils2017-03-021-1/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | link to stackoverflow for chrome certificate managementThomas Taschauer2017-03-021-1/+1
|/ / /
* | / http2: fix h2 header normalization test (#2080)Thomas Kriechbaumer2017-03-012-72/+0
| |/ |/|
* | added XSS scanner example (#1907)David Dworken2017-02-272-0/+775
* | Merge pull request #2072 from MatthewShao/devThomas Kriechbaumer2017-02-271-0/+1
|\ \
| * | Fix #2071, remove client_connect.mitmcert when dumping flow into json.Matthew Shao2017-02-271-0/+1
|/ /
* | Merge pull request #2069 from JordanLoehr/iss2068Maximilian Hils2017-02-271-2/+2
|\ \
| * | Added console_ prefix to options in palettepicket to resolve issue #2068Jordan Loehr2017-02-261-2/+2
* | | Merge pull request #2067 from whackashoe/fix-2065Maximilian Hils2017-02-261-1/+1
|\ \ \
| * | | fix #2065 by setting correct content encoding for brotliJett2017-02-261-1/+1
| |/ /
* | | Merge pull request #2066 from Kriechi/certs-testsThomas Kriechbaumer2017-02-264-17/+39
|\ \ \
| * | | do not return IP addresses in SSLCert.altnamesThomas Kriechbaumer2017-02-262-2/+3
| * | | certs: coverage++Thomas Kriechbaumer2017-02-264-17/+38
|/ / /
* | | connections: coverage++ (#2064)Thomas Kriechbaumer2017-02-265-41/+211
* | | Merge pull request #2063 from ujjwal96/hardump-supportMaximilian Hils2017-02-262-8/+3
|\ \ \ | |/ / |/| |
| * | Remove pytz in hardumpUjjwal Verma2017-02-252-8/+3
|/ /
* | optmanager: coverage++ (#2062)Thomas Kriechbaumer2017-02-252-9/+15
* | http: coverage++ (#2060)Thomas Kriechbaumer2017-02-242-2/+25