aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | Minor: formatting, make default color scheme solarized-darkAldo Cortesi2017-06-132-11/+21
|/ /
* | Merge pull request #2393 from ujjwal96/streaming-testUjjwal Verma2017-06-131-0/+37
|\ \
| * | Test for streamingUjjwal Verma2017-06-121-0/+37
|/ /
* | Merge pull request #2392 from mhils/web-fixesMaximilian Hils2017-06-1210-576/+904
|\ \ | |/ |/|
| * [web] update dependenciesMaximilian Hils2017-06-124-560/+879
| * [web] fix contentviews, simplify related logicMaximilian Hils2017-06-123-8/+13
| * [web] fix stopEditMaximilian Hils2017-06-123-8/+12
* | Merge pull request #2390 from ograff/remove_private_key_pkcs12Thomas Kriechbaumer2017-06-121-0/+6
|\ \
| * | Remove private key from PKCS12 fileOliver Graff2017-06-121-0/+6
* | | Merge pull request #2376 from MatthewShao/jest-devMaximilian Hils2017-06-1222-82/+700
|\ \ \ | |/ / |/| / | |/
| * [web] Update ContentLoader class name.Matthew Shao2017-06-122-80/+81
| * [web] Export PureViewServer in ContentView/ContentView.jsxMatthew Shao2017-06-081-3/+3
| * [web] Add tests for js/components/ContentView/ContentView.jsxMatthew Shao2017-06-082-0/+137
| * [web] Add tests for js/components/ContentView/ContentLoader.jsxMatthew Shao2017-06-082-0/+86
| * [web] Add mock-xmlhttprequest dependency.Matthew Shao2017-06-082-0/+5
| * [web] Add tests for js/components/ContentView/ViewSelector.jsxMatthew Shao2017-06-063-1/+162
| * [web] Add tests for js/components/ContentView/UploadContentButton.jsxMatthew Shao2017-06-063-0/+32
| * [web] Imporve indentation.Matthew Shao2017-06-061-5/+5
| * [web] Add tests for js/components/ContentView/ShowFullContentButton.jsxMatthew Shao2017-06-053-1/+65
| * [web] Add tests for js/components/ContentView/MetaViews.jsxMatthew Shao2017-06-052-0/+103
| * [web] Add tests for js/components/ContentView/DownloadContentButton.jsxMatthew Shao2017-06-053-0/+29
* | Merge pull request #2389 from ujjwal96/test-coverageThomas Kriechbaumer2017-06-112-2/+38
|\ \
| * | tests for Proxy configUjjwal Verma2017-06-122-2/+38
|/ /
* | Merge pull request #2388 from cortesi/consolebitsAldo Cortesi2017-06-1119-246/+70
|\ \
| * | console: console.eventlog.clear command, bind to "z" by defaultAldo Cortesi2017-06-116-6/+19
| * | console: extract "enter" to m_selectAldo Cortesi2017-06-1112-131/+18
| * | console: delete stale help codeAldo Cortesi2017-06-112-30/+0
| * | console: extract "tab" to m_next pseudo-keyAldo Cortesi2017-06-118-73/+16
| * | console: Make global nav keys work within helpAldo Cortesi2017-06-112-6/+17
* | | Merge pull request #2387 from cortesi/helptextAldo Cortesi2017-06-114-118/+147
|\| |
| * | console: Key binding helpAldo Cortesi2017-06-114-118/+147
* | | Merge pull request #2386 from cortesi/helpAldo Cortesi2017-06-1118-536/+390
|\| |
| * | console: auto-generate context key binding helpAldo Cortesi2017-06-1112-78/+111
| * | Keep emojis out of tox.iniAldo Cortesi2017-06-111-2/+2
| * | 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
| * | 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
| * | 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 heaadersAldo Cortesi2017-06-1010-12/+46
|/ /
* | Merge pull request #2375 from mhils/isattyMaximilian Hils2017-06-061-0/+9
|\ \
| * | 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 IENDUjjwal Verma2017-06-061-3/+5
* | | Merge pull request #2378 from ujjwal96/console-fixesThomas Kriechbaumer2017-06-062-2/+2
|\ \ \ | |/ / |/| |
| * | Fixes #2377 #2323Ujjwal Verma2017-06-062-2/+2
|/ /
* / [requires.io] dependency update on master branch (#2373)Maximilian Hils2017-06-051-1/+1
|/