2541 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Maximilian Hils	d67372f9d6	fix tests	2015-02-06 02:25:07 +01:00
Maximilian Hils	70607f9d95	Merge remote-tracking branch 'origin/contributing'	2015-02-06 01:52:07 +01:00
Maximilian Hils	6472942756	fix tests	2015-02-05 17:52:59 +01:00
Maximilian Hils	bed237503a	Create CONTRIBUTING.md	2015-02-05 17:52:08 +01:00
Maximilian Hils	f215c3712d	fix #459	2015-02-05 17:12:48 +01:00
Maximilian Hils	52d696df3d	fix ssl shutdown in tcp mode, refs #464	2015-02-05 16:46:55 +01:00
Marcelo Glezer	1455707eb1	Merge branch 'feature-334' of github.com:tekii/mitmproxy into feature-334	2015-02-05 11:32:01 -03:00
Marcelo Glezer	75cca63b26	added copy to clipboard support for url	2015-02-05 11:31:25 -03:00
Marcelo Glezer	ae83d39eba	added support for 'b' key in flowlist	2015-02-05 11:31:25 -03:00
Marcelo Glezer	9fc68d320c	added support for copying request (content|header) to clipboard	2015-02-05 11:31:24 -03:00
Marcelo Glezer	3bcf0cbba8	used save_body from common when b key is pressed	2015-02-05 11:31:24 -03:00
Marcelo Glezer	8f66fe1bfc	added support for saving file if content is binary. still wip	2015-02-05 11:31:24 -03:00
Marcelo Glezer	c57efffe01	extracted server_copy_response to common	2015-02-05 11:31:24 -03:00
Marcelo Glezer	f21a44dd48	removed pyperclip hard dependencies	2015-02-05 11:31:24 -03:00
Marcelo Glezer	8e1f260150	trying to fix travis take 2	2015-02-05 11:31:24 -03:00
Marcelo Glezer	470d8e925a	trying to fix travis	2015-02-05 11:31:24 -03:00
Marcelo Glezer	d9f562b5c0	used get_decoded_content and removed decode call from headers as max suggested	2015-02-05 11:31:24 -03:00
Marcelo Glezer	1a06f15ee0	added copy functionality to flowview too	2015-02-05 11:31:24 -03:00
Marcelo Glezer	fdd012bdd8	removed invalid comment and unneeded safe text	2015-02-05 11:31:24 -03:00
Marcelo Glezer	ee75a0b9cb	now content and header are working and exception for binary files are handled correctly	2015-02-05 11:31:24 -03:00
Marcelo Glezer	f89a5235d3	wip - content copy is working, header representation is not	2015-02-05 11:31:24 -03:00
Marcelo Glezer	4a481814f6	added pyperclip dependency	2015-02-05 11:31:24 -03:00
Marcelo Glezer	5cbdd21a4b	Merge remote-tracking branch 'base/master'	2015-02-05 11:29:53 -03:00
Marcelo Glezer	17ee88e07e	Merge remote-tracking branch 'base/master'	2015-02-05 11:25:22 -03:00
Maximilian Hils	310fb18aac	fix #464	2015-02-05 15:24:32 +01:00
Maximilian Hils	0ac3227b7b	clean up flow reading	2015-02-05 14:44:45 +01:00
Marcelo Glezer	a86446e204	Merge remote-tracking branch 'base/master' into feature-334	2015-02-05 10:36:30 -03:00
Marcelo Glezer	5e2f440cdd	Merge remote-tracking branch 'base/master'	2015-02-05 10:34:26 -03:00
Maximilian Hils	19555bb39a	Merge remote-tracking branch 'tekii/master'	2015-02-05 14:20:22 +01:00
Maximilian Hils	965cfffa5e	fix statusbar initialization	2015-02-05 14:15:26 +01:00
Maximilian Hils	b7ae4b0a4c	Merge pull request #447 from tekii/server-replay-missing-args ... missing parameter in start_server_playback call (again)	2015-02-05 14:11:19 +01:00
Marcelo Glezer	82d8c93261	added copy to clipboard support for url	2015-02-03 15:41:09 -03:00
Marcelo Glezer	e5922ae30a	added support for 'b' key in flowlist	2015-01-16 13:08:25 -03:00
Marcelo Glezer	d80e2e2b2b	added support for copying request (content|header) to clipboard	2015-01-16 12:13:55 -03:00
Marcelo Glezer	7ba7d64bac	used save_body from common when b key is pressed	2015-01-15 12:57:00 -03:00
Marcelo Glezer	affb57ed08	added support for saving file if content is binary. still wip	2015-01-15 12:37:26 -03:00
Marcelo Glezer	b77cd1af60	extracted server_copy_response to common	2015-01-15 09:36:59 -03:00
Marcelo Glezer	0a2d2d9390	removed pyperclip hard dependencies	2015-01-15 08:46:56 -03:00
Marcelo Glezer	c97fe68230	trying to fix travis take 2	2015-01-14 16:48:49 -03:00
Marcelo Glezer	95f0b4b506	trying to fix travis	2015-01-14 16:44:59 -03:00
Marcelo Glezer	6b8fb147d0	used get_decoded_content and removed decode call from headers as max suggested	2015-01-14 14:45:19 -03:00
Marcelo Glezer	d49eafad8b	added copy functionality to flowview too	2015-01-14 12:36:19 -03:00
Marcelo Glezer	36ec20bbb8	removed invalid comment and unneeded safe text	2015-01-14 12:09:14 -03:00
Marcelo Glezer	a4bfa677e9	now content and header are working and exception for binary files are handled correctly	2015-01-14 12:03:40 -03:00
Marcelo Glezer	34d355a62b	wip - content copy is working, header representation is not	2015-01-14 10:52:52 -03:00
Marcelo Glezer	44a5070bf5	added pyperclip dependency	2015-01-13 23:18:28 -03:00
Marcelo Glezer	8e57597d22	missing parameter in start_server_playback call	2015-01-13 08:16:00 -03:00
Marcelo Glezer	4f578866fa	open flow files using with as max suggested	2015-01-12 14:31:18 -03:00
Marcelo Glezer	c4aeca2764	Merge remote-tracking branch 'base/master'	2015-01-12 12:58:33 -03:00
Maximilian Hils	e089061996	Merge pull request #445 from tekii/hotfix-start-server-playback ... hotfix to mitmproxy missing start_server_playback() parameter added.	2015-01-12 16:55:21 +01:00