Commit Graph

482 Commits

Author SHA1 Message Date
yqbk
41b0c1e530 solve extension probelm 2016-08-03 17:21:49 +02:00
yqbk
605f64395f Merge remote-tracking branch 'origin/master' into rspec-tests-controllers 2016-08-03 16:24:28 +02:00
rteusner
778b2cdd63 Merge pull request #79 from openHPI/dropdown3
implement dropdown menu
2016-08-03 14:39:31 +02:00
yqbk
37aac677d1 remove author 2016-08-03 14:37:55 +02:00
yqbk
bc8abf851d remove statistics 2016-08-03 14:35:15 +02:00
yqbk
b72b595388 implement dropdown menu 2016-08-03 14:32:01 +02:00
yqbk
4183a16178 merge with master 2016-08-03 12:09:58 +02:00
Ralf Teusner
79309f6697 prevent printing out "undefined" if no container could be fetched and thus the response has no stdout or stderr. 2016-07-28 15:49:23 +02:00
Ralf Teusner
87901bd89b Merge branch 'master' into score-websocket
Conflicts:
	app/assets/javascripts/editor.js.erb
2016-07-28 15:32:22 +02:00
Ralf Teusner
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
Ralf Teusner
09533a5556 download complete submission as one zip file 2016-07-15 18:25:58 +02:00
Ralf Teusner
39a253997d use submission from model 2016-07-14 16:59:42 +02:00
Ralf Teusner
8282820974 removed requested_at
partly using submission_id
some cleanup
2016-07-14 16:22:22 +02:00
Ralf Teusner
f5868a4fa2 merge master 2016-07-14 13:22:24 +02:00
Ralf Teusner
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
Ralf Teusner
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
Ralf Teusner
ddc78f334c fixed usage of Rails cache call. 2016-06-27 18:01:58 +02:00
rteusner
2f3727fa4c Merge pull request #68 from openHPI/solved-attribute-for-rfc
Solved attribute for rfc
2016-06-27 16:48:10 +02:00
Ralf Teusner
2ff12dbeb6 Cached displaynames of users
Added solved state and #comments to index of request_for_comments
Added translations
2016-06-27 16:46:26 +02:00
Ralf Teusner
2a52b66daa rfc can now be solved.
show.html still needs to be finished
2016-06-24 16:44:34 +02:00
Ralf Teusner
a2d92f1521 file ordering in show of exercises, collapse behavior 2016-06-24 16:41:51 +02:00
Ralf Teusner
bd6d4c4d71 Syntax Highlighting for the Request for Comment View 2016-06-23 14:23:28 +02:00
rteusner
34638feb50 Merge pull request #65 from openHPI/new_mail_on_comments
Mail on new comments
2016-06-22 13:07:39 +02:00
Ralf Teusner
918da5270d added id for h4 holding the rfc-id
updated locales.
2016-06-22 13:06:35 +02:00
Ralf Teusner
c21bf3f3d3 Adapt Modernizr requires.. We no longer need eventsource 2016-06-17 19:24:04 +02:00
Ralf Teusner
d29cf9cf61 Also support run output for QaApi 2016-06-17 19:22:25 +02:00
Ralf Teusner
7c1be5594a also handle testcommand via websocket 2016-06-17 17:23:47 +02:00
Ralf Teusner
96de763b83 Handle scoring presentation to client via websockets 2016-06-17 16:42:07 +02:00
Ralf Teusner
5840b62692 2nd part of the fix. 2016-06-17 15:04:17 +02:00
John Geiger
003e89b230 x axis stuff 2016-06-17 15:03:07 +02:00
Ralf Teusner
ec26a095f6 First working version of mails on comments. 2016-06-17 14:48:57 +02:00
Ralf Teusner
80503a636a Merge branch 'master' into new_mail_on_comments 2016-06-16 16:34:10 +02:00
Ralf Teusner
fbb83e3057 fix comparison problem caused by javascript comparisons based on Strings. ("1.00" <= "1.0" --> false) 2016-06-16 11:38:16 +02:00
rteusner
e086a44a2b Merge pull request #57 from openHPI/percentage-instead-score
Percentage instead score
2016-06-15 17:09:21 +02:00
rteusner
a0ecd1b6c9 Merge pull request #58 from openHPI/submit-button
Submit button
2016-06-15 17:08:33 +02:00
yqbk
d921f90a65 solved logger error 2016-06-15 15:13:31 +02:00
yqbk
894f8abda2 round result to fixed 0 digits in percentage output 2016-06-15 12:03:34 +02:00
Ralf Teusner
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
Ralf Teusner
d5b78c29da Fixed rounding issue caused by JavaScript and the conversion to String. 2016-06-14 17:19:52 +02:00
yqbk
f2e2c232e4 round result to fixed 2 digits 2016-06-14 17:01:50 +02:00
rteusner
fef14d836c Merge pull request #56 from openHPI/collapsing-change
Collapsing change + sorted alphabetically
2016-06-14 16:48:45 +02:00
yqbk
195fd9c3f9 submission controller spec - problem with Rails.logger.error 2016-06-14 16:07:44 +02:00
yqbk
4e5c3ba071 In files_controller.rb: deleted .file_extension call due to the error: undefined method `file_extension' for nil:NilClass 2016-06-14 12:25:23 +02:00
Maximilian Grundke
7ef401f75a Add navigation item for file templates 2016-06-10 18:15:37 +02:00
Maximilian Grundke
8d030e42e9 Allow templates to include the file name as a macro 2016-06-10 18:08:57 +02:00
Maximilian Grundke
4d2676fea7 Only show file templates which are available for the selected file type 2016-06-10 17:48:04 +02:00
Maximilian Grundke
c10b07690a Make file template optional 2016-06-10 13:46:13 +02:00
Maximilian Grundke
4f8feb38e1 Use file template to generate new file content 2016-06-10 13:41:38 +02:00
Maximilian Grundke
1cd879bcb6 Scaffold file templates 2016-06-09 22:38:19 +02:00
John Geiger
52ba35d0e4 fixed graph sizing 2016-06-08 13:55:09 +02:00