8247 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Thomas Kriechbaumer	33a2415f6c	Merge pull request #3653 from Kriechi/bump-yaml ... bump deps	2019-09-28 18:49:56 +02:00
Thomas Kriechbaumer	53cb5bf40f	bump deps	2019-09-28 17:37:43 +02:00
Thomas Kriechbaumer	f6405abda2	Merge pull request #3329 from Kriechi/readme-slogan ... update readme slogan	2019-09-28 16:45:00 +02:00
Thomas Kriechbaumer	24dd346909	Merge pull request #3651 from Kriechi/bump-deps ... bump dependencies	2019-09-28 15:24:01 +02:00
Thomas Kriechbaumer	b4ffc929a2	bump dependencies	2019-09-28 14:49:14 +02:00
Thomas Kriechbaumer	42d5da0123	Merge pull request #3560 from travelperk/add-refresh-option ... Add refresh option to disable cookies	2019-09-28 13:34:00 +02:00
Thomas Kriechbaumer	bb356d89e0	Merge pull request #3594 from Jessonsotoventura/open_editor ... Edit URLs in external editor	2019-09-28 13:31:29 +02:00
Thomas Kriechbaumer	773da8e39d	Merge pull request #3650 from Kriechi/fix-linting ... fix linting	2019-09-28 13:06:07 +02:00
Thomas Kriechbaumer	a54954ee1e	fix linting	2019-09-28 12:29:16 +02:00
Thomas Kriechbaumer	7d60dde76c	Merge pull request #3464 from rjt-gupta/url-fix ... Non ascii characters in url	2019-09-28 11:46:58 +02:00
Thomas Kriechbaumer	76bd3ef82d	Merge pull request #3486 from rjt-gupta/unicode-filter ... filter unicode fix	2019-09-28 11:44:15 +02:00
Thomas Kriechbaumer	26e55b0a7f	Merge pull request #3526 from pierlon/feature/allow-hosts ... Add --allow_hosts option	2019-09-28 11:40:18 +02:00
Thomas Kriechbaumer	16bc62bd77	Merge pull request #3603 from tomsaleeba/patch-1 ... Transparent proxy on Linux for local originating traffic	2019-09-28 11:38:30 +02:00
Thomas Kriechbaumer	079374dec8	Merge pull request #3600 from king6cong/master ... fix pf.conf on macOS	2019-09-28 11:33:32 +02:00
Thomas Kriechbaumer	56b993ea26	Merge pull request #3646 from ahopkins/patch-1 ... Update concepts-certificates.md	2019-09-28 11:30:44 +02:00
Thomas Kriechbaumer	e791720920	Merge pull request #3648 from Eluch/master ... ssl_insecure added to option_whitelist because it was missing	2019-09-28 11:29:54 +02:00
Ferenc soós	86aacf4d5b	ssl_insecure added to option_whitelist because it was missing	2019-09-27 10:00:50 +02:00
Maximilian Hils	1021f3cae6	Merge pull request #3593 from Jessonsotoventura/tabular ... [RFC] Tabular flow list [Updated]	2019-09-26 17:41:45 +10:00
Jesson Soto Ventura	55719a6942	Updated Setup.py ... A comma broke the build	2019-09-24 23:47:14 -04:00
Jesson Soto Ventura	b7e2590294	Merge branch 'master' into tabular	2019-09-24 23:40:28 -04:00
Jesson Soto Ventura	c02d515b2a	Fixed Duration on list view ... - Set min size to 100 for table view	2019-09-24 23:36:39 -04:00
Jesson Soto Ventura	94ca23b782	TLD and SLD are now highlighted using publicsuffix ... - Added time.time() as the default for the start time on fake requests	2019-09-24 23:12:25 -04:00
Adam Hopkins	6ba39ede08	Update concepts-certificates.md ... Update to direct people to using Safari instead of another browser on iOS.	2019-09-24 14:59:26 +03:00
Maximilian Hils	a08c22dcdd	Merge pull request #3631 from mhils/lint ... Fix CI	2019-09-05 23:20:54 +02:00
Maximilian Hils	ddaf5a1f1b	Merge pull request #3627 from RamiBerm/patch-1 ... Updated har_dump,py timings dictionary function	2019-09-05 22:14:04 +02:00
Maximilian Hils	e97a804e89	make dict comprehension more readable	2019-09-05 22:13:49 +02:00
Maximilian Hils	ede2d1b243	Merge pull request #3630 from tsaaristo/encode-zstandard ... Add support for zstd Content-Encoding	2019-09-05 22:09:51 +02:00
Maximilian Hils	e77f375186	lint	2019-09-05 22:08:21 +02:00
Maximilian Hils	ebfff8db76	lint	2019-09-05 21:36:44 +02:00
Tero Saaristo	dd3589ce34	encoding: add support for zstd (zstandard) ... Handles zstandard-compressed bodies labeled as zstd.	2019-09-05 17:52:04 +03:00
RamiBerm	4ce5e1386c	Updated har_dump,py timings dictionary function ... the HAR file spec (http://www.softwareishard.com/blog/har-12-spec/#timings) states that timings that do not apply for a certain requests should be set to -1, this example may set -1000 as a timings value for certain requests. This ends up producing invalid HAR files in many cases. My proposed fix is to assign -1 into the dic and only multiply by 1000 for other values	2019-09-03 17:19:50 +03:00
cs	0d042c6d8e	fix duplicate error response	2019-08-09 14:19:10 +08:00
Tom Saleeba	f47608c85e	docs: correct command to install mitmproxy	2019-08-01 22:04:58 +09:30
Tom Saleeba	ba848e2040	docs: add instructions for transparent proxy on Linux for traffic originating from the mitmproxy host itself	2019-08-01 15:37:25 +09:30
king6cong	586f8d2044	fix pf.conf on macOS	2019-07-30 20:26:51 +08:00
Jesson Soto Ventura	8a2a7652e4	Edit URL now opens the external editor	2019-07-22 23:14:56 -04:00
Jesson Soto Ventura	df06c4da3b	Fixed linting issues	2019-07-21 14:11:37 -04:00
Jesson Soto Ventura	2cc2fafd2e	Added console_flowlist_layout option ... - default - list - table	2019-07-21 12:59:23 -04:00
Jesson Soto Ventura	99dc1cc2f2	Merge branch 'tabular' of github.com:Jessonsotoventura/mitmproxy into tabular	2019-07-21 10:51:22 -04:00
Jesson Soto Ventura	ed05c4debf	Merge branch 'tabular' of https://github.com/BkPHcgQL3V/mitmproxy into tabular	2019-07-21 10:49:27 -04:00
Jesson Soto Ventura	826e42f793	Added Color palettes for lowlight, lowdark, solarized light, and solarized dark	2019-07-21 10:47:08 -04:00
BkPHcgQL3V	998d150c1e	Tabular list flow	2019-07-21 10:47:08 -04:00
Jesson Soto Ventura	9a159b439c	Added Color palettes for lowlight, lowdark, solarized light, and solarized dark	2019-07-21 10:33:59 -04:00
Maximilian Hils	0b0b4ccba6	Merge pull request #3591 from mhils/misc ... fix addon deconstruction	2019-07-19 00:40:15 +02:00
Maximilian Hils	9f69540d57	fix addon deconstruction	2019-07-18 17:54:33 +02:00
Maximilian Hils	4bebd3a1bc	Merge pull request #3587 from mhils/yaml-list ... fix sequence option declaration in yaml files	2019-07-18 03:15:08 +02:00
Maximilian Hils	a0e19336a2	remove unused dependency	2019-07-18 03:14:46 +02:00
Maximilian Hils	256c0c94fb	Merge pull request #3586 from mhils/issue-py38compat ... fix py38 compat	2019-07-18 03:13:50 +02:00
Maximilian Hils	2236b52816	fix sequence option declaration in yaml files	2019-07-18 02:54:43 +02:00
Maximilian Hils	b86cf6dea9	fix py38 compat	2019-07-18 02:52:24 +02:00