Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | | | |||||
* | | | Merge pull request #2387 from cortesi/helptext | Aldo Cortesi | 2017-06-11 | 4 | -118/+147 |
|\| | | | | | | | | console: Key binding help | ||||
| * | | console: Key binding help | Aldo Cortesi | 2017-06-11 | 4 | -118/+147 |
| | | | | | | | | | | | | Add a help field to key bindings, use that in contextual help display. | ||||
* | | | Merge pull request #2386 from cortesi/help | Aldo Cortesi | 2017-06-11 | 18 | -536/+390 |
|\| | | | | | | | | console help | ||||
| * | | console: auto-generate context key binding help | Aldo Cortesi | 2017-06-11 | 12 | -78/+111 |
| | | | |||||
| * | | Keep emojis out of tox.ini | Aldo Cortesi | 2017-06-11 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | This breaks config parsers like the one used by flake8. Also... emojis? In a config file? | ||||
| * | | console: help - remove hardcoded help everywhere | Aldo Cortesi | 2017-06-11 | 7 | -205/+3 |
| | | | |||||
| * | | console: generalise grideditor help text, only show headers if we have them | Aldo Cortesi | 2017-06-11 | 1 | -15/+17 |
| | | | |||||
| * | | console: grideditor - re-add column headers | Aldo Cortesi | 2017-06-11 | 2 | -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 e | Aldo Cortesi | 2017-06-11 | 3 | -70/+72 |
| | | | |||||
| * | | console: overlays shouldn't clear window titles | Aldo Cortesi | 2017-06-11 | 2 | -7/+11 |
| | | | |||||
| * | | console: extract grideditor keybindings | Aldo Cortesi | 2017-06-11 | 12 | -148/+191 |
| | | | | | | | | | | | | Also formalise the LayoutWidget interface a bit | ||||
| * | | console: grideditors don't display their own titles anymore | Aldo Cortesi | 2017-06-10 | 1 | -10/+1 |
| | | | |||||
* | | | Merge pull request #2384 from cortesi/layouts | Aldo Cortesi | 2017-06-11 | 10 | -12/+46 |
|\| | | | | | | | | console: layout pane headers | ||||
| * | | console: layout pane heaaders | Aldo Cortesi | 2017-06-10 | 10 | -12/+46 |
|/ / | | | | | | | Controlled with the new console_layout_headers option | ||||
* | | Merge pull request #2375 from mhils/isatty | Maximilian Hils | 2017-06-06 | 1 | -0/+9 |
|\ \ | | | | | | | Always pretend to have a tty in tests | ||||
| * | | always pretend to have a tty in tests | Maximilian Hils | 2017-06-05 | 1 | -0/+9 |
| |/ | |||||
* | | Merge pull request #2379 from ujjwal96/kaitai | Thomas Kriechbaumer | 2017-06-06 | 1 | -3/+5 |
|\ \ | | | | | | | Update png.py. Stop reading after IEND | ||||
| * | | Update png.py. Stop reading after IEND | Ujjwal Verma | 2017-06-06 | 1 | -3/+5 |
| | | | |||||
* | | | Merge pull request #2378 from ujjwal96/console-fixes | Thomas Kriechbaumer | 2017-06-06 | 2 | -2/+2 |
|\ \ \ | |/ / |/| | | Fixes #2377 #2323 | ||||
| * | | Fixes #2377 #2323 | Ujjwal Verma | 2017-06-06 | 2 | -2/+2 |
|/ / | |||||
* / | [requires.io] dependency update on master branch (#2373) | Maximilian Hils | 2017-06-05 | 1 | -1/+1 |
|/ |