7641 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Fenil Gandhi	77ed33b06d	Fix for failing UI test	2018-03-06 09:29:20 +05:30
kira0204	be50f3f481	wrong additions ... test-for-2850 few fixes mock testing Typo error	2018-03-06 05:44:05 +05:30
Aldo Cortesi	53a9be498c	Merge pull request #2955 from cortesi/ndocs ... docs: start move to docs.mitmproxy.org	2018-03-06 09:34:15 +13:00
Fenil Gandhi	ece6002328	Update remaining old docs url with new one.	2018-03-05 22:56:36 +05:30
Thomas Kriechbaumer	b490a97b38	Merge pull request #2957 from kira0204/patch-1 ... updating README according to recent doc updates	2018-03-05 10:49:24 +01:00
Arushit Mudgal	c50362a637	updating README according to recent doc updates ... Hi, The installation instructions linked back to old docs website. I have updated the same	2018-03-05 07:27:00 +05:30
Aldo Cortesi	ee6937f948	docs: add robots.txt and error.html ... - robots.txt prevents crawling of everything but /stable - error.html has a simple meta refresh to the latest stable docs. This will also help crawlers find the right path.	2018-03-05 10:57:50 +13:00
Aldo Cortesi	a68c7ffb27	docs: add build and upload scripts ... The upload scripts might be unified down the track, or might not. CloudFront is not set up for the docs bucket yet, so CDN invalidation is commented out. This will be added later.	2018-03-05 10:51:46 +13:00
Aldo Cortesi	08e50aa39b	docs: port changes in .css to .scss source	2018-03-05 10:09:18 +13:00
Aldo Cortesi	5297e66a87	Merge pull request #2949 from Kriechi/docs-protocols ... docs: add protocols description	2018-03-05 09:10:37 +13:00
Aldo Cortesi	bc6550abc5	Merge pull request #2945 from kajojify/shortening ... Polite shortening of statusbar messages. Fix #1433	2018-03-05 09:07:18 +13:00
Maximilian Hils	a2740ee4ae	Merge pull request #2868 from kira0204/data-crash ... Fix crashing when editing form with random data, fix #2794	2018-03-04 19:53:15 +01:00
Maximilian Hils	618d52a65e	Merge pull request #2946 from fenilgandhi/master ... Fix for wrapping up extra-long urls in flowdetailview	2018-03-04 19:46:43 +01:00
Maximilian Hils	47f3a61a5c	Merge pull request #2948 from Kriechi/docs-sidebar-height ... render sidebar without height limit	2018-03-04 19:46:00 +01:00
Maximilian Hils	97aa43d121	Merge pull request #2947 from Kriechi/docs-sidebar-color ... make sidebar visually distinct	2018-03-04 19:45:45 +01:00
Maximilian Hils	8dbcb4ceec	Merge pull request #2950 from mitmproxy/certstore-path ... Fix display inconsistency for certstore path	2018-03-04 19:45:08 +01:00
Miroslav	237320a539	Minor fixes. ... Renaming prep_message method to shorten_message. Docstring. \u2026 instead of .... max_width parameter.	2018-03-03 22:12:56 +02:00
Maximilian Hils	3692b4ceab	fix display inconsistency for certstore path	2018-03-03 19:23:05 +01:00
Thomas Kriechbaumer	618bd31bd8	docs: add protocols description	2018-03-03 13:36:06 +01:00
Thomas Kriechbaumer	f3a27e2779	render sidebar without height limit	2018-03-03 13:03:14 +01:00
Thomas Kriechbaumer	b4440c4252	make sidebar visually distinct	2018-03-03 13:00:20 +01:00
Fenil Gandhi	fa09bfa489	Fix for wrapping up extra-long urls in flowdetailview	2018-03-03 09:44:46 +05:30
Miroslav	63f0a712d8	Addition to the comment	2018-03-03 00:32:32 +02:00
Aldo Cortesi	9760396a37	Merge pull request #2944 from Kriechi/docs++ ... readd Wireshark SSL master secrets docs	2018-03-03 11:17:50 +13:00
Thomas Kriechbaumer	a074a1df40	readd Wireshark SSL master secrets docs	2018-03-02 23:03:54 +01:00
Miroslav	0dcdb6c3cc	Finalization of tests. Conditions rewritten again.	2018-03-02 23:40:58 +02:00
Aldo Cortesi	8ea58a432e	Merge pull request #2943 from mitmproxy/requires-io-master ... [requires.io] dependency update on master branch	2018-03-03 09:29:30 +13:00
requires.io	7e1a6d1427	[requires.io] dependency update	2018-03-02 21:02:21 +01:00
Miroslav	d151c6c322	Initial tests. New conditions.	2018-03-01 01:18:05 +02:00
Miroslav	5161458217	Shortening notifications in statusbar	2018-02-28 00:18:18 +02:00
Maximilian Hils	c6802ba034	Merge pull request #2934 from mhils/cleanup-proxyconfig ... Cleanup ProxyConfig	2018-02-27 20:19:30 +01:00
Maximilian Hils	944e81dcfc	clean up ProxyConfig ... some of these options weren't even used anymore, others only in one place where it makes sense to use options directly.	2018-02-27 19:05:59 +01:00
Maximilian Hils	65b8b65ebc	add missing client_certs directory expansion	2018-02-27 19:05:52 +01:00
Aldo Cortesi	9016608486	Merge pull request #2931 from cortesi/scriptpath ... script.run takes a path argument	2018-02-27 10:14:33 +13:00
Aldo Cortesi	bb7e4b853c	script.run takes a path argument ... This must have slipped through in the first conversion.	2018-02-27 09:33:14 +13:00
Aldo Cortesi	1295856cd5	Merge pull request #2875 from fenilgandhi/issue-2872 ... Fixed a bug with bytes encoding error	2018-02-27 09:03:20 +13:00
Aldo Cortesi	e52adb1755	Merge pull request #2926 from cortesi/coreopts ... Start consolidating core options	2018-02-27 07:58:40 +13:00
Aldo Cortesi	494390bf07	Merge pull request #2925 from mhils/clientcert-from-sni ... Use sni to select clientcerts	2018-02-26 11:35:35 +13:00
Aldo Cortesi	469ffe32af	Merge pull request #2924 from cortesi/dumperfilt ... Split dumper_filter off from view_filter	2018-02-26 11:32:57 +13:00
Aldo Cortesi	7bd63ee713	Start consolidating core options ... 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.	2018-02-26 11:26:32 +13:00
Maximilian Hils	820ccc69da	use sni to select clientcerts	2018-02-25 22:19:14 +01:00
Aldo Cortesi	f02896862d	Merge pull request #2923 from cortesi/moreopts ... Options: split verbosity, add some docs to Loader.add_option	2018-02-26 09:45:24 +13:00
Aldo Cortesi	e5cdc20eb8	Split dumper_filter off from view_filter ... These don't even do the same thing.	2018-02-26 09:43:15 +13:00
Aldo Cortesi	2fb85553cc	Revamp verbosity options ... 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.	2018-02-26 09:02:24 +13:00
Aldo Cortesi	77e5d823e0	Shift option help styling admonition into the appropriate Loader docstring	2018-02-26 09:02:24 +13:00
Aldo Cortesi	b57f551c0d	Merge pull request #2921 from fristonio/Fix-2899 ... Remove h11 from dependencies and move requests to dev dependencies	2018-02-26 08:49:19 +13:00
Aldo Cortesi	ded9423764	Merge pull request #2922 from kajojify/new_example ... Replaces upsidedown with mirror reflection	2018-02-26 08:48:52 +13:00
Miroslav	4ae9b065e7	Getting rid of Pillow	2018-02-25 21:26:25 +02:00
Miroslav	3b134df77f	Replace upsidedown with mirror reflection	2018-02-25 21:17:08 +02:00
Deepesh Pathak	a40dbc11b8	Remove h11 from dependencies and move requests to dev dependencies	2018-02-26 00:02:05 +05:30