Commit Graph

836 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
1332de950d Merge pull request #75 from openHPI/download-submission-backend
download complete submission as one zip file
2016-07-15 18:31:42 +02:00
09533a5556 download complete submission as one zip file 2016-07-15 18:25:58 +02:00
41370a8703 Merge pull request #74 from openHPI/rfc_cleanup
use submission from model
2016-07-15 16:18:44 +02:00
39a253997d use submission from model 2016-07-14 16:59:42 +02:00
2c429cfbff Merge pull request #72 from openHPI/rfc_cleanup
Rfc cleanup
2016-07-14 16:48:47 +02:00
519581f82a Merge branch 'master' into rfc_cleanup 2016-07-14 16:37:44 +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
3bf03a418b fix policy scope statement for internal users 2016-07-10 22:00:42 +02:00
f80d1fc7fe fixed regex for java... 2016-07-07 15:22:20 +02:00
605042d2cf cleanup of code for linking stacktraces as suggested by tom. 2016-07-07 14:27:00 +02:00
53ecfdbc66 Merge pull request #71 from openHPI/trace_linking
On exit, augment the stacktrace and link it to the editors
2016-07-06 17:12:36 +02:00
1620bdd707 Merge pull request #70 from openHPI/teams-remove
Remove teams from the project
2016-07-06 17:02:09 +02:00
51b435251f Merge branch 'master' into teams-remove 2016-07-06 16:24:24 +02:00
4bb8c79150 typo in submissionS 2016-07-05 15:27:49 +02:00
16206cf58f restore one line 2016-07-04 17:56:57 +02:00
4651c87491 Testrun output is now shown when hovering over the status icons (round red or green circles) 2016-07-04 17:48:52 +02:00
eb1fc76a32 removed flowr hints for normal stdout 2016-07-04 17:47:49 +02:00
59536ab189 the migrations to the changes in schema.rb. 2016-07-04 17:46:37 +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
b962400fab further delete (db queries) 2016-07-04 17:40:01 +02:00
34fc1c4504 On exit, augment the stacktrace and link it to the editors 2016-07-04 17:36:26 +02:00
2bb1362520 further delete (spec files) 2016-07-04 16:59:30 +02:00
a98107479e remove additional files 2016-07-04 16:37:59 +02:00
19f214caf1 remove teams from databse 2016-07-04 16:36:23 +02:00
b0d468c0e0 remove rest of teams code -- NEED TO REMOVE TEAMS FROM DATABASE! 2016-06-30 12:17:19 +02:00
2ab0829cb3 remove team controller 2016-06-30 12:05:25 +02:00
0046706fce remove team policy 2016-06-30 12:04:16 +02:00
a1023eb9fa delete teams view 2016-06-30 12:02:44 +02:00
72def4a661 delete class team 2016-06-30 12:00:54 +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
516cab808e Merge branch 'master' of https://github.com/openHPI/codeocean 2016-06-27 16:49:52 +02:00
f54fce65bc added mini-profiler for development. 2016-06-27 16:49:11 +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
b7ce389961 Adapted locales so that german as well as english texts are now sent for every new comment. 2016-06-23 10:47:44 +02:00
e0eac20361 added some more line breaks to the mail bodys of mails on new comments. 2016-06-22 14:21:17 +02:00
83cf3b2321 added line breaks (<br> tags) in the email body. 2016-06-22 14:16:23 +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
83d5e82e31 Merge pull request #63 from openHPI/graph-fix
Graph fix
2016-06-17 15:13:22 +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