aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [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 #2602 from mhils/simplify-versionMaximilian Hils2017-10-243-56/+41
|\
| * simplify version outputMaximilian Hils2017-10-243-56/+41
* | Merge pull request #2603 from mhils/wslMaximilian Hils2017-10-243-2/+19
|\ \
| * | 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 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 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 rst0git2017-10-191-1/+1
|/ /
* | Merge pull request #2592 from rst0git/patch-1Thomas Kriechbaumer2017-10-181-1/+1
|\ \ | |/ |/|
| * 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 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 flowfilterRadoslav Gerganov2017-10-101-1/+1
|/
* Merge pull request #2573 from mhils/remove-html-outlineMaximilian Hils2017-09-154-29/+1
|\
| * 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 updaterequires.io2017-09-141-1/+1
|/
* Merge pull request #2537 from ujjwal96/content-viewMaximilian Hils2017-09-0411-34/+164
|\
| * do not fail CI for missing newlinesMaximilian Hils2017-09-041-1/+1
| * 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
| * 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
|\ \
| * | 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 docsThomas Kriechbaumer2017-09-041-82/+75
| |/
* | Merge pull request #2561 from mhils/no-tornado-warningsMaximilian Hils2017-09-041-0/+14
|\ \ | |/ |/|
| * suppress tornado logging in testsMaximilian Hils2017-09-031-0/+14
|/
* fix #2477 (#2556)Suraj Tripathi2017-09-011-1/+1
* Merge pull request #2551 from MatthewShao/static-viewerMaximilian Hils2017-08-313-0/+13
|\
| * [web] Update test for static viewer.Matthew Shao2017-08-301-0/+6
| * [web] Add settings.json to static viewer, so it can display version.Matthew Shao2017-08-302-0/+7
|/
* Merge pull request #2542 from mhils/fast-cssMaximilian Hils2017-08-2625-37/+425
|\
| * fix strutils.split_special_areasMaximilian Hils2017-08-262-2/+10
| * remove cssutils dependencyMaximilian Hils2017-08-241-1/+0
| * add new, faster css prettifier :tada:Maximilian Hils2017-08-2422-35/+309
| * add strutils.escape_special_areasMaximilian Hils2017-08-242-1/+108
|/
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-28 01:05:52 +0000