aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [web] Add Modal Component and OptionModalMatthew Shao2017-06-283-0/+69
* [web] Add modal to js/ducks/ui/index.jsMatthew Shao2017-06-271-0/+2
* [web] Add js/ducks/options.jsMatthew Shao2017-06-271-0/+32
* [web] Add js/ducks/ui/modal.jsMatthew Shao2017-06-271-0/+33
* Merge pull request #2402 from ujjwal96/request-replayMaximilian Hils2017-06-272-2/+19
|\
| * request replay testUjjwal Verma2017-06-262-3/+15
| * Fixes #2197Ujjwal Verma2017-06-191-0/+5
* | Merge pull request #2413 from MatthewShao/jest-devMaximilian Hils2017-06-267-2/+406
|\ \
| * | [web] Minor fix and Coverage ++Matthew Shao2017-06-263-7/+8
| * | [web] Add tests for js/components/FlowTable.jsxMatthew Shao2017-06-252-0/+129
| * | [web] Add tests for js/components/EventLog.jsxMatthew Shao2017-06-253-1/+134
| * | [web] Add tests for js/components/ContentView.jsxMatthew Shao2017-06-252-0/+141
|/ /
* | 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-257-3/+148
|\ \ \
| * | | lint!Ujjwal Verma2017-06-252-6/+7
| * | | Added testUjjwal Verma2017-06-253-7/+30
| * | | ICO Parser. Closes #2407Ujjwal Verma2017-06-245-1/+122
* | | | Merge pull request #2395 from MatthewShao/mitmweb-optionsMaximilian Hils2017-06-246-9/+73
|\ \ \ \
| * | | | Minor Update for /options API of mitmweb.Matthew Shao2017-06-244-13/+7
| * | | | Add test for POST /options API of mitmweb.Matthew Shao2017-06-232-1/+4
| * | | | Add POST /options RESTful API for mitmweb.Matthew Shao2017-06-231-0/+8
| * | | | Add test for typespec_to_str.Matthew Shao2017-06-141-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-132-2/+22
| * | | | Add tests for dump_dicts in optmanager.py.Matthew Shao2017-06-122-1/+5
| * | | | Add GET /options RESTful API for mitmweb.Matthew Shao2017-06-122-0/+22
* | | | | Merge pull request #2410 from fulldecent/patch-1Maximilian Hils2017-06-241-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Slight wording changeWilliam Entriken2017-06-231-1/+1
|/ / / /
* | | | Merge pull request #2406 from ujjwal96/tls-parserThomas Kriechbaumer2017-06-223-16/+4
|\ \ \ \ | |_|_|/ |/| | |
| * | | Removed redundant typeUjjwal Verma2017-06-223-16/+4
|/ / /
* | | Merge pull request #2401 from ujjwal96/ip-formattingThomas Kriechbaumer2017-06-171-3/+3
|\ \ \ | | |/ | |/|
| * | Fix ip formatting in websocket messagesUjjwal Verma2017-06-181-3/+3
|/ /
* | minor fixes for windows packageMaximilian Hils2017-06-144-11/+5
* | Merge pull request #2397 from cortesi/neverenoughconsoleAldo Cortesi2017-06-148-458/+675
|\ \
| * | 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-147-19/+147
| * | 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-133-8/+19
|/ /
* | Merge pull request #2394 from cortesi/moarconsoleAldo Cortesi2017-06-1315-33/+211
|\ \
| * | console: key binding viewerAldo Cortesi2017-06-138-13/+157
| * | view: show a message if we remove more than one flow from viewAldo Cortesi2017-06-132-0/+12
| * | commands: teach parser correct annotations for variable argsAldo Cortesi2017-06-134-9/+13
| * | 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-132-0/+6