1563 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Marcelo Glezer	14a3e0073f	append file mode for saving flows merged to master	2014-12-11 15:21:33 -03:00
Marcelo Glezer	4952643a0d	Merge remote-tracking branch 'base/master'	2014-12-11 14:54:14 -03:00
Maximilian Hils	dbb51640d9	web: add filter grammar	2014-12-11 16:35:50 +01:00
Maximilian Hils	93e928dec4	web: add file menu stub	2014-12-10 17:44:45 +01:00
Maximilian Hils	7e40b8ab09	web: implement settings store, modularize store	2014-12-10 15:25:40 +01:00
Maximilian Hils	d2feaf5d84	web: take viewport resize into account	2014-12-10 02:48:04 +01:00
Maximilian Hils	e12bf19e35	web: add event store, fix all those bugs	2014-12-10 00:47:05 +01:00
Maximilian Hils	05bc7e8cd8	generalize store	2014-12-09 18:55:16 +01:00
Maximilian Hils	14a8d2f5b8	always use the app dispatcher	2014-12-09 18:18:14 +01:00
Maximilian Hils	ffb95a1db7	fix #304	2014-12-09 00:01:01 +01:00
Maximilian Hils	b95f0c9971	fix #411	2014-12-08 17:17:37 +01:00
Maximilian Hils	31925dc9be	fix #419	2014-12-08 17:01:47 +01:00
Maximilian Hils	591ed0b41f	fix HTTPResponse creation	2014-12-04 00:29:15 +01:00
Maximilian Hils	a7a9ef826c	fix tests	2014-12-01 03:36:04 +01:00
Maximilian Hils	40fbb95701	Merge branch 'master' of github.com:mitmproxy/mitmproxy	2014-12-01 03:05:11 +01:00
Maximilian Hils	5b1fefee9b	add inline script example for websocket passthrough, fix #340	2014-12-01 03:04:48 +01:00
Maximilian Hils	992536c2bc	make header processing configurable by inline scripts, refs #340	2014-12-01 02:28:03 +01:00
Maximilian Hils	807d0b9a5d	Merge pull request #416 from elimisteve/patch-1 ... README: Fixed double-quote and whitespace issues	2014-11-29 15:33:14 +01:00
Steve Phillips	3b03758ef8	README: Fixed double-quote and whitespace issues	2014-11-29 04:13:29 -08:00
Maximilian Hils	096a3af273	web: various improvements	2014-11-29 03:25:07 +01:00
Maximilian Hils	f6c0e000da	event log: virtual scrolling	2014-11-28 20:54:52 +01:00
Maximilian Hils	dd1a45140c	web: add virtualscroll mixin	2014-11-28 20:03:04 +01:00
Maximilian Hils	38621f2d49	Merge pull request #415 from gabe-k/flowbasic-fix ... Changed argument name from confdir to cadir in flowbasic example	2014-11-28 19:48:26 +01:00
Maximilian Hils	c39b6e4277	web: various fixes, add clear button	2014-11-28 19:16:47 +01:00
Gabriel Kirkpatrick	cf7404cfe0	Changed argument name from confdir to cadir in flowbasic example	2014-11-28 12:36:31 -05:00
Maximilian Hils	56f1278d1a	fix #413	2014-11-28 17:52:54 +01:00
Maximilian Hils	7ca1ac0f3b	web: virtual scrolling	2014-11-28 16:03:56 +01:00
Maximilian Hils	9eecc8d6e2	web: fixes	2014-11-27 02:34:03 +01:00
Maximilian Hils	e41c0be293	format code	2014-11-27 01:40:26 +01:00
Maximilian Hils	38bf34ebd9	web++	2014-11-27 01:38:30 +01:00
Maximilian Hils	021e209ce0	web: update dependencies	2014-11-27 01:37:36 +01:00
Maximilian Hils	3887e7ed29	fix error html	2014-11-26 04:56:17 +01:00
Maximilian Hils	ed8249023f	introduce revised views, port over changes from multiple_views branch	2014-11-26 04:18:21 +01:00
Maximilian Hils	47a78e3c72	fix limit_txt, fix #412	2014-11-23 15:46:17 +01:00
Maximilian Hils	f7c5385679	retain raw filter str on filt objects	2014-11-22 15:27:43 +01:00
Maximilian Hils	ec23594191	add sni support to LiveConnection.change_server	2014-11-19 01:27:20 +01:00
Maximilian Hils	667fe0c20b	fix tests	2014-11-15 23:10:25 +01:00
Maximilian Hils	a699bdc286	Merge pull request #410 from JustusW/master ... Added HAR generation as inline script	2014-11-15 22:45:28 +01:00
Justus Wingert	ddce662fe6	Added try/except block for import errors with harparser and pytz.	2014-11-15 22:39:15 +01:00
Justus Wingert	c84ad384f6	Updated setup.py and moved requirements to examples section. Included examples section in requirements.txt. Updated har_extractor to use command line arguments.	2014-11-15 22:37:32 +01:00
Justus Wingert	a7ab06d80e	Switched to pytz. Added comment for clarification on behaviour of HAREncodable. Added missing parameter in reset(). Fixed accessing headers.	2014-11-15 22:04:52 +01:00
Justus Wingert	4227feef37	It seems get_decoded_content can actually be shorter than content due to encoding issues. Since I'm not crazy after all it seems safe to push.	2014-11-15 21:14:50 +01:00
Justus Wingert	4342d79dc0	Removed the globals and replaced them with internal attributes of _HARLog. Minor bugfixes to make ssl timings work.	2014-11-15 20:11:25 +01:00
Justus Wingert	31249b9e24	Hopefully fixed dependency fuckup.	2014-11-15 19:28:10 +01:00
Justus Wingert	57d9807122	Added script dependencie to harparser.	2014-11-15 19:05:36 +01:00
Justus Wingert	18b803d03a	Typo...	2014-11-15 18:45:28 +01:00
Justus Wingert	f3a78d4795	Improved helper method, marginally.	2014-11-15 18:41:51 +01:00
Justus Wingert	fd48a70128	Updated documentation and cleaned up the code.	2014-11-15 18:38:59 +01:00
Aldo Cortesi	aa77a52a06	One common --version flag	2014-11-15 17:58:38 +13:00
Aldo Cortesi	23a4f159fd	Remove last vestiges of argparse	2014-11-15 17:51:21 +13:00