aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | 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 change
| * | | | Slight wording changeWilliam Entriken2017-06-231-1/+1
|/ / / /
* | | | Merge pull request #2406 from ujjwal96/tls-parserThomas Kriechbaumer2017-06-223-16/+4
|\ \ \ \ | |_|_|/ |/| | | Removed redundant type
| * | | 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 messages
| * | 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: keymap-related improvements
| * | console: keybindings tweaksAldo Cortesi2017-06-142-7/+10
| | | | | | | | | | | | | | | - consistent sort order - preserve help on edit
| * | 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
|/ / | | | | | | Urwid uses " ", which is not a great user experience.
* | Merge pull request #2394 from cortesi/moarconsoleAldo Cortesi2017-06-1315-33/+211
|\ \ | | | | | | Misc console-related improvements
| * | console: key binding viewerAldo Cortesi2017-06-138-13/+157
| | | | | | | | | | | | Read-only for now.
| * | 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
| | | | | | | | | | | | We should annotate with the base type, not the resulting sequence.
| * | core: set command can now take multiple valuesAldo Cortesi2017-06-132-3/+5
| | | | | | | | | | | | | | | These are joined together with spaces before execution. This is a big convenience boost on the command-prompt.
| * | config: don't crash with a config file containing only commentsAldo Cortesi2017-06-132-0/+6
| | |
| * | Minor: formatting, make default color scheme solarized-darkAldo Cortesi2017-06-132-11/+21
|/ /
* | Merge pull request #2393 from ujjwal96/streaming-testUjjwal Verma2017-06-131-0/+37
|\ \ | | | | | | Test for streaming
| * | Test for streamingUjjwal Verma2017-06-121-0/+37
|/ /
* | Merge pull request #2392 from mhils/web-fixesMaximilian Hils2017-06-1210-576/+904
|\ \ | |/ |/| [web] Update dependencies, minor fixes
| * [web] update dependenciesMaximilian Hils2017-06-124-560/+879
| |
| * [web] fix contentviews, simplify related logicMaximilian Hils2017-06-123-8/+13
| |
| * [web] fix stopEditMaximilian Hils2017-06-123-8/+12
| |
* | Merge pull request #2390 from ograff/remove_private_key_pkcs12Thomas Kriechbaumer2017-06-121-0/+6
|\ \ | | | | | | Remove private key from PKCS12 file
| * | Remove private key from PKCS12 fileOliver Graff2017-06-121-0/+6
| | | | | | | | | | | | Fixes #2349
* | | Merge pull request #2376 from MatthewShao/jest-devMaximilian Hils2017-06-1222-82/+700
|\ \ \ | |/ / |/| / | |/ [WIP][web] Add tests for components/ContentView (con't)
| * [web] Update ContentLoader class name.Matthew Shao2017-06-122-80/+81
| |
| * [web] Export PureViewServer in ContentView/ContentView.jsxMatthew Shao2017-06-081-3/+3
| |
| * [web] Add tests for js/components/ContentView/ContentView.jsxMatthew Shao2017-06-082-0/+137
| |
| * [web] Add tests for js/components/ContentView/ContentLoader.jsxMatthew Shao2017-06-082-0/+86
| |
| * [web] Add mock-xmlhttprequest dependency.Matthew Shao2017-06-082-0/+5
| |
| * [web] Add tests for js/components/ContentView/ViewSelector.jsxMatthew Shao2017-06-063-1/+162
| |
| * [web] Add tests for js/components/ContentView/UploadContentButton.jsxMatthew Shao2017-06-063-0/+32
| |
| * [web] Imporve indentation.Matthew Shao2017-06-061-5/+5
| |
| * [web] Add tests for js/components/ContentView/ShowFullContentButton.jsxMatthew Shao2017-06-053-1/+65
| |
| * [web] Add tests for js/components/ContentView/MetaViews.jsxMatthew Shao2017-06-052-0/+103
| |
| * [web] Add tests for js/components/ContentView/DownloadContentButton.jsxMatthew Shao2017-06-053-0/+29
| |
* | Merge pull request #2389 from ujjwal96/test-coverageThomas Kriechbaumer2017-06-112-2/+38
|\ \ | | | | | | Tests for Proxy config
| * | tests for Proxy configUjjwal Verma2017-06-122-2/+38
|/ /
* | Merge pull request #2388 from cortesi/consolebitsAldo Cortesi2017-06-1119-246/+70
|\ \ | | | | | | A few console-related bits and bobs
| * | console: console.eventlog.clear command, bind to "z" by defaultAldo Cortesi2017-06-116-6/+19
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-26 13:54:53 +0000