7279 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Ujjwal Verma	62403a5bd8	Fixes #2197	2017-06-19 03:18:38 +05:30
Thomas Kriechbaumer	6d284f5a2e	Merge pull request #2401 from ujjwal96/ip-formatting ... Fix ip formatting in websocket messages	2017-06-17 23:26:01 +02:00
Ujjwal Verma	c5858463ca	Fix ip formatting in websocket messages	2017-06-18 01:08:31 +05:30
Maximilian Hils	9c49943db4	minor fixes for windows package	2017-06-14 14:35:51 +02:00
Matthew Shao	9687d67601	Add test for typespec_to_str.	2017-06-14 07:44:00 +08:00
Aldo Cortesi	309274689c	Merge pull request #2397 from cortesi/neverenoughconsole ... console: keymap-related improvements	2017-06-14 11:09:26 +12:00
Aldo Cortesi	e8939b8b9f	console: keybindings tweaks ... - consistent sort order - preserve help on edit	2017-06-14 10:01:07 +12:00
Aldo Cortesi	2108bfb106	console: add console.key.edit.focus, bind to "enter"	2017-06-14 09:48:07 +12:00
Aldo Cortesi	e5f79abb4f	console: add console.key.execute.focus, bind to x	2017-06-14 09:21:37 +12:00
Aldo Cortesi	254fe34d4c	console: add console.key.unbind.focus, bind "d" key in keymap editor	2017-06-14 09:04:10 +12:00
Aldo Cortesi	788f0f5784	console: console.key.bind console.key.unbind commands	2017-06-14 08:34:34 +12:00
Matthew Shao	1177e6d907	Add typesepc_to_str function to mitmproxy/utils/typechck.py	2017-06-13 23:22:43 +08:00
Matthew Shao	2c0f6c2023	Minor Update and add test.	2017-06-13 23:03:07 +08:00
Aldo Cortesi	e6cf9ac9ab	console: use master.shutdown rather than raising urwid.ExitMainLoop	2017-06-13 16:16:39 +12:00
Aldo Cortesi	79ce711784	console: extract console addons into consoleaddons.py	2017-06-13 16:15:22 +12:00
Aldo Cortesi	09128d9d1a	console: keymap - list keys with modifiers separately	2017-06-13 16:10:40 +12:00
Aldo Cortesi	4a7cafee9e	console: teach keymap to understand "space" ... Urwid uses " ", which is not a great user experience.	2017-06-13 15:36:00 +12:00
Aldo Cortesi	08972c3f5b	Merge pull request #2394 from cortesi/moarconsole ... Misc console-related improvements	2017-06-13 12:33:36 +12:00
Aldo Cortesi	ba49b55684	console: key binding viewer ... Read-only for now.	2017-06-13 11:48:08 +12:00
Aldo Cortesi	88832f92a3	view: show a message if we remove more than one flow from view	2017-06-13 11:02:32 +12:00
Aldo Cortesi	56eb0441da	commands: teach parser correct annotations for variable args ... We should annotate with the base type, not the resulting sequence.	2017-06-13 10:26:03 +12:00
Aldo Cortesi	0fc24857e1	core: set command can now take multiple values ... These are joined together with spaces before execution. This is a big convenience boost on the command-prompt.	2017-06-13 09:47:50 +12:00
Aldo Cortesi	d95f28e6bf	config: don't crash with a config file containing only comments	2017-06-13 09:43:12 +12:00
Aldo Cortesi	06cb68c799	Minor: formatting, make default color scheme solarized-dark	2017-06-13 09:30:33 +12:00
Ujjwal Verma	9da6cc4534	Merge pull request #2393 from ujjwal96/streaming-test ... Test for streaming	2017-06-13 01:37:08 +05:30
Ujjwal Verma	6ca45856b4	Test for streaming	2017-06-12 23:46:43 +05:30
Matthew Shao	03bb0a09b9	Add tests for dump_dicts in optmanager.py.	2017-06-12 23:23:09 +08:00
Matthew Shao	aabc78350a	Add GET /options RESTful API for mitmweb.	2017-06-12 20:26:46 +08:00
Maximilian Hils	33252cb6bb	Merge pull request #2392 from mhils/web-fixes ... [web] Update dependencies, minor fixes	2017-06-12 13:34:56 +02:00
Maximilian Hils	c4804b5fe1	[web] update dependencies	2017-06-12 13:02:15 +02:00
Maximilian Hils	99eca6dfed	[web] fix contentviews, simplify related logic	2017-06-12 13:01:22 +02:00
Maximilian Hils	c1ba6b6c21	[web] fix stopEdit	2017-06-12 12:57:37 +02:00
Thomas Kriechbaumer	2ceefe9582	Merge pull request #2390 from ograff/remove_private_key_pkcs12 ... Remove private key from PKCS12 file	2017-06-12 11:15:37 +02:00
Maximilian Hils	c89d076cf3	Merge pull request #2376 from MatthewShao/jest-dev ... [WIP][web] Add tests for components/ContentView (con't)	2017-06-12 10:59:27 +02:00
Oliver Graff	bd9d0bf6b1	Remove private key from PKCS12 file ... Fixes #2349	2017-06-12 01:44:26 -07:00
Matthew Shao	49a04e37c3	[web] Update ContentLoader class name.	2017-06-12 08:41:40 +08:00
Thomas Kriechbaumer	93d37e29c3	Merge pull request #2389 from ujjwal96/test-coverage ... Tests for Proxy config	2017-06-11 22:48:45 +02:00
Ujjwal Verma	4587b54aed	tests for Proxy config	2017-06-12 01:32:58 +05:30
Aldo Cortesi	c03f14cba6	Merge pull request #2388 from cortesi/consolebits ... A few console-related bits and bobs	2017-06-11 22:35:05 +12:00
Aldo Cortesi	a61178f28a	console: console.eventlog.clear command, bind to "z" by default	2017-06-11 22:16:02 +12:00
Aldo Cortesi	9c57508fde	console: extract "enter" to m_select ... Regularise, kill dead code, remove keybindings now not needed.	2017-06-11 21:55:31 +12:00
Aldo Cortesi	60de6e6d1e	console: delete stale help code	2017-06-11 21:22:55 +12:00
Aldo Cortesi	a482868cd6	console: extract "tab" to m_next pseudo-key ... This makes tab work consistently across contexts, makes it globally bindable, and gets rid of an un-needed command.	2017-06-11 21:20:12 +12:00
Aldo Cortesi	0e569d1af1	Merge pull request #2387 from cortesi/helptext ... console: Key binding help	2017-06-11 19:03:29 +12:00
Aldo Cortesi	926b58ab4f	console: Make global nav keys work within help	2017-06-11 18:57:02 +12:00
Aldo Cortesi	fdfd3ed937	console: Key binding help ... Add a help field to key bindings, use that in contextual help display.	2017-06-11 18:19:23 +12:00
Aldo Cortesi	40703afd0a	Merge pull request #2386 from cortesi/help ... console help	2017-06-11 17:45:59 +12:00
Aldo Cortesi	7caa7e7538	console: auto-generate context key binding help	2017-06-11 17:09:52 +12:00
Aldo Cortesi	fd68eca351	Keep emojis out of tox.ini ... This breaks config parsers like the one used by flake8. Also... emojis? In a config file?	2017-06-11 16:18:40 +12:00
Aldo Cortesi	816a51b6c8	console: help - remove hardcoded help everywhere	2017-06-11 13:28:31 +12:00