aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* bump flake8Thomas Kriechbaumer2017-10-312-2/+2
| | | | closes #2601
* Merge pull request #2608 from mhils/webMaximilian Hils2017-10-2923-1075/+1371
|\ | | | | [web] minor improvements, move options editor
| * [web] adjust testsMaximilian Hils2017-10-2610-180/+80
| |
| * [web] move options editor from file menu to options menuMaximilian Hils2017-10-252-59/+34
| | | | | | | | | | | | | | | | | | | | | | | | ultimately we probably want to open the options editor immediately if someone presses "Options". This still requires us to 1. have a nicer editors for common settings. 2. Add a "view event log" button somewhere else, for example in the footer. For now, the options editor is marked as beta, as there are some options you clearly do not want to edit (e.g. wfile).
| * [web] minor fixes and cleanupMaximilian Hils2017-10-256-170/+60
| |
| * [web] remove promptMaximilian Hils2017-10-255-100/+4
| |
| * [web] minor fixesMaximilian Hils2017-10-252-2/+2
| |
| * [web] update to react 16.0Maximilian Hils2017-10-252-586/+1213
| |
* | Merge pull request #2610 from mhils/log-threadsafeMaximilian Hils2017-10-262-3/+11
|\ \ | | | | | | Make master.add_log threadsafe
| * | make safecall threadsafe.Maximilian Hils2017-10-262-3/+11
|/ /
* | re-add discourse link in issue templateMaximilian Hils2017-10-251-0/+3
| |
* | Merge pull request #2606 from mhils/issue-2563Maximilian Hils2017-10-254-63/+29
|\ \ | |/ |/| Fix #2563
| * fix #2563Maximilian Hils2017-10-244-23/+29
| |
| * remove old dntree implementationMaximilian Hils2017-10-241-40/+0
|/
* Merge pull request #2602 from mhils/simplify-versionMaximilian Hils2017-10-243-56/+41
|\ | | | | Simplify version output
| * simplify version outputMaximilian Hils2017-10-243-56/+41
| |
* | Merge pull request #2603 from mhils/wslMaximilian Hils2017-10-243-2/+19
|\ \ | | | | | | Fix urwid display on WSL
| * | fix urwid display on WSLMaximilian Hils2017-10-233-2/+19
| |/
* / Fix AppVeyor builds (#2604)Maximilian Hils2017-10-241-3/+7
|/
* [requires.io] dependency update on master branch (#2586)Thomas Kriechbaumer2017-10-221-3/+3
|
* Merge pull request #2591 from ddworken/masterMaximilian Hils2017-10-222-6/+17
|\ | | | | Added scanning for CSS injection and iframe injection to XSS scanner
| * Added scanning for CSS injection and iframe injectionDavid Dworken2017-10-172-6/+17
| |
* | Merge pull request #2596 from mhils/fix-travisMaximilian Hils2017-10-202-0/+18
|\ \ | | | | | | Skip ipv6 tests on sudo-enabled travis builds
| * | skip ipv6 tests on sudo-enabled travis buildsMaximilian Hils2017-10-202-0/+18
|/ /
* | Merge pull request #2593 from rst0git/patch-1Maximilian Hils2017-10-191-1/+1
|\ \ | | | | | | docs-certinstall: Certificate pinning update link
| * | docs-certinstall: Certificate pinning update link rst0git2017-10-191-1/+1
|/ / | | | | Certificate pinning (HTTP Public Key Pinning) is better described on Wikipedia
* | Merge pull request #2592 from rst0git/patch-1Thomas Kriechbaumer2017-10-181-1/+1
|\ \ | |/ |/| docs-install: Fix typo
| * docs-install: Fix typorst0git2017-10-181-1/+1
|/
* allow pyOpenSSL 17.2Maximilian Hils2017-10-171-1/+1
|
* Merge pull request #2581 from mitmproxy/requires-io-masterMaximilian Hils2017-10-101-2/+2
|\ | | | | [requires.io] dependency update on master branch
| * [requires.io] dependency updaterequires.io2017-10-061-1/+1
| |
| * [requires.io] dependency updaterequires.io2017-10-021-1/+1
| |
* | Merge pull request #2583 from rgerganov/fix-typoMaximilian Hils2017-10-101-1/+1
|\ \ | |/ |/| Fix typo in the docstring of flowfilter
| * Fix typo in the docstring of flowfilterRadoslav Gerganov2017-10-101-1/+1
|/ | | | The expression for body of response is "bs", not "bq".
* Merge pull request #2573 from mhils/remove-html-outlineMaximilian Hils2017-09-154-29/+1
|\ | | | | Remove HTML Outline Contentview, fix #2572
| * remove html outline contentview, fix #2572Maximilian Hils2017-09-144-29/+1
|/
* Merge pull request #2571 from mitmproxy/requires-io-masterMaximilian Hils2017-09-131-1/+1
|\ | | | | [requires.io] dependency update on master branch
| * [requires.io] dependency updaterequires.io2017-09-141-1/+1
|/
* Merge pull request #2537 from ujjwal96/content-viewMaximilian Hils2017-09-0411-34/+164
|\ | | | | JS beautifier
| * do not fail CI for missing newlinesMaximilian Hils2017-09-041-1/+1
| | | | | | | | | | this regularly stalls pull requests and serves no further purpose, so it needs to go.
| * pyinstaller: add passlib hookMaximilian Hils2017-09-041-0/+1
| |
| * remove jsbeautifier dependencyMaximilian Hils2017-09-032-7/+1
| |
| * make split_special_areas more flexible, refs #2537Maximilian Hils2017-09-033-20/+18
| | | | | | | | (cherry picked from commit 31ef7f149e4553eb9403634c0eec6de4d0123386)
| * Added testUjjwal Verma2017-09-033-70/+92
| |
| * JS beautifierUjjwal Verma2017-09-033-5/+120
| |
* | Merge pull request #2560 from mhils/mitmproxy-net-tlsMaximilian Hils2017-09-0413-396/+447
|\ \ | | | | | | Split TLS parts from net.tcp into net.tls
| * | move hostname validation into mitmproxy.net.tlsMaximilian Hils2017-09-047-136/+145
| | |
| * | split TLS parts from net.tcp into net.tlsMaximilian Hils2017-09-0310-313/+355
| |/
* | Merge pull request #2558 from Kriechi/linux-docsThomas Kriechbaumer2017-09-041-82/+75
|\ \ | | | | | | update installation docs
| * | update installation docsThomas Kriechbaumer2017-09-041-82/+75
| |/
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-11 19:01:00 +0000