7777 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Maximilian Hils	a5d74356dd	simplify version output	2017-10-24 14:33:56 +02:00
Maximilian Hils	c7d14ef4e5	Fix AppVeyor builds (#2604)	2017-10-24 00:20:05 +02:00
Maximilian Hils	3d66ebd526	fix urwid display on WSL	2017-10-23 22:49:50 +02:00
Thomas Kriechbaumer	569d275d76	[requires.io] dependency update on master branch (#2586)	2017-10-22 18:06:44 +02:00
Maximilian Hils	f31d5dc3eb	Merge pull request #2591 from ddworken/master ... Added scanning for CSS injection and iframe injection to XSS scanner	2017-10-22 18:02:28 +02:00
Maximilian Hils	58ecef258b	Merge pull request #2596 from mhils/fix-travis ... Skip ipv6 tests on sudo-enabled travis builds	2017-10-20 22:25:17 +02:00
Maximilian Hils	4522f15c89	skip ipv6 tests on sudo-enabled travis builds	2017-10-20 16:00:25 +02:00
Maximilian Hils	bf67c734ea	Merge pull request #2593 from rst0git/patch-1 ... docs-certinstall: Certificate pinning update link	2017-10-19 22:35:46 -07:00
rst0git	6853f72b38	docs-certinstall: Certificate pinning update link ... Certificate pinning (HTTP Public Key Pinning) is better described on Wikipedia	2017-10-19 17:10:41 +01:00
Thomas Kriechbaumer	4fa8e3475f	Merge pull request #2592 from rst0git/patch-1 ... docs-install: Fix typo	2017-10-18 21:42:08 +02:00
rst0git	e689291377	docs-install: Fix typo	2017-10-18 20:39:12 +01:00
David Dworken	04a06eb6b5	Added scanning for CSS injection and iframe injection	2017-10-17 23:39:33 -04:00
Maximilian Hils	d5173f3905	allow pyOpenSSL 17.2	2017-10-17 11:41:09 +02:00
Maximilian Hils	dd9f1b2fad	Merge pull request #2581 from mitmproxy/requires-io-master ... [requires.io] dependency update on master branch	2017-10-10 03:54:55 -07:00
Maximilian Hils	8d88511f40	Merge pull request #2583 from rgerganov/fix-typo ... Fix typo in the docstring of flowfilter	2017-10-10 03:52:58 -07:00
Radoslav Gerganov	da6b3839d6	Fix typo in the docstring of flowfilter ... The expression for body of response is "bs", not "bq".	2017-10-10 12:23:33 +03:00
requires.io	f62e9882cd	[requires.io] dependency update	2017-10-06 19:48:36 +03:00
requires.io	579b0863b7	[requires.io] dependency update	2017-10-02 17:48:05 +02:00
Maximilian Hils	3c934b1a58	Merge pull request #2573 from mhils/remove-html-outline ... Remove HTML Outline Contentview, fix #2572	2017-09-15 00:25:45 -07:00
Maximilian Hils	289ddfe988	remove html outline contentview, fix #2572	2017-09-14 15:11:24 -07:00
Maximilian Hils	9716b3dab5	Merge pull request #2571 from mitmproxy/requires-io-master ... [requires.io] dependency update on master branch	2017-09-13 22:51:52 -07:00
requires.io	be1bfbcba4	[requires.io] dependency update	2017-09-14 05:10:47 +02:00
Maximilian Hils	930d78b554	Merge pull request #2537 from ujjwal96/content-view ... JS beautifier	2017-09-04 19:49:42 +02:00
Maximilian Hils	ca91780ff4	do not fail CI for missing newlines ... this regularly stalls pull requests and serves no further purpose, so it needs to go.	2017-09-04 18:08:00 +02:00
Maximilian Hils	f6f9944160	pyinstaller: add passlib hook	2017-09-04 18:07:27 +02:00
Maximilian Hils	68fab8bd92	Merge pull request #2560 from mhils/mitmproxy-net-tls ... Split TLS parts from net.tcp into net.tls	2017-09-04 17:32:49 +02:00
Maximilian Hils	de006ea8ad	move hostname validation into mitmproxy.net.tls	2017-09-04 14:02:43 +02:00
Thomas Kriechbaumer	96854cff52	Merge pull request #2558 from Kriechi/linux-docs ... update installation docs	2017-09-04 09:51:44 +02:00
Thomas Kriechbaumer	f9d4d5f19c	update installation docs	2017-09-04 09:51:14 +02:00
Maximilian Hils	1b05e7c953	Merge pull request #2561 from mhils/no-tornado-warnings ... Suppress tornado logging in tests	2017-09-04 01:57:35 +02:00
Maximilian Hils	0b79304e98	suppress tornado logging in tests	2017-09-03 21:22:21 +02:00
Maximilian Hils	f46e5e667f	remove jsbeautifier dependency	2017-09-03 21:02:29 +02:00
Maximilian Hils	e1877577bc	make split_special_areas more flexible, refs #2537 ... (cherry picked from commit 31ef7f149e4553eb9403634c0eec6de4d0123386)	2017-09-03 21:02:29 +02:00
Ujjwal Verma	8030f5003d	Added test	2017-09-03 21:02:29 +02:00
Ujjwal Verma	b05bf588e6	JS beautifier	2017-09-03 21:02:29 +02:00
Maximilian Hils	2b4f58eb44	split TLS parts from net.tcp into net.tls	2017-09-03 03:06:15 +02:00
Suraj Tripathi	781369a326	fix #2477 (#2556)	2017-09-01 23:08:34 +02:00
Maximilian Hils	7bd930693e	Merge pull request #2551 from MatthewShao/static-viewer ... [web] Add settings.json to Static viewer	2017-08-31 15:22:07 +02:00
Matthew Shao	a98dd1642c	[web] Update test for static viewer.	2017-08-30 21:15:04 +08:00
Matthew Shao	0647d622a4	[web] Add settings.json to static viewer, so it can display version.	2017-08-30 21:13:51 +08:00
Maximilian Hils	9942f78217	Merge pull request #2542 from mhils/fast-css ... Replace cssutils with custom, faster, css prettifier	2017-08-26 18:18:58 +02:00
Maximilian Hils	e1af76e71f	fix strutils.split_special_areas	2017-08-26 17:04:56 +02:00
Maximilian Hils	1000efb671	remove cssutils dependency	2017-08-24 20:39:38 +02:00
Maximilian Hils	8eb6558570	add new, faster css prettifier 🎉	2017-08-24 20:39:21 +02:00
Maximilian Hils	72ac89f666	add strutils.escape_special_areas	2017-08-24 18:57:32 +02:00
Maximilian Hils	6350d5a19e	update mitmweb assets (gulp prod)	2017-08-22 01:06:46 +02:00
Maximilian Hils	58642d57f6	[web] make it possible to run static viewer in subdirectories	2017-08-22 01:05:29 +02:00
Maximilian Hils	721f7cc92e	Merge pull request #2540 from mhils/relatively-static ... Make it possible to run static viewer in subdirectories	2017-08-22 00:59:51 +02:00
Maximilian Hils	7e154171bf	Merge pull request #2539 from mhils/fix-mitmweb-shutdown ... Fix mitmweb master shutdown, tests++	2017-08-22 00:31:00 +02:00
Maximilian Hils	bf243244ce	[web] make it possible to run static viewer in subdirectories	2017-08-21 23:46:48 +02:00