Commit Graph

461 Commits

Author SHA1 Message Date
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
09533a5556 download complete submission as one zip file 2016-07-15 18:25:58 +02:00
39a253997d use submission from model 2016-07-14 16:59:42 +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
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
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
ddc78f334c fixed usage of Rails cache call. 2016-06-27 18:01:58 +02:00
2f3727fa4c Merge pull request #68 from openHPI/solved-attribute-for-rfc
Solved attribute for rfc
2016-06-27 16:48:10 +02:00
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
2a52b66daa rfc can now be solved.
show.html still needs to be finished
2016-06-24 16:44:34 +02:00
a2d92f1521 file ordering in show of exercises, collapse behavior 2016-06-24 16:41:51 +02:00
bd6d4c4d71 Syntax Highlighting for the Request for Comment View 2016-06-23 14:23:28 +02:00
34638feb50 Merge pull request #65 from openHPI/new_mail_on_comments
Mail on new comments
2016-06-22 13:07:39 +02:00
918da5270d added id for h4 holding the rfc-id
updated locales.
2016-06-22 13:06:35 +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
ec26a095f6 First working version of mails on comments. 2016-06-17 14:48:57 +02:00
80503a636a Merge branch 'master' into new_mail_on_comments 2016-06-16 16:34:10 +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
a0ecd1b6c9 Merge pull request #58 from openHPI/submit-button
Submit button
2016-06-15 17:08:33 +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
fef14d836c Merge pull request #56 from openHPI/collapsing-change
Collapsing change + sorted alphabetically
2016-06-14 16:48:45 +02:00
7ef401f75a Add navigation item for file templates 2016-06-10 18:15:37 +02:00
8d030e42e9 Allow templates to include the file name as a macro 2016-06-10 18:08:57 +02:00
4d2676fea7 Only show file templates which are available for the selected file type 2016-06-10 17:48:04 +02:00
c10b07690a Make file template optional 2016-06-10 13:46:13 +02:00
4f8feb38e1 Use file template to generate new file content 2016-06-10 13:41:38 +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
34826cc406 merge 2016-06-08 13:54:39 +02:00
a75227c8f7 Don't call author policy if author is missing 2016-06-08 11:49:34 +02:00
c8b21dd7ea first steps for new mails on comments. 2016-06-03 15:26:24 +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
8158d60d30 also write "parsable json" to the frontend console if it does not have a valid command set (solves the issue when just printing an array in java, it is not shown anywhere). 2016-06-01 11:30:42 +02:00
b6cd797772 Show displayname instead of username in request_for_comment 2016-05-31 11:17:11 +02:00
34c9d791f4 Finishing up graphs. Formatting and adding "Runs" lines. 2016-05-29 17:30:49 +02:00
f5aa3cef3c Problem when no files solved 2016-05-12 19:03:17 +02:00
d26d859df1 resolve confilts 2016-05-12 18:45:14 +02:00
a2e1b08730 delete duplicate depleted 2016-05-12 18:40:42 +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