9065 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Thomas Kriechbaumer	552dd4701f	bump to 3.9.rc.2	2020-09-29 19:54:58 +02:00
Maximilian Hils	eb71985d26	Merge pull request #4211 from Prinzhorn/patch-2 ... Update concepts-protocols.md	2020-09-28 17:22:24 +02:00
Alexander Prinzhorn	8ebfc2cb8f	Update concepts-protocols.md ... There is support for HTTP/2 trailers since 5.2	2020-09-26 15:49:26 +02:00
Maximilian Hils	fb0f41032e	Merge pull request #4197 from mhils/docs-stuff ... Minor Docs Improvements	2020-09-08 16:18:47 +02:00
Maximilian Hils	5e4bf9ba88	[docs] minor docs improvements	2020-09-07 19:49:41 +02:00
Maximilian Hils	dbb86800e5	Merge pull request #4194 from mplattner/docs-tutorials ... Add interactive tutorials to the documentation	2020-09-07 18:30:15 +02:00
Maximilian Hils	bfa6467e4c	Merge branch 'master' into docs-tutorials	2020-09-07 18:29:38 +02:00
Maximilian Hils	e0c07d1755	Merge pull request #4184 from mirosyn/issue-4178-passphrase ... new command line argument --cert-passphrase added.	2020-09-07 18:20:38 +02:00
Martin Plattner	b34eec4f7b	fix page id and web-ui tests	2020-09-07 18:09:02 +02:00
Martin Plattner	1c087a47dd	reorder tools in docs	2020-09-07 16:36:41 +02:00
Martin Plattner	ed918cca87	fix linting error	2020-09-04 18:51:02 +02:00
Martin Plattner	bc47d69df9	add cli recordings and instructions	2020-09-04 18:47:32 +02:00
Martin Plattner	88d43b51bb	tweak cli recordings	2020-09-04 18:45:54 +02:00
Martin Plattner	34716b480d	update changelog	2020-09-04 16:57:44 +02:00
Martin Plattner	a8b2cc9df6	restructure docs	2020-09-04 16:48:53 +02:00
Martin Plattner	a465d92215	minor content improvements	2020-09-04 15:38:25 +02:00
Martin Plattner	d305c973f5	merge CliDirector and MitmCliDirector	2020-09-04 15:22:04 +02:00
Martin Plattner	129c03e51a	integrate feedback	2020-09-04 15:02:58 +02:00
Martin Plattner	2f434f91ff	add recorded casts and instructions	2020-09-03 17:56:08 +02:00
Martin Plattner	cf9b001ccb	add tutorials to docs	2020-09-03 17:47:52 +02:00
Martin Plattner	b6d52fc8ab	add cli recording scripts	2020-09-03 17:44:00 +02:00
mirosyn	99dc31a73d	Merge branch 'master' into issue-4178-passphrase	2020-08-31 09:10:38 +03:00
Miro Karvonen	abbdc31ad3	Review comment fixes, passphrase is now always required to be bytes in add_cert_file and from_store.	2020-08-31 09:01:45 +03:00
Simon Legner	0ac7833032	Update concepts-certificates.md ... Add `keytool -importcert` for Java	2020-08-29 14:52:10 +02:00
Maximilian Hils	b6e8c83a08	Merge pull request #4185 from wchasekelley/master ... Add small delay before unlinking file in external viewer fixes #4152	2020-08-29 01:40:15 +02:00
Maximilian Hils	8df5e31a19	explain why we wait before deletion in spawn_external_viewer	2020-08-29 01:31:49 +02:00
chase	b74a2f4e45	Add small delay before unlinking file in external viewer fixes #4152 ... In some cases, such as with firefox, the file is removed before the viewer is finished loading.	2020-08-28 12:10:43 -04:00
mirosyn	3ef1f966d2	Merge branch 'master' into issue-4178-passphrase	2020-08-28 17:16:12 +03:00
Miro Karvonen	770811b121	Updating the CHANGELOG, adding --cert-passphrase command line argument	2020-08-28 17:12:08 +03:00
Miro Karvonen	adc2e8d2b6	new commandline argument --cert-passphrase added. For decrypting the private key that is provided with the --certs command	2020-08-28 16:58:20 +03:00
Chase Kelley	2aacf94a63	update raw export to not remove headers (#4181)	2020-08-28 12:41:22 +02:00
Maximilian Hils	f1287012b4	Merge pull request #4183 from javabrett/options_tcp_hosts ... Replaced reference to deprecated --ignore option with --ignore-hosts.	2020-08-28 12:40:28 +02:00
Brett Randall	6b1a0986c4	Replaced reference to deprecated --ignore option with --ignore-hosts.	2020-08-28 15:10:21 +10:00
Maximilian Hils	cf0a1b0ce2	add py39 trove classifier	2020-08-27 16:49:44 +02:00
Maximilian Hils	901a8dd7d4	docs: add favicon	2020-08-27 15:18:03 +02:00
Maximilian Hils	adc4192883	Merge pull request #4180 from mhils/no-tracking ... Disable Google Analytics for docs	2020-08-27 15:14:25 +02:00
Maximilian Hils	968f9bf05f	disable google analytics for docs	2020-08-27 15:07:53 +02:00
Maximilian Hils	baf76d00f9	add Python 3.9 to CI	2020-08-27 15:04:34 +02:00
Maximilian Hils	8e5e43de24	fix #4021 (#4179)	2020-08-27 13:02:59 +00:00
Maximilian Hils	72dd567994	Merge pull request #4177 from mhils/intercept-taken ... Intercept: don't fail on requests taken by other addons	2020-08-27 12:09:50 +02:00
Maximilian Hils	327e933faf	intercept: tests++	2020-08-27 11:37:35 +02:00
Maximilian Hils	28f04c93fd	intercept: don't fail on requests taken by other addons	2020-08-27 11:24:15 +02:00
Maximilian Hils	0203202b89	Merge pull request #4176 from mhils/pyinstaller ... Update PyInstaller	2020-08-27 11:08:01 +02:00
Maximilian Hils	54276f0eea	update dependencies	2020-08-27 11:00:31 +02:00
Maximilian Hils	385cddf2b4	update pyinstaller	2020-08-27 10:50:53 +02:00
Maximilian Hils	3b7f5fca41	Merge pull request #4173 from mhils/update-dependencies ... Update Dependencies	2020-08-27 00:37:57 +02:00
Maximilian Hils	e31f69ff4a	fix windows tests failing due to tornado bug	2020-08-27 00:25:08 +02:00
Maximilian Hils	83dac0e999	make mypy happy	2020-08-27 00:25:08 +02:00
Maximilian Hils	cd44256521	update various dependencies	2020-08-27 00:25:08 +02:00
Maximilian Hils	997b496a68	update flake8 and mypy	2020-08-26 23:33:15 +02:00