aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | Increased net.http.cookies.py and net.http.message.py coverageUjjwal Verma2017-05-122-0/+9
|/ / /
* | | Fixed LDAP Auth (#2333)charlesdhdt2017-05-123-50/+57
| | |
* | | update packagesThomas Kriechbaumer2017-05-111-2/+2
| | |
* | | fix type annotationMaximilian Hils2017-05-111-2/+1
|/ /
* | Merge pull request #2322 from MatthewShao/jest-devMatthew Shao2017-05-1011-21/+182
|\ \ | | | | | | [web] Coverage improve
| * | web: do not collect coverage when invoking "jest"Maximilian Hils2017-05-091-2/+1
| | | | | | | | | | | | this is annoying when runnig jest --watch=all.
| * | web: clear mock store actions after each testMaximilian Hils2017-05-091-13/+21
| | |
| * | [web] Update tests for js/ducks/ui/keyboard.jsMatthew Shao2017-05-091-45/+36
| | |
| * | [web] Add tests for js/ducks/ui/keyboard.jsMatthew Shao2017-05-091-0/+158
| | |
| * | [web] Add tests for js/__tests__/ducks/ui/indexSpec.jsMatthew Shao2017-05-081-0/+9
| | |
| * | [web] Add tests for js/ducks/index.js & js/ducks/ui/index.jsMatthew Shao2017-05-081-0/+12
| | |
| * | [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.
* | | Handle head request on onboarding app: Fix #2324 (#2325)Ujjwal Verma2017-05-092-4/+43
| | |
* | | Merge pull request #2320 from Ritiek/masterMaximilian Hils2017-05-081-19/+58
|\ \ \ | |/ / |/| | Add specific instructions on mitm.it when an icon is clicked
| * | Change to only Apps & VPNRitiek Malhotra2017-05-081-1/+1
| | |
| * | Add instructions for Windows and AndroidRitiek Malhotra2017-05-071-6/+27
| | |
| * | Add apple info from docsRitiek Malhotra2017-05-071-4/+6
| | |
| * | Add dynamic apple instructionsRitiek Malhotra2017-05-071-19/+35
|/ /
* | 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.