aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #2286 from charlesdhdt/masterMaximilian Hils2017-05-044-5/+77
|\
| * 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 #2310Maximilian Hils2017-05-033-3/+12
|/ /
* | Merge pull request #2307 from cortesi/layoutsAldo Cortesi2017-05-0310-193/+259
|\ \
| * | console: add a two-pane layoutAldo Cortesi2017-05-038-106/+194
| * | 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 coverageMaximilian Hils2017-05-021-1/+2
* | | Merge pull request #2305 from cortesi/consolebugsAldo Cortesi2017-05-0222-93/+219
|\ \ \
| * | | console: various bugsAldo Cortesi2017-05-027-9/+9
| * | | commands: options controlAldo Cortesi2017-05-025-34/+102
| * | | console: globally respected nav commandsAldo Cortesi2017-05-0216-52/+110
|/ / /
* | | Merge pull request #2299 from iharsh234/mypy-pathodAldo Cortesi2017-05-0213-39/+51
|\ \ \
| * | | Extend Mypy checking to pathodharsh vijay2017-05-0213-39/+51
|/ / /
* | | Merge pull request #2302 from cortesi/flowviewAldo Cortesi2017-05-015-233/+109
|\ \ \
| * | | commands: view.setval, view.getval, view.setval.toggleAldo Cortesi2017-05-015-233/+109
* | | | Merge pull request #2301 from cortesi/encodingAldo Cortesi2017-05-014-38/+93
|\| | |
| * | | commands: flow.encode, flow.decode, flow.encode.toggleAldo Cortesi2017-05-014-38/+93
* | | | Merge pull request #2300 from cortesi/consolerevampAldo Cortesi2017-05-0123-681/+664
|\| | | | |/ / |/| |
| * | commands: console.bodyview, console.chooseAldo Cortesi2017-05-012-14/+60
| * | keymap: keys can now bind to multiple contextsAldo Cortesi2017-05-019-187/+136
| * | command: flow.setAldo Cortesi2017-05-014-134/+123
| * | Refactor consoleAldo Cortesi2017-05-0117-366/+365
|/ /
* | Merge pull request #2285 from MatthewShao/jest-devMaximilian Hils2017-04-304-5/+110
|\ \
| * | [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 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.createAldo Cortesi2017-04-307-91/+52
* | | | Merge pull request #2296 from cortesi/viewloadAldo Cortesi2017-04-3028-653/+385
|\| | |
| * | | commands: view.loadAldo Cortesi2017-04-307-27/+39
| * | | commands: support *args for commandsAldo Cortesi2017-04-306-47/+122
| * | | Move export to addon, kill Python and Locust exportAldo Cortesi2017-04-3023-586/+231
* | | | 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 clipboardAldo Cortesi2017-04-303-0/+47
* | | | Merge pull request #2291 from cortesi/cutsAldo Cortesi2017-04-3013-13/+351
|\| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 07:04:51 +0000