cloud-email/mitmproxy - clone of mitm proxy

	Commit message (Collapse)	Author	Age	Files	Lines
...
* \| \| \| \|	Merge pull request #2946 from fenilgandhi/master	Maximilian Hils	2018-03-04	1	-1/+3
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Fix for wrapping up extra-long urls in flowdetailview
\| * \| \| \| \|	Fix for wrapping up extra-long urls in flowdetailview	Fenil Gandhi	2018-03-03	1	-1/+3
\| \| \|_\|/ / \| \|/\| \| \|
* \| \| \| \|	Merge pull request #2948 from Kriechi/docs-sidebar-height	Maximilian Hils	2018-03-04	1	-1/+0
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	render sidebar without height limit
\| * \| \| \| \|	render sidebar without height limit	Thomas Kriechbaumer	2018-03-03	1	-1/+0
\| \|/ / / /
* \| \| \| \|	Merge pull request #2947 from Kriechi/docs-sidebar-color	Maximilian Hils	2018-03-04	1	-0/+4
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	make sidebar visually distinct
\| * \| \| \| \|	make sidebar visually distinct	Thomas Kriechbaumer	2018-03-03	1	-0/+4
\| \|/ / / /
* \| \| \| \|	Merge pull request #2950 from mitmproxy/certstore-path	Maximilian Hils	2018-03-04	1	-1/+1
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|	Fix display inconsistency for certstore path
\| * \| \| \|	fix display inconsistency for certstore path	Maximilian Hils	2018-03-03	1	-1/+1
\|/ / / /
* \| \| \|	Merge pull request #2944 from Kriechi/docs++	Aldo Cortesi	2018-03-03	1	-0/+28
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	readd Wireshark SSL master secrets docs
\| * \| \| \|	readd Wireshark SSL master secrets docs	Thomas Kriechbaumer	2018-03-02	1	-0/+28
\|/ / / /
* \| \| \|	Merge pull request #2943 from mitmproxy/requires-io-master	Aldo Cortesi	2018-03-03	1	-1/+1
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \|	[requires.io] dependency update on master branch
\| * \| \|	[requires.io] dependency update	requires.io	2018-03-02	1	-1/+1
\|/ / /
* \| \|	Merge pull request #2934 from mhils/cleanup-proxyconfig	Maximilian Hils	2018-02-27	7	-56/+40
\|\ \ \ \| \|_\|/ \|/\| \|	Cleanup ProxyConfig
\| * \|	clean up ProxyConfig	Maximilian Hils	2018-02-27	6	-56/+39
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	some of these options weren't even used anymore, others only in one place where it makes sense to use options directly.
\| * \|	add missing client_certs directory expansion	Maximilian Hils	2018-02-27	1	-0/+1
\|/ /
* \|	Merge pull request #2931 from cortesi/scriptpath	Aldo Cortesi	2018-02-27	1	-1/+2
\|\ \ \| \| \| \| \| \|	script.run takes a path argument
\| * \|	script.run takes a path argument	Aldo Cortesi	2018-02-27	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \|	This must have slipped through in the first conversion.
* \| \|	Merge pull request #2875 from fenilgandhi/issue-2872	Aldo Cortesi	2018-02-27	1	-1/+1
\|\ \ \ \| \|/ / \|/\| \|	Fixed a bug with bytes encoding error
\| * \|	Merge branch 'master' into issue-2872	ColdFire	2018-02-23	4	-4/+40
\| \|\ \
\| * \ \	Merge branch 'master' into issue-2872	ColdFire	2018-02-23	213	-4075/+13031
\| \|\ \ \
\| * \| \| \|	Fixed a bug with bytes encoding error	Fenil Gandhi	2018-02-19	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Merge pull request #2926 from cortesi/coreopts	Aldo Cortesi	2018-02-27	17	-195/+124
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Start consolidating core options
\| * \| \| \| \|	Start consolidating core options	Aldo Cortesi	2018-02-26	17	-195/+124
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is a preparatory patch that paves the way to consolidating our core options in the core addon. It amalgamates the core_option_validation and core addons, prepares the test suite for a world where options live in core, and moves over two trivial options as a trial balloon. From here, things will get harder, but at the end of the process we'll have a core that's responsive to options.
* \| \| \| \| \|	Merge pull request #2925 from mhils/clientcert-from-sni	Aldo Cortesi	2018-02-26	1	-1/+2
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use sni to select clientcerts
\| * \| \| \| \| \|	use sni to select clientcerts	Maximilian Hils	2018-02-25	1	-1/+2
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #2924 from cortesi/dumperfilt	Aldo Cortesi	2018-02-26	5	-20/+18
\|\ \ \ \ \ \ \ \| \| \|/ / / / / \| \|/\| \| \| \| \|	Split dumper_filter off from view_filter
\| * \| \| \| \| \|	Split dumper_filter off from view_filter	Aldo Cortesi	2018-02-26	5	-20/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	These don't even do the same thing.
* \| \| \| \| \| \|	Merge pull request #2923 from cortesi/moreopts	Aldo Cortesi	2018-02-26	13	-35/+44
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Options: split verbosity, add some docs to Loader.add_option
\| * \| \| \| \| \|	Revamp verbosity options	Aldo Cortesi	2018-02-26	12	-28/+36
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Split verbosity into termlog_verbosity and console_eventlog_verbosity. This patch also removes printing to console if there are unknown options in the command-line. Options now live in separate addons, so having uknown options remaining is common and expected. We definitely shoould have some other way for users to see what was ignored so they can catch typos and the like, but that's a different patch.
\| * \| \| \| \| \|	Shift option help styling admonition into the appropriate Loader docstring	Aldo Cortesi	2018-02-26	2	-7/+8
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #2921 from fristonio/Fix-2899	Aldo Cortesi	2018-02-26	1	-2/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove h11 from dependencies and move requests to dev dependencies
\| * \| \| \| \| \|	Remove h11 from dependencies and move requests to dev dependencies	Deepesh Pathak	2018-02-26	1	-2/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #2922 from kajojify/new_example	Aldo Cortesi	2018-02-26	3	-18/+10
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \|	Replaces upsidedown with mirror reflection
\| * \| \| \| \| \|	Getting rid of Pillow	Miroslav	2018-02-25	1	-2/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Replace upsidedown with mirror reflection	Miroslav	2018-02-25	2	-16/+9
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	update doc location	Thomas Kriechbaumer	2018-02-25	1	-2/+2
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #2920 from kira0204/docs-2913	Maximilian Hils	2018-02-25	9	-8/+8
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Docs updates
\| * \| \| \| \| \| \|	trans-1 update	kira0204	2018-02-25	1	-0/+0
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	few more fixes,picture mod	kira0204	2018-02-25	9	-8/+8
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	improve release instructions	Thomas Kriechbaumer	2018-02-25	1	-0/+5
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	improve release instructions	Thomas Kriechbaumer	2018-02-25	2	-6/+19
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	update release instructions	Thomas Kriechbaumer	2018-02-25	1	-0/+12
\| \|_\|/ / / / / \|/\| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #2919 from fristonio/Fix-2906	Maximilian Hils	2018-02-25	1	-2/+3
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix --socks option deprecated info in command line args check.
\| * \| \| \| \| \| \|	Fix --socks option deprecated info in command line args check.	Deepesh Pathak	2018-02-25	1	-2/+3
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #2909 from fristonio/Fix-2867	Aldo Cortesi	2018-02-25	1	-0/+9
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix test fails in test_xss_scanner when running tox without internet connection.
\| * \| \| \| \| \| \| \|	Fix test fails in test_xss_scanner when running tox without internet ↵	Deepesh Pathak	2018-02-24	1	-0/+9
\| \| \|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	connections. - Add mock implementation for gethostbyname in test_xss_scanner. - Fix failed tests when running tox without internet connection. - Fixes #2867
* \| \| \| \| \| \| \|	Merge pull request #2917 from luzpaz/misc-typos	Aldo Cortesi	2018-02-25	23	-38/+38
\|\ \ \ \ \ \ \ \ \| \|_\|/ / / / / / \|/\| \| \| \| \| \| \|	Misc. typos
\| * \| \| \| \| \| \|	Misc. typos	luz.paz	2018-02-24	23	-38/+38
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Found via `codespell -q 3 -I ../mitmproxy-word-whitelist.txt` Where whitelist contains: ``` cas doubleclick nd ot seeked statics te thru ```
* \| \| \| \| \| \|	Merge pull request #2907 from cortesi/optionscomp	Aldo Cortesi	2018-02-25	14	-89/+70
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Start moving more complicated options over to /addons
\| * \| \| \| \| \| \|	addon options: proxyauth to /addons	Aldo Cortesi	2018-02-24	4	-18/+20
\| \| \| \| \| \| \| \|