aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | Merge pull request #2387 from cortesi/helptextAldo Cortesi2017-06-114-118/+147
|\| | | | | | | | | | | console: Key binding help
| * | | console: Key binding helpAldo Cortesi2017-06-114-118/+147
| | | | | | | | | | | | | | | | Add a help field to key bindings, use that in contextual help display.
* | | | Merge pull request #2386 from cortesi/helpAldo Cortesi2017-06-1118-536/+390
|\| | | | | | | | | | | console help
| * | | console: auto-generate context key binding helpAldo Cortesi2017-06-1112-78/+111
| | | |
| * | | Keep emojis out of tox.iniAldo Cortesi2017-06-111-2/+2
| | | | | | | | | | | | | | | | | | | | This breaks config parsers like the one used by flake8. Also... emojis? In a config file?
| * | | console: help - remove hardcoded help everywhereAldo Cortesi2017-06-117-205/+3
| | | |
| * | | console: generalise grideditor help text, only show headers if we have themAldo Cortesi2017-06-111-15/+17
| | | |
| * | | console: grideditor - re-add column headersAldo Cortesi2017-06-112-21/+2
| | | | | | | | | | | | | | | | | | | | | | | | Also remove special-case shortcut for user-agent. This is awkward in the new structure. Down the track we can come up with a more regular mechanism like snippets.
| * | | console: grideditor keybindings for r, R and eAldo Cortesi2017-06-113-70/+72
| | | |
| * | | console: overlays shouldn't clear window titlesAldo Cortesi2017-06-112-7/+11
| | | |
| * | | console: extract grideditor keybindingsAldo Cortesi2017-06-1112-148/+191
| | | | | | | | | | | | | | | | Also formalise the LayoutWidget interface a bit
| * | | console: grideditors don't display their own titles anymoreAldo Cortesi2017-06-101-10/+1
| | | |
* | | | Merge pull request #2384 from cortesi/layoutsAldo Cortesi2017-06-1110-12/+46
|\| | | | | | | | | | | console: layout pane headers
| * | | console: layout pane heaadersAldo Cortesi2017-06-1010-12/+46
|/ / / | | | | | | | | | Controlled with the new console_layout_headers option
* | | Merge pull request #2375 from mhils/isattyMaximilian Hils2017-06-061-0/+9
|\ \ \ | | | | | | | | Always pretend to have a tty in tests
| * | | always pretend to have a tty in testsMaximilian Hils2017-06-051-0/+9
| |/ /
* | | Merge pull request #2379 from ujjwal96/kaitaiThomas Kriechbaumer2017-06-061-3/+5
|\ \ \ | | |/ | |/| Update png.py. Stop reading after IEND
| * | Update png.py. Stop reading after IENDUjjwal Verma2017-06-061-3/+5
| | |
* | | Merge pull request #2378 from ujjwal96/console-fixesThomas Kriechbaumer2017-06-062-2/+2
|\ \ \ | |/ / |/| | Fixes #2377 #2323
| * | Fixes #2377 #2323Ujjwal Verma2017-06-062-2/+2
|/ /
* / [requires.io] dependency update on master branch (#2373)Maximilian Hils2017-06-051-1/+1
|/
* add windows store experimentMaximilian Hils2017-06-044-0/+61
|
* check tty after options parsingThomas Kriechbaumer2017-06-042-5/+6
|
* check for tty when running mitmproxyThomas Kriechbaumer2017-06-041-1/+7
|
* Merge pull request #2367 from mhils/issue-2329Thomas Kriechbaumer2017-06-025-13/+64
|\ | | | | Fix #2329
| * minor improvementsMaximilian Hils2017-06-024-12/+21
| |
| * fix #2329Maximilian Hils2017-06-012-1/+43
| |
* | Fixes #2230 (#2361)Ujjwal Verma2017-06-024-28/+62
| |
* | Merge pull request #2365 from MatthewShao/jest-devMaximilian Hils2017-06-024-0/+95
|\ \ | |/ |/| [WIP][web] Add tests for components/ContentView
| * explain codemirror rendering shortcominsMaximilian Hils2017-06-021-0/+4
| |
| * [web] Update tests for js/components/ContentView/ContentViewOptions.jsxMatthew Shao2017-06-022-6/+3
| |
| * [web] Add tests for js/components/ContentView/ContentViewOptions.jsxMatthew Shao2017-06-013-1/+65
| |
| * [web] Add tests for js/components/ContentView/CodeEditor.jsxMatthew Shao2017-06-012-0/+30
| |
* | sync with PyWBXMLDecoder master branch (#2366)David Shaw2017-06-016-12/+12
|/
* Merge pull request #2359 from MatthewShao/jest-devMaximilian Hils2017-05-3114-2/+1458
|\ | | | | [web] Add tests for components/EventLog & components/FlowView
| * [web] Remove mock-xmlhttprequest dependency.Matthew Shao2017-05-312-5/+0
| |
| * [web] mock components/ContentViewMatthew Shao2017-05-312-30/+1
| |
| * [web] Add tests for js/components/FlowView/Messages.jsxMatthew Shao2017-05-312-0/+718
| |
| * [web] Add mock-xmlhttprequest as dependency.Matthew Shao2017-05-312-0/+5
| |
| * [web] Add tests for js/components/FlowView/ToggleEdit.jsxMatthew Shao2017-05-302-0/+57
| |
| * [web] Add tests for js/components/FlowView/Nav.jsxMatthew Shao2017-05-303-1/+75
| |
| * [web] Add tests for js/components/FlowView/Header.jsxMatthew Shao2017-05-303-1/+261
| |
| * [web] Add tests for js/components/FlowView/Details.jsxMatthew Shao2017-05-302-0/+324
| |
| * [web] Add tests for js/components/EventLog/EventList.jsxMatthew Shao2017-05-292-0/+52
| |
* | Update InstallBuilder (#2364)Maximilian Hils2017-05-311-6/+12
| | | | | | update InstallBuilder
* | [requires.io] dependency update on master branch (#2360)Maximilian Hils2017-05-311-2/+2
| |
* | Merge pull request #2363 from ujjwal96/test-coverageThomas Kriechbaumer2017-05-314-11/+32
|\ \ | |/ |/| Test coverage increase
| * Updated setup.cfgUjjwal Verma2017-05-311-2/+0
| |
| * Increase test coverageUjjwal Verma2017-05-313-9/+32
|/
* Merge pull request #2348 from MatthewShao/jest-devMaximilian Hils2017-05-2922-8/+1183
|\ | | | | [WIP][web] Add tests for js/components/Header