leo.selig
ca9a9c7e85
Merge branch 'master' of https://github.com/openHPI/codeocean
2016-02-04 11:02:56 +01:00
leo.selig
76bf3dd3f0
Scaffold CodeHarbourLink with field oauth2token
...
(leoselig/codeocean#2 )
2016-02-04 11:02:26 +01:00
leo.selig
92f6c7a06f
Revert "Add CodeHarborLink controller"
...
This reverts commit b5b8b3ab68
.
- next commit will do a complete scaffold
(leoselig/codeocean#2 )
2016-02-04 11:02:11 +01:00
leo.selig
b5b8b3ab68
Add CodeHarborLink controller
...
(leoselig/codeocean#2 )
2016-02-04 10:28:13 +01:00
Ralf Teusner
898074be3f
Added render command, outputs the content in a div.
2016-01-26 14:26:18 +01:00
Ralf Teusner
2a1862f39a
Merge branch 'master' into statistics
2016-01-25 11:22:58 +01:00
Ralf Teusner
3d6be859dd
removed duplicate code
2016-01-13 15:27:51 +01:00
Ralf Teusner
7a2e1bbc0f
Merge branch 'master' into statistics
2016-01-12 13:26:32 +01:00
Maximilian Grundke
e8cb23849a
Make tables sortable
2016-01-07 17:45:00 +01:00
Maximilian Grundke
8ddc41b852
Fix slider
2015-12-17 11:56:06 +01:00
rteusner
9bec415768
Merge pull request #35 from openHPI/statistics
...
Statistics
2015-12-16 16:40:05 +01:00
Maximilian Grundke
4cd8a501b1
Switch to fontawesome icons
2015-12-16 16:34:13 +01:00
Ralf Teusner
9eb464fdf6
Merge branch 'master' into fix-additional-line
2015-12-16 16:33:30 +01:00
Maximilian Grundke
d8fa2f3616
Merge remote-tracking branch 'origin/master' into statistics
2015-12-16 16:21:40 +01:00
Maximilian Grundke
d36e6fd991
Implement play button behavior
2015-12-16 16:14:28 +01:00
Ralf Teusner
8e90fbac26
re-enable setAnnotations
2015-12-15 17:29:50 +01:00
jprberlin
f9405e5100
Merge pull request #32 from openHPI/statistics
...
Statistics
2015-12-15 17:20:53 +01:00
Ralf Teusner
2fa5f7c281
Merge branch 'statistics' of https://github.com/openHPI/codeocean into statistics
2015-12-15 15:36:38 +01:00
Ralf Teusner
9449a8a77e
remove additional blank line
2015-12-15 15:35:11 +01:00
Tom Staubitz
38bfa4b1f5
Get websocket protocol from config file to avoid frustration in local installing
2015-12-12 00:43:04 +08:00
Tom Staubitz
943d5554d9
Remove @all_containers instead of @containers during cleanup
...
Also added some comments and todos
Also fixed debug messages in remove_from_all_containers
Also refactored duplicated code with extracted function
Also removed some commented lines of code
2015-12-12 00:41:26 +08:00
Maximilian Grundke
0f61a46764
Select the same file if possible
2015-12-10 15:54:51 +01:00
Maximilian Grundke
53330fbdc5
Make timeline entries clickable
2015-12-10 14:03:23 +01:00
Maximilian Grundke
842907f1fa
Make use of file types for highlighting and tabs
2015-12-10 13:48:31 +01:00
Maximilian Grundke
79e7f7b7e8
Apply some styling and add timeline
2015-12-10 12:49:36 +01:00
Maximilian Grundke
b7b0bf826e
Use only one editor to reduce complexity
2015-12-03 14:52:33 +01:00
Maximilian Grundke
efe3895894
Enable switching between files of a submission
2015-12-03 13:52:18 +01:00
Maximilian Grundke
5c5769bab2
Change file tree when changing submission
2015-12-02 17:01:31 +01:00
Maximilian Grundke
c0b4c17de6
Use custom lightweight editor and file-tree
2015-12-02 15:39:13 +01:00
Ralf Teusner
12f52c0cfc
fix canvasevent handling. A \n has to be sent after the actual payload.
2015-12-01 17:43:08 +01:00
Tom Staubitz
4597996a26
removed confirm message from submit results button
2015-11-28 17:13:02 +01:00
Maximilian Grundke
72b5fa3b8c
Cleanup code
2015-11-26 17:04:37 +01:00
Maximilian Grundke
baf33419cf
Update editor content on submission selection
2015-11-26 16:25:59 +01:00
Maximilian Grundke
bde7c21ead
Fix leaking interval creating potentially unlimited unwanted requests
2015-11-05 14:52:49 +01:00
Ralf Teusner
eb8c0e46fa
Some logging, some code simplification, clear canvas on start
2015-11-03 15:54:08 +01:00
Ralf Teusner
30d0270744
Show correct timeout message on timeout. Do not show a message on valid exit.
2015-10-21 17:18:28 +02:00
Ralf Teusner
889d7562f9
Show the input messages and set focus correct on input required.
2015-10-21 17:17:11 +02:00
rteusner
10c602b12d
Merge pull request #25 from openHPI/webpython-hybrid
...
Fixed container destruction
2015-10-19 15:55:53 +02:00
Ralf Teusner
8e8efcb8cc
use Modernizr to check whether websockets and server send events are supported
2015-10-16 17:10:50 +02:00
Ralf Teusner
6151afcb55
some I18n, stop command for server send event code (score), updated readme
2015-10-16 17:06:23 +02:00
Jan Renz
6223378413
use wss
2015-10-16 10:30:42 +02:00
Ralf Teusner
91cb2a3391
set correct newlines in output
2015-10-15 15:27:57 +02:00
Ralf Teusner
6672491bc3
commented out translation to line breaks, as they seem not to be needed (and corrected the linebreak tag), thanks to martin for hinting at this. Discuss with janusch why he needed this.
2015-09-25 12:19:13 +02:00
Ralf Teusner
632b41da23
editor has an option whether it should remember the last used tab and show it, or whether it should display the first tab. currently, it shows the first tab. (as users whished for this behaviour)
2015-09-25 12:13:08 +02:00
Ralf Teusner
caf47a9251
correct tab shortcuts (following the removal of the introduction tab)
2015-09-25 12:11:17 +02:00
Janusch Jacoby
13be0f65dd
Improve error and output handling
...
Display websocket and container status messages as well as line feeds
to the user.
2015-09-16 19:14:36 +02:00
Janusch Jacoby
e6eeebfd4b
Filter and colour output, handle exit properly
2015-09-15 19:34:22 +02:00
Janusch Jacoby
c8253a6ba0
Manually merge changes from webpython branch.
2015-09-15 16:55:16 +02:00
Ralf Teusner
1dab25b636
fixed broken merge...
2015-08-31 19:43:16 +02:00
Ralf Teusner
67b0c9a930
Merge branch 'master' into rt/comments
...
Conflicts:
app/assets/javascripts/editor.js
2015-08-31 19:34:49 +02:00