1054 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Aldo Cortesi	f431eb5acc	Tweak setup.py to allow installs outside source dir ... Also fix mitmdump version output	2014-01-19 16:06:03 +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
Aldo Cortesi	bd684d4540	PyInstaller bug requiring a console import in mitmdump is gone	2014-01-19 13:33:15 +13:00
Aldo Cortesi	5782f9393e	Merge branch 'master' of ssh.github.com:cortesi/mitmproxy	2014-01-19 13:28:18 +13:00
Aldo Cortesi	bf1399fa2b	Handle views that don't support search gracefully ... This includes all key/value formatted views, e.g. the image view. We need to support these ultimately, but no time before the next release.	2014-01-19 13:23:38 +13:00
Aldo Cortesi	f5f46bf080	Re-enable caching on search.	2014-01-19 12:43:58 +13:00
Maximilian Hils	5acbef236c	fix sni bug: respond with the correct certificate	2014-01-16 02:33:14 +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
Aldo Cortesi	069aca1df4	Deprecate Flow.unload_script in favor of Flow.unload_scripts ... In the presence of arguments, unloading a single script is clumsy and less useful.	2014-01-13 14:20:34 +13:00
Aldo Cortesi	4f69eef8f3	Extract command parsing and use in script grid editor	2014-01-13 14:15:17 +13:00
Aldo Cortesi	42d4a2fae9	Script refactoring: move script command parsing into script module.	2014-01-12 23:02:29 +13:00
Aldo Cortesi	e5776b8be3	Clean up and clarify script API	2014-01-12 13:59:32 +13:00
Aldo Cortesi	58e1b3a47f	Start refactoring scripts ... - Move ScriptContext into script module - Use mock module instead of hand-rolled mock objects in tests	2014-01-12 12:49:19 +13:00
Maximilian Hils	2f63da99c9	ignore console test utilities on windows	2014-01-10 01:39:16 +01:00
Maximilian Hils	3090267ca4	display build status from master branch	2014-01-09 17:38:08 +01:00
Maximilian Hils	b75cfd5bf8	Merge pull request #199 from dwilbraham/add_protobuffer_content_type ... Decode content as protobuf if the content_type is "application/x-protobuffer"	2014-01-06 04:46:59 -08:00
Dan Wilbraham	1c2e638d53	Update ViewProtobuf in contentview.py to also decode as protobuf if the content_type is "application/x-protobuffer"	2014-01-05 23:40:02 +00:00
Aldo Cortesi	e31fc8ac40	Tweaking web stub app, icons for certificates, serve PEM correctly.	2014-01-05 16:59:27 +13:00
Aldo Cortesi	a49115a227	Remove / binding alias for limit ... The search and limit functionality is too different.	2014-01-05 14:14:36 +13:00
Aldo Cortesi	d5f9b02615	Merge pull request #192 from mitmproxy/refactor_read_http_body ... move CONTINUE checks into mitmproxy	2014-01-04 14:37:47 -08:00
Aldo Cortesi	7d37e0ce10	Merge pull request #193 from droope/search-functionality ... Search functionality	2014-01-04 14:34:20 -08:00
Aldo Cortesi	8a599be060	Merge branch 'migrate_from_pil_to_pillow' of https://github.com/Kami/mitmproxy into Kami-migrate_from_pil_to_pillow ... Conflicts: requirements.txt	2014-01-05 11:15:27 +13:00
Aldo Cortesi	ac31039ad3	Merge pull request #198 from Kami/add_css_view ... Add CSS view which beautifies minified CSS files	2014-01-04 14:04:02 -08:00
Aldo Cortesi	a2261e3cf0	Introduce file descriptor decorators for Request objects ... Which lets us enable the apps again, now running from flow.py	2014-01-05 10:58:53 +13:00
Tomaz Muraus	c5f4614ba5	Fix CSS view prompt, update display mode options.	2014-01-04 17:13:46 +01:00
Tomaz Muraus	ff2d7a7501	Provide more sensible serializer options.	2014-01-04 15:50:40 +01:00
Tomaz Muraus	e9f6302ec7	Add CSS view which beautifies CSS files if cssutils library is available, ... otherwise it acts as a no-op.	2014-01-04 04:49:50 +01:00
Tomaz Muraus	1fa6bcbd5a	Update another reference to PIL.	2014-01-04 03:15:08 +01:00
Aldo Cortesi	45eab17e0c	Decouple message type from message class name.	2014-01-04 14:42:32 +13:00
Aldo Cortesi	1e07d9e6e7	Move app mechanism to flow.py ... Disable apps while message passing is improved.	2014-01-04 14:35:11 +13:00
Aldo Cortesi	f25c532960	Merge branch 'master' of ssh.github.com:cortesi/mitmproxy	2014-01-04 13:15:13 +13:00
Maximilian Hils	8472ed97ed	fix #195 ... (untested)	2014-01-03 23:35:25 +01:00
Tomaz Muraus	e9c2c0ac3a	Migrate from Pil to the latest version of Pillow.	2014-01-03 21:13:14 +01:00
Aldo Cortesi	3aa4b6603c	Fix app in mitmproxy console, update to bootstrap 3.	2014-01-03 15:29:32 +13:00
Maximilian Hils	b9d4eb103e	list mock as requirement (via @droope)	2013-12-29 10:51:47 +01:00
Pedro Worcel	799c877676	now really fix it + test	2013-12-26 22:18:34 +13:00
Pedro Worcel	a4b059c2a7	fix bug that happens after searching for a non-existant string, and ... later for an existant one.	2013-12-26 21:53:04 +13:00
Pedro Worcel	34a09780ee	add docs	2013-12-26 17:26:51 +13:00
Pedro Worcel	70f6bb301b	added 'n' functionality, tidy up & testing	2013-12-26 17:16:26 +13:00
Pedro Worcel	21efe2f2c8	add looping around	2013-12-26 17:04:18 +13:00
Pedro Worcel	9cf8a1a89d	fix failing test	2013-12-25 21:08:20 +13:00
root	bcf5620239	fix crash	2013-12-25 16:57:54 +13:00
root	95406bd119	Add focusing, and fixes non-clearance of prev searches. Add ... documentation.	2013-12-25 16:50:29 +13:00
root	932464d0a0	test passing, UI still not working	2013-12-24 14:28:20 +13:00
root	359573a764	add search with / for compatibility with what I'll do.	2013-12-23 16:41:46 +13:00
Maximilian Hils	d6aa7dc22e	ignore web gui specific paths that won't get cleaned up when changing branches	2013-12-17 21:28:21 +01:00
Maximilian Hils	e643759ef6	merge smurfix/fix2, add serverconnect hook docs, adjust tests	2013-12-16 22:10:06 +01:00
Maximilian Hils	f4b58ba495	move CONTINUE checks into mitmproxy	2013-12-15 06:33:18 +01:00
Maximilian Hils	6ec2e6f24f	fix script path error in tests	2013-12-15 02:51:35 +01:00