122 Commits

Author	SHA1	Message	Date
Maximilian Hils	a66913d4a3	forward proxy -> upstream proxy	2014-03-14 00:02:00 +01:00
Maximilian Hils	b59013f6e3	Merge branch 'absolutely_relative_proxying'	2014-03-10 17:02:09 +01:00
Maximilian Hils	9cc10630c8	update docs, fix #215	2014-03-10 17:01:30 +01:00
Maximilian Hils	fe58c1c6eb	add advanced proxying options, add SSL-terminating capability to mitmproxy	2014-03-10 05:11:51 +01:00
Bennett Blodinger	8d57ef3c64	Update webapp.html ... Add notice about data compression proxies	2014-03-08 20:43:39 -05:00
Maximilian Hils	1e3e0dd127	merge master	2014-01-28 17:29:28 +01:00
Aldo Cortesi	e5d2829364	docs: fix spacing of page headers	2014-01-28 15:19:53 +13:00
Aldo Cortesi	f3369529ab	Adjust docs for web app certificate installation.	2014-01-28 13:24:11 +13:00
Aldo Cortesi	784f411273	Instructions for adding mitmproxy certificates to the Java trust store. ... Fixes #146	2014-01-27 14:45:20 +13:00
Aldo Cortesi	332eb67dfe	Android doc update.	2014-01-27 14:17:16 +13:00
Aldo Cortesi	f47d89ff4e	Revert "Move the doc tree out into its own repo." ... This reverts commit 8f88fcedd6.	2014-01-27 14:16:23 +13:00
Maximilian Hils	94e530ec4f	merge master	2014-01-22 16:01:31 +01:00
Aldo Cortesi	8f88fcedd6	Move the doc tree out into its own repo.	2014-01-22 13:33:02 +13:00
Aldo Cortesi	453075c77a	Doc and readme tweaks.	2014-01-19 18:08:50 +13:00
Aldo Cortesi	dc59325329	Refactor docs to define nav sidebar in only one place.	2014-01-19 17:40:26 +13:00
Aldo Cortesi	64be9b1a8a	Optionally take the mitmproxy path for doc rendering from a env variable.	2014-01-19 13:52:45 +13:00
Maximilian Hils	0b4ad05e02	merge master	2014-01-18 17:25:59 +01:00
Maximilian Hils	779e303dfe	fix syntax highlighting for countershape urls by using different quotes	2014-01-14 17:58:42 +01:00
Maximilian Hils	92966e7c48	add tutorial for transparent proxying, other minor docs improvements	2014-01-14 17:47:33 +01:00
Maximilian Hils	4637d467c0	Delete ~$$proxy-flowchart.~vsdx	2014-01-07 02:30:04 +01:00
Maximilian Hils	ea2f17680b	continue work on the proxyhandler	2014-01-07 02:29:10 +01:00
Maximilian Hils	b34ad82b52	first steps on tcp proxying	2014-01-05 01:03:55 +01:00
Maximilian Hils	e643759ef6	merge smurfix/fix2, add serverconnect hook docs, adjust tests	2013-12-16 22:10:06 +01:00
Maximilian Hils	605950bfdf	add @concurrent decorator for inline scripts, fixes #176	2013-12-15 02:43:16 +01:00
Maximilian Hils	4a32a65e0e	change certificate path for android, fix #171	2013-12-12 03:40:23 +01:00
James Billingham	3481c54d02	Added small note of file format	2013-12-11 13:11:19 +00:00
Maximilian Hils	fb985b8b87	Merge remote-tracking branch 'origin/master'	2013-12-11 14:05:18 +01:00
Maximilian Hils	e99eaa3a19	add documentation on how to use custom certificates	2013-12-11 14:04:45 +01:00
Aldo Cortesi	1bbeace350	Bump version	2013-12-10 22:23:38 +13:00
Aldo Cortesi	3a1d85ab18	Merge pull request #134 from mhils/scripts_improvements ... Support multiple scripts and script arguments. refs #76	2013-12-08 01:14:12 -08:00
Aldo Cortesi	925eaa9343	Add a note to the docs about pf redirection of traffic from the host itself.	2013-12-08 21:38:53 +13:00
joebowbeer	00a000091e	Update android.html ... Make the sdcard path in the text consistent with the screen shot (android-shellwgetmitmproxyca.png). /sdcard/Download (singular) is the correct path.	2013-10-18 22:58:06 -07:00
Aldo Cortesi	826a1fdaa2	Minor adjustment for website docs pages.	2013-06-16 16:59:28 +12:00
Aldo Cortesi	db43f1ffcc	Version bump, doc extension, URLs to github.com/mitmproxy/*	2013-06-16 13:59:01 +12:00
Aldo Cortesi	bef5662365	Merge pull request #119 from jasonanovak/ViewDocumentation ... Documentation for adding a new content viewer / View class	2013-06-15 15:53:49 -07:00
Maximilian Hils	2b4af8d475	add support for multiple scripts and script arguments. refs #76	2013-06-13 16:09:38 +02:00
Aldo Cortesi	2dfff2a75f	Styling.	2013-05-15 09:23:25 +12:00
Aldo Cortesi	36b07264f0	Mods to "How mitmproxy works"	2013-05-14 22:44:11 +12:00
Aldo Cortesi	b5cf3b4f74	README, Linux transparent mode docs, requirements additions.	2013-05-14 09:12:26 +12:00
Aldo Cortesi	98b860b0f7	Adapt docs for website embedding.	2013-04-30 09:12:06 +12:00
Jason A. Novak	bfb3828f37	Finalizing documentation	2013-04-21 14:30:30 -05:00
Jason A. Novak	208204d33a	Further cleanup of documentation	2013-04-21 14:28:00 -05:00
Jason A. Novak	d48d3d4eb3	More documentation cleanup and formatting	2013-04-21 14:20:51 -05:00
Jason A. Novak	1400880d58	More documentation	2013-04-21 13:58:08 -05:00
Jason A. Novak	e951b86c21	More documentation	2013-04-21 13:36:05 -05:00
Jason A. Novak	52a4a8bbde	Continue work on documentation of adding views	2013-04-21 12:40:35 -05:00
Jason A. Novak	0ad505ed7d	Begin work on documenting adding a new view	2013-04-21 12:40:03 -05:00
Aldo Cortesi	ca9c60d2eb	Docs.	2013-04-05 11:55:28 +13:00
Aldo Cortesi	6614498744	Update styling, GameCenter highscore tutorial.	2013-03-18 08:36:56 +13:00
Aldo Cortesi	87f76bb62b	Add filter to mitmdump examples.	2013-03-17 10:50:47 +13:00