aboutsummaryrefslogtreecommitdiffstats
path: root/mitmproxy
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #2402 from ujjwal96/request-replayMaximilian Hils2017-06-271-0/+5
|\
| * request replay testUjjwal Verma2017-06-261-1/+1
| * Fixes #2197Ujjwal Verma2017-06-191-0/+5
* | Merge pull request #2412 from ujjwal96/ip-formattingThomas Kriechbaumer2017-06-251-5/+5
|\ \
| * | Few ip formatting fixesUjjwal Verma2017-06-251-5/+5
| |/
* | Merge pull request #2411 from ujjwal96/ico-parserMaximilian Hils2017-06-255-1/+124
|\ \
| * | lint!Ujjwal Verma2017-06-252-6/+7
| * | Added testUjjwal Verma2017-06-251-5/+6
| * | ICO Parser. Closes #2407Ujjwal Verma2017-06-245-1/+122
* | | Merge pull request #2395 from MatthewShao/mitmweb-optionsMaximilian Hils2017-06-243-9/+50
|\ \ \
| * | | Minor Update for /options API of mitmweb.Matthew Shao2017-06-242-11/+4
| * | | Add test for POST /options API of mitmweb.Matthew Shao2017-06-231-1/+0
| * | | Add POST /options RESTful API for mitmweb.Matthew Shao2017-06-231-0/+8
| * | | Add typesepc_to_str function to mitmproxy/utils/typechck.pyMatthew Shao2017-06-132-8/+13
| * | | Minor Update and add test.Matthew Shao2017-06-131-2/+17
| * | | Add tests for dump_dicts in optmanager.py.Matthew Shao2017-06-121-1/+0
| * | | Add GET /options RESTful API for mitmweb.Matthew Shao2017-06-122-0/+22
* | | | Slight wording changeWilliam Entriken2017-06-231-1/+1
| |/ / |/| |
* | | Removed redundant typeUjjwal Verma2017-06-223-16/+4
| |/ |/|
* | Fix ip formatting in websocket messagesUjjwal Verma2017-06-181-3/+3
* | console: keybindings tweaksAldo Cortesi2017-06-142-7/+10
* | console: add console.key.edit.focus, bind to "enter"Aldo Cortesi2017-06-142-4/+23
* | console: add console.key.execute.focus, bind to xAldo Cortesi2017-06-142-2/+16
* | console: add console.key.unbind.focus, bind "d" key in keymap editorAldo Cortesi2017-06-144-6/+42
* | console: console.key.bind console.key.unbind commandsAldo Cortesi2017-06-146-19/+112
* | console: use master.shutdown rather than raising urwid.ExitMainLoopAldo Cortesi2017-06-131-2/+1
* | console: extract console addons into consoleaddons.pyAldo Cortesi2017-06-132-426/+430
* | console: keymap - list keys with modifiers separatelyAldo Cortesi2017-06-132-4/+7
* | console: teach keymap to understand "space"Aldo Cortesi2017-06-132-8/+14
* | console: key binding viewerAldo Cortesi2017-06-137-12/+156
* | view: show a message if we remove more than one flow from viewAldo Cortesi2017-06-131-0/+2
* | commands: teach parser correct annotations for variable argsAldo Cortesi2017-06-133-8/+12
* | core: set command can now take multiple valuesAldo Cortesi2017-06-132-3/+5
* | config: don't crash with a config file containing only commentsAldo Cortesi2017-06-131-0/+2
* | Minor: formatting, make default color scheme solarized-darkAldo Cortesi2017-06-132-11/+21
|/
* Remove private key from PKCS12 fileOliver Graff2017-06-121-0/+6
* console: console.eventlog.clear command, bind to "z" by defaultAldo Cortesi2017-06-116-6/+19
* console: extract "enter" to m_selectAldo Cortesi2017-06-1112-131/+18
* console: delete stale help codeAldo Cortesi2017-06-112-30/+0
* console: extract "tab" to m_next pseudo-keyAldo Cortesi2017-06-118-73/+16
* console: Make global nav keys work within helpAldo Cortesi2017-06-112-6/+17
* console: Key binding helpAldo Cortesi2017-06-114-118/+147
* console: auto-generate context key binding helpAldo Cortesi2017-06-1110-50/+91
* console: help - remove hardcoded help everywhereAldo Cortesi2017-06-117-205/+3
* console: generalise grideditor help text, only show headers if we have themAldo Cortesi2017-06-111-15/+17
* console: grideditor - re-add column headersAldo Cortesi2017-06-112-21/+2
* console: grideditor keybindings for r, R and eAldo Cortesi2017-06-113-70/+72
* console: overlays shouldn't clear window titlesAldo Cortesi2017-06-112-7/+11
* console: extract grideditor keybindingsAldo Cortesi2017-06-1112-148/+191
* console: grideditors don't display their own titles anymoreAldo Cortesi2017-06-101-10/+1