aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [web] Clear up jest.unmock()Matthew Shao2017-05-077-19/+3
| | | | | Automocking is no longer enable by default, so we don't need to unmock modules manually.
* Note to enable `Certificate Trust Settings` in iOS 10.3 or up (#2312)Zhigang Fang2017-05-051-0/+3
|
* Merge pull request #2286 from charlesdhdt/masterMaximilian Hils2017-05-044-5/+77
|\ | | | | Added LDAP Auth
| * fixed lintCharles d'Hondt2017-05-042-4/+3
| |
| * Added ldap mock testCharles d'Hondt2017-05-043-14/+20
| |
| * lint checksCharles d'Hondt2017-05-021-4/+4
| |
| * added ldap3 to setup.pyCharles d'Hondt2017-05-021-0/+1
| |
| * Added ldapsss vefCharles d'Hondt2017-04-282-2/+10
| |
| * fixCharles d'Hondt2017-04-281-1/+1
| |
| * fixCharles d'Hondt2017-04-281-1/+1
| |
| * Fixed typoCharles d'Hondt2017-04-281-1/+1
| |
| * Added LDAP AuthCharles d'Hondt2017-04-283-3/+61
| |
* | Merge pull request #2311 from mhils/issue-2310Maximilian Hils2017-05-033-3/+12
|\ \ | | | | | | fix #2310
| * | fix #2310Maximilian Hils2017-05-033-3/+12
|/ /
* | Merge pull request #2307 from cortesi/layoutsAldo Cortesi2017-05-0310-193/+259
|\ \ | | | | | | console: add a two-pane layout
| * | console: add a two-pane layoutAldo Cortesi2017-05-038-106/+194
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Replace options.console_eventlog with options.console_layout - This can be "single", "vertical" and "horizontal" - At the base of the primary pane is the flowlist. At the base of the secondary pane is the event log. - Any of the other primary windows can be opened in each of the panes. For now, I've bound "-" to the flow layout switch, "shift tab" to the layout pane switch, and "P" to open the currently focused flow in whichever pane you're in. These are just temporary - we'll reassess the default bindings carefully once the keybindings work is complete.
| * | console: Make EventLog its own control, bind to "E"Aldo Cortesi2017-05-025-99/+77
| | |
* | | Merge pull request #2306 from mhils/web-covMaximilian Hils2017-05-021-1/+2
|\ \ \ | |/ / |/| | Honest JS Coverage
| * | honest js coverageMaximilian Hils2017-05-021-1/+2
| | |
* | | Merge pull request #2305 from cortesi/consolebugsAldo Cortesi2017-05-0222-93/+219
|\ \ \ | | | | | | | | console: various bugfixes
| * | | console: various bugsAldo Cortesi2017-05-027-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | - Action bar now correctly gets the palette background - Viewing connection details for a killed flow no longer crashes - Editing options with selections no longer crashes
| * | | commands: options controlAldo Cortesi2017-05-025-34/+102
| | | | | | | | | | | | | | | | Use the new commands to bind the Options view in console.
| * | | console: globally respected nav commandsAldo Cortesi2017-05-0216-52/+110
|/ / / | | | | | | | | | Use this to bind nav keys with commands throughout.
* | | Merge pull request #2299 from iharsh234/mypy-pathodAldo Cortesi2017-05-0213-39/+51
|\ \ \ | | | | | | | | Mypy Checking to pathod
| * | | Extend Mypy checking to pathodharsh vijay2017-05-0213-39/+51
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * mypy checking pathod * initial commit , fixed errors * tox: mypy checking to pathod * Fixed mypy test failed * issue was with args in custom_contentview.py * tox: mypy checking to #2221 * follow-import=skip since we cant provide args to custom_contentview.py during mypy testing * Lint , Typo Fixed * code style: module import
* | | Merge pull request #2302 from cortesi/flowviewAldo Cortesi2017-05-015-233/+109
|\ \ \ | | | | | | | | commands: view.setval, view.getval, view.setval.toggle
| * | | commands: view.setval, view.getval, view.setval.toggleAldo Cortesi2017-05-015-233/+109
| | | | | | | | | | | | | | | | | | | | Use these to bind the last of the key for flowview. Flow views are now 100% keybound.
* | | | Merge pull request #2301 from cortesi/encodingAldo Cortesi2017-05-014-38/+93
|\| | | | | | | | | | | commands: flow.encode, flow.decode, flow.encode.toggle
| * | | commands: flow.encode, flow.decode, flow.encode.toggleAldo Cortesi2017-05-014-38/+93
| | | | | | | | | | | | | | | | Use this to bind "z" in flowview.
* | | | Merge pull request #2300 from cortesi/consolerevampAldo Cortesi2017-05-0123-681/+664
|\| | | | |/ / |/| | Console revamp
| * | commands: console.bodyview, console.chooseAldo Cortesi2017-05-012-14/+60
| | | | | | | | | | | | Use this to replace the "v" for view shortcut key in flowview.
| * | keymap: keys can now bind to multiple contextsAldo Cortesi2017-05-019-187/+136
| | | | | | | | | | | | Use this to map the majority of the keys in flowview.
| * | command: flow.setAldo Cortesi2017-05-014-134/+123
| | | | | | | | | | | | Use this to replace the flow edit components of flowview entirely.
| * | Refactor consoleAldo Cortesi2017-05-0117-366/+365
|/ / | | | | | | | | | | | | | | - All top-level window objects are now persistent. It turns out that urwid keeps a reference to these even after they're no longer used, so they were leaking before. - Revamp editors to work with console commands, and start reworking bindings for flowview.
* | Merge pull request #2285 from MatthewShao/jest-devMaximilian Hils2017-04-304-5/+110
|\ \ | | | | | | [web] Add coverage for js/urlState.js
| * | [web] Export updateUrlFromStore and updateStoreFromUrlMatthew Shao2017-04-302-25/+46
| | |
| * | [web] Introduce redux-mock-store and minor fix.Matthew Shao2017-04-304-44/+64
| | |
| * | [web] Add coverage for js/urlState.jsMatthew Shao2017-04-281-0/+66
| |/
* | Merge pull request #2271 from mhils/mitmweb-connection-indicatorMaximilian Hils2017-04-3014-4658/+5128
|\ \ | | | | | | [web] add connection indicator [WIP]
| * | [web] add connection testsMaximilian Hils2017-04-294-16/+63
| | |
| * | [web] add connection indicatorMaximilian Hils2017-04-2912-4655/+5078
| | |
* | | Merge pull request #2297 from cortesi/flowcmdAldo Cortesi2017-05-017-91/+52
|\ \ \ | | | | | | | | commands: view.order.options, view.marked.toggle, view.create
| * | | commands: view.order.options, view.marked.toggle, view.createAldo Cortesi2017-04-307-91/+52
| | | | | | | | | | | | | | | | | | | | | | | | And use these commands to remove the last hard-coded keybindings from flow list. This means the flow list is now 100% command-driven, which is very exciting.
* | | | Merge pull request #2296 from cortesi/viewloadAldo Cortesi2017-04-3028-653/+385
|\| | | | | | | | | | | commands: view.load
| * | | commands: view.loadAldo Cortesi2017-04-307-27/+39
| | | | | | | | | | | | | | | | Plus replace the flow list keybinding.
| * | | commands: support *args for commandsAldo Cortesi2017-04-306-47/+122
| | | | | | | | | | | | | | | | | | | | | | | | Use this to simplify meta-commands in console, and to create a console_choose command that prompts the user for a choice, and then executes a command with variable substitution.
| * | | Move export to addon, kill Python and Locust exportAldo Cortesi2017-04-3023-586/+231
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also add a "raw" export format. The Python and Locust exports are hard to maintain, their tests are extremely brittle, they didn't have full test coverage, and are by my guess very rarely used. I feel the Locust export should certainly be an externally maintained addon. The Python/requests export can come back if someone cares enough, and it can be structured in a way we can maintain.
* | | | fix markdownThomas Kriechbaumer2017-04-301-4/+4
| | | |
* | | | update docker-release tags during releaseThomas Kriechbaumer2017-04-301-0/+4
| | | |
* | | | Merge pull request #2293 from cortesi/clipAldo Cortesi2017-04-303-0/+47
|\| | | | | | | | | | | commands: cut.clip copies cuts to system clipboard
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-11 00:43:12 +0000