Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | Merge pull request #2406 from ujjwal96/tls-parser | Thomas Kriechbaumer | 2017-06-22 | 3 | -16/+4 | |
|\ \ \ \ \ | |_|_|/ / |/| | | | | Removed redundant type | |||||
| * | | | | Removed redundant type | Ujjwal Verma | 2017-06-22 | 3 | -16/+4 | |
|/ / / / | ||||||
* | | | | Merge pull request #2401 from ujjwal96/ip-formatting | Thomas Kriechbaumer | 2017-06-17 | 1 | -3/+3 | |
|\ \ \ \ | | |/ / | |/| | | Fix ip formatting in websocket messages | |||||
| * | | | Fix ip formatting in websocket messages | Ujjwal Verma | 2017-06-18 | 1 | -3/+3 | |
|/ / / | ||||||
* | | | minor fixes for windows package | Maximilian Hils | 2017-06-14 | 4 | -11/+5 | |
| | | | ||||||
* | | | Merge pull request #2397 from cortesi/neverenoughconsole | Aldo Cortesi | 2017-06-14 | 8 | -458/+675 | |
|\ \ \ | | | | | | | | | console: keymap-related improvements | |||||
| * | | | console: keybindings tweaks | Aldo Cortesi | 2017-06-14 | 2 | -7/+10 | |
| | | | | | | | | | | | | | | | | | | | | - consistent sort order - preserve help on edit | |||||
| * | | | console: add console.key.edit.focus, bind to "enter" | Aldo Cortesi | 2017-06-14 | 2 | -4/+23 | |
| | | | | ||||||
| * | | | console: add console.key.execute.focus, bind to x | Aldo Cortesi | 2017-06-14 | 2 | -2/+16 | |
| | | | | ||||||
| * | | | console: add console.key.unbind.focus, bind "d" key in keymap editor | Aldo Cortesi | 2017-06-14 | 4 | -6/+42 | |
| | | | | ||||||
| * | | | console: console.key.bind console.key.unbind commands | Aldo Cortesi | 2017-06-14 | 7 | -19/+147 | |
| | | | | ||||||
| * | | | console: use master.shutdown rather than raising urwid.ExitMainLoop | Aldo Cortesi | 2017-06-13 | 1 | -2/+1 | |
| | | | | ||||||
| * | | | console: extract console addons into consoleaddons.py | Aldo Cortesi | 2017-06-13 | 2 | -426/+430 | |
| | | | | ||||||
| * | | | console: keymap - list keys with modifiers separately | Aldo Cortesi | 2017-06-13 | 2 | -4/+7 | |
| | | | | ||||||
| * | | | console: teach keymap to understand "space" | Aldo Cortesi | 2017-06-13 | 3 | -8/+19 | |
|/ / / | | | | | | | | | | Urwid uses " ", which is not a great user experience. | |||||
* | | | Merge pull request #2394 from cortesi/moarconsole | Aldo Cortesi | 2017-06-13 | 15 | -33/+211 | |
|\ \ \ | | | | | | | | | Misc console-related improvements | |||||
| * | | | console: key binding viewer | Aldo Cortesi | 2017-06-13 | 8 | -13/+157 | |
| | | | | | | | | | | | | | | | | Read-only for now. | |||||
| * | | | view: show a message if we remove more than one flow from view | Aldo Cortesi | 2017-06-13 | 2 | -0/+12 | |
| | | | | ||||||
| * | | | commands: teach parser correct annotations for variable args | Aldo Cortesi | 2017-06-13 | 4 | -9/+13 | |
| | | | | | | | | | | | | | | | | We should annotate with the base type, not the resulting sequence. | |||||
| * | | | core: set command can now take multiple values | Aldo Cortesi | 2017-06-13 | 2 | -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 comments | Aldo Cortesi | 2017-06-13 | 2 | -0/+6 | |
| | | | | ||||||
| * | | | Minor: formatting, make default color scheme solarized-dark | Aldo Cortesi | 2017-06-13 | 2 | -11/+21 | |
|/ / / | ||||||
* | | | Merge pull request #2393 from ujjwal96/streaming-test | Ujjwal Verma | 2017-06-13 | 1 | -0/+37 | |
|\ \ \ | | | | | | | | | Test for streaming | |||||
| * | | | Test for streaming | Ujjwal Verma | 2017-06-12 | 1 | -0/+37 | |
|/ / / | ||||||
* | | | Merge pull request #2392 from mhils/web-fixes | Maximilian Hils | 2017-06-12 | 10 | -576/+904 | |
|\ \ \ | |/ / |/| | | [web] Update dependencies, minor fixes | |||||
| * | | [web] update dependencies | Maximilian Hils | 2017-06-12 | 4 | -560/+879 | |
| | | | ||||||
| * | | [web] fix contentviews, simplify related logic | Maximilian Hils | 2017-06-12 | 3 | -8/+13 | |
| | | | ||||||
| * | | [web] fix stopEdit | Maximilian Hils | 2017-06-12 | 3 | -8/+12 | |
| | | | ||||||
* | | | Merge pull request #2390 from ograff/remove_private_key_pkcs12 | Thomas Kriechbaumer | 2017-06-12 | 1 | -0/+6 | |
|\ \ \ | | | | | | | | | Remove private key from PKCS12 file | |||||
| * | | | Remove private key from PKCS12 file | Oliver Graff | 2017-06-12 | 1 | -0/+6 | |
| | | | | | | | | | | | | | | | | Fixes #2349 | |||||
* | | | | Merge pull request #2376 from MatthewShao/jest-dev | Maximilian Hils | 2017-06-12 | 22 | -82/+700 | |
|\ \ \ \ | |/ / / |/| / / | |/ / | [WIP][web] Add tests for components/ContentView (con't) | |||||
| * | | [web] Update ContentLoader class name. | Matthew Shao | 2017-06-12 | 2 | -80/+81 | |
| | | | ||||||
| * | | [web] Export PureViewServer in ContentView/ContentView.jsx | Matthew Shao | 2017-06-08 | 1 | -3/+3 | |
| | | | ||||||
| * | | [web] Add tests for js/components/ContentView/ContentView.jsx | Matthew Shao | 2017-06-08 | 2 | -0/+137 | |
| | | | ||||||
| * | | [web] Add tests for js/components/ContentView/ContentLoader.jsx | Matthew Shao | 2017-06-08 | 2 | -0/+86 | |
| | | | ||||||
| * | | [web] Add mock-xmlhttprequest dependency. | Matthew Shao | 2017-06-08 | 2 | -0/+5 | |
| | | | ||||||
| * | | [web] Add tests for js/components/ContentView/ViewSelector.jsx | Matthew Shao | 2017-06-06 | 3 | -1/+162 | |
| | | | ||||||
| * | | [web] Add tests for js/components/ContentView/UploadContentButton.jsx | Matthew Shao | 2017-06-06 | 3 | -0/+32 | |
| | | | ||||||
| * | | [web] Imporve indentation. | Matthew Shao | 2017-06-06 | 1 | -5/+5 | |
| | | | ||||||
| * | | [web] Add tests for js/components/ContentView/ShowFullContentButton.jsx | Matthew Shao | 2017-06-05 | 3 | -1/+65 | |
| | | | ||||||
| * | | [web] Add tests for js/components/ContentView/MetaViews.jsx | Matthew Shao | 2017-06-05 | 2 | -0/+103 | |
| | | | ||||||
| * | | [web] Add tests for js/components/ContentView/DownloadContentButton.jsx | Matthew Shao | 2017-06-05 | 3 | -0/+29 | |
| | | | ||||||
* | | | Merge pull request #2389 from ujjwal96/test-coverage | Thomas Kriechbaumer | 2017-06-11 | 2 | -2/+38 | |
|\ \ \ | | | | | | | | | Tests for Proxy config | |||||
| * | | | tests for Proxy config | Ujjwal Verma | 2017-06-12 | 2 | -2/+38 | |
|/ / / | ||||||
* | | | Merge pull request #2388 from cortesi/consolebits | Aldo Cortesi | 2017-06-11 | 19 | -246/+70 | |
|\ \ \ | | | | | | | | | A few console-related bits and bobs | |||||
| * | | | console: console.eventlog.clear command, bind to "z" by default | Aldo Cortesi | 2017-06-11 | 6 | -6/+19 | |
| | | | | ||||||
| * | | | console: extract "enter" to m_select | Aldo Cortesi | 2017-06-11 | 12 | -131/+18 | |
| | | | | | | | | | | | | | | | | Regularise, kill dead code, remove keybindings now not needed. | |||||
| * | | | console: delete stale help code | Aldo Cortesi | 2017-06-11 | 2 | -30/+0 | |
| | | | | ||||||
| * | | | console: extract "tab" to m_next pseudo-key | Aldo Cortesi | 2017-06-11 | 8 | -73/+16 | |
| | | | | | | | | | | | | | | | | | | | | This makes tab work consistently across contexts, makes it globally bindable, and gets rid of an un-needed command. | |||||
| * | | | console: Make global nav keys work within help | Aldo Cortesi | 2017-06-11 | 2 | -6/+17 | |
| | | | |