Commit Graph

342 Commits

Author SHA1 Message Date
87901bd89b Merge branch 'master' into score-websocket
Conflicts:
	app/assets/javascripts/editor.js.erb
2016-07-28 15:32:22 +02:00
ed3526a578 Merge branch 'master' into feature-file-templates
Conflicts:
	app/views/application/_navigation.html.slim
	config/locales/de.yml
	config/locales/en.yml
	db/schema.rb
2016-07-28 15:16:11 +02:00
f61b696e6a cleanup5 2016-07-25 16:45:45 +02:00
0aa63d8b8a cleanup4 2016-07-25 16:44:35 +02:00
615aa841d9 cleanup3 2016-07-25 16:42:51 +02:00
f43b4acf74 cleanup2 2016-07-25 16:05:13 +02:00
b11c319e7c cleanup 2016-07-25 16:04:04 +02:00
9c1b221fba working icons 2016-07-25 15:59:48 +02:00
09533a5556 download complete submission as one zip file 2016-07-15 18:25:58 +02:00
8282820974 removed requested_at
partly using submission_id
some cleanup
2016-07-14 16:22:22 +02:00
f5868a4fa2 merge master 2016-07-14 13:22:24 +02:00
52fd18c80e working pagedown!!!! 2016-07-13 16:45:54 +02:00
bff02a3005 test view 2016-07-13 16:08:12 +02:00
f4abc1fec3 change gem and add preview 2016-07-13 15:14:38 +02:00
00cdbf00f8 editor 2016-07-13 14:48:25 +02:00
223df2ffa8 some cleanup of request for comments. Work in progress.
Noticed a flaw when fetching the last submission, which is caused by timezone differences. First step to solve this.
Existing Request for Comments still need to be updated with their current submissionId, the SQL to do that is not yet finished.
2016-07-04 17:44:22 +02:00
357ffeb609 first commit 2016-06-30 11:33:46 +02:00
6e7c250ad1 revert collapsed file forms in edit mode, this caused too much trouble. Added some comments concerning that. 2016-06-29 15:38:53 +02:00
c21bf3f3d3 Adapt Modernizr requires.. We no longer need eventsource 2016-06-17 19:24:04 +02:00
d29cf9cf61 Also support run output for QaApi 2016-06-17 19:22:25 +02:00
7c1be5594a also handle testcommand via websocket 2016-06-17 17:23:47 +02:00
96de763b83 Handle scoring presentation to client via websockets 2016-06-17 16:42:07 +02:00
5840b62692 2nd part of the fix. 2016-06-17 15:04:17 +02:00
003e89b230 x axis stuff 2016-06-17 15:03:07 +02:00
fbb83e3057 fix comparison problem caused by javascript comparisons based on Strings. ("1.00" <= "1.0" --> false) 2016-06-16 11:38:16 +02:00
e086a44a2b Merge pull request #57 from openHPI/percentage-instead-score
Percentage instead score
2016-06-15 17:09:21 +02:00
894f8abda2 round result to fixed 0 digits in percentage output 2016-06-15 12:03:34 +02:00
8ddf1e158e Fixed background and pen coloring on client side (javascript).
See: https://github.com/openHPI/codeocean/issues/59

Kudos to waywwaard.
2016-06-14 17:53:54 +02:00
d5b78c29da Fixed rounding issue caused by JavaScript and the conversion to String. 2016-06-14 17:19:52 +02:00
f2e2c232e4 round result to fixed 2 digits 2016-06-14 17:01:50 +02:00
4d2676fea7 Only show file templates which are available for the selected file type 2016-06-10 17:48:04 +02:00
1cd879bcb6 Scaffold file templates 2016-06-09 22:38:19 +02:00
52ba35d0e4 fixed graph sizing 2016-06-08 13:55:09 +02:00
cd005483ab removed incorrect array accesses. 2016-06-02 16:34:13 +02:00
3c8bd90e2b fix indexing for x axis 2016-06-02 15:40:18 +02:00
5ba980b316 Fix x-axis domain problem 2016-06-02 15:30:18 +02:00
2ff04cf59d fixed scaling of graphs 2016-06-02 15:27:36 +02:00
34c9d791f4 Finishing up graphs. Formatting and adding "Runs" lines. 2016-05-29 17:30:49 +02:00
e5b3d33228 delete spaces 2016-05-12 18:34:16 +02:00
d05ceac7a3 check if score is valid 2016-05-12 18:30:50 +02:00
d54d1dd3e8 Score given in percentage 2016-05-12 18:22:17 +02:00
6bb5b53bad Merge branch 'master' into john-graph
# Conflicts:
#	Gemfile
2016-05-12 16:02:38 +02:00
fa0d893c21 change gitignore and fixes to statistic graphs 2016-05-12 15:52:59 +02:00
6102d5eba4 updated graphs 2016-05-12 15:48:53 +02:00
3f517dca01 print stderr on score. 2016-05-03 14:55:51 +02:00
98afb71ba9 prevent request comment button to be shown on editors not beeing the first editor too early. 2016-05-03 08:32:27 +02:00
1f7f2865a0 Some cosmetic changes. Fade out of button after asking a question, some margin to avoid interference of the button with scrollbars, reduced timeframe upon appearance and changed modal window description text. 2016-05-01 12:12:46 +02:00
651609b673 Only show request for comments button after a delay 2016-04-30 14:25:47 +02:00
ee164b9e68 Fix I18n for request success message 2016-04-30 14:17:37 +02:00
7182dcd04e Send requests for comments with question 2016-04-30 13:47:47 +02:00