Commit Graph

196 Commits

Author SHA1 Message Date
d292fec47c Code Cleanup: Usage of Polymorphic User instead of ExternalUser and InternalUser
Renamed requestor_user_id -> user_id
Index of request_for_comments now returns the n (5?) newest requests per user. Solved via sliding windows in postgres, code added to model.
Added route to /my_request_for_comments/ that shows all requests for the current user.
Changed view from ERB to slim
2015-09-04 14:05:30 +02:00
1dab25b636 fixed broken merge... 2015-08-31 19:43:16 +02:00
67b0c9a930 Merge branch 'master' into rt/comments
Conflicts:
	app/assets/javascripts/editor.js
2015-08-31 19:34:49 +02:00
5650cf25b6 some bugfixes concerning comments, add first code for learning analytics 2015-08-31 19:33:03 +02:00
e14ee6def3 Merge branch 'master' into rt/comments
Conflicts:
	app/assets/javascripts/editor.js
2015-08-31 19:23:53 +02:00
43d2428ca1 some bugfixes concerning comments, add first code for learning analytics 2015-08-31 19:19:19 +02:00
73d01df9b7 copy and paste detection, + some cleanup 2015-08-27 17:38:42 +02:00
44cb0150cc removed the last(100) filter on the index method of submission, since it did not work this way. ToDo: check whether this breaks anything, discuss with JanR. 2015-08-26 11:52:52 +02:00
b417231c12 a more defensive version of scoring to please the tests.. 2015-08-26 11:51:33 +02:00
dc0b3a2294 cleanup of passed parameters, user_id and user_type are extracted from current user and not used from the passed POST values.. 2015-08-19 15:35:25 +02:00
e520914385 Some correction of column names.
Support for internal as well as external users. Added column user_type and used it where necessary
2015-08-18 17:44:31 +02:00
512e90ebd7 Show correct usernames on comments, have correct linenumbers on request_for_comments 2015-08-18 16:32:56 +02:00
aa64d0be43 Merge remote-tracking branch 'origin/master' into rt/comments 2015-08-13 15:57:20 +02:00
b4527aef50 implemented autosave, save button is now hidden. there is a label to show the last save timestamp. Code is saved on browser close. 2015-08-12 17:38:34 +02:00
e49f0dc063 hide run success message, adjust wording of locales for run success and run failure (run_success, run_failure) 2015-08-07 16:13:35 +02:00
eec5832a65 allow requesting comments only once per submission 2015-08-04 15:16:06 +02:00
c67c6e38f7 Merge branch 'master' into rt/comments
Conflicts:
	app/views/exercises/_editor_file_tree.html.slim
2015-07-16 15:19:31 +02:00
1d93e854f0 Merge branch 'master' of github.com:openHPI/codeocean 2015-07-16 15:10:59 +02:00
06131e6e63 Remove logic to find newest submission for an exercise and user. This is no longer necessary, since we update the file ids in editor.js 2015-07-09 16:08:26 +02:00
81d2d69d11 Display request for comments button if we are working on a non binary submission. Introduced needed data attributes for that and assigned them to the frame (instead of the editor). Data Attributes get updated by the CreateSubmissionCallback. Adjusted comment checks to also use the attributes of the frame. 2015-07-09 12:03:03 +02:00
a49ffc978b only allow comments on submissions, not on templates 2015-06-26 18:25:03 +02:00
283bfb38d6 Merge branch 'master' into rt/comments 2015-06-26 10:59:45 +02:00
04a22392b6 some cleanup 2015-06-26 10:59:12 +02:00
8ad787b3fc check whether QaApi is defined before accessing it to prevent page load failure 2015-06-25 11:42:28 +02:00
3e04222367 setting correct ids for the files in the editor after creating a new submission. Still a bit clumsy concerning the passed json parameters, but does the job. 2015-06-24 20:22:53 +02:00
6229b5de8d re-activate copying of comments, and also show comments of original file author in show method 2015-06-24 20:21:02 +02:00
fc68b3b3b0 Merge remote-tracking branch 'origin/master' 2015-06-17 15:30:04 +02:00
635ab6a7d6 Merge branch 'master' of https://github.com/openHPI/codeocean 2015-06-08 14:53:33 +02:00
69f7a93609 added submission id to error entries 2015-06-08 14:50:13 +02:00
41175656c4 HIde submit button if task is expired 2015-06-03 16:57:33 +02:00
5d767d3de0 Comment code via popovers 2015-05-05 13:52:53 +02:00
4fa8f811cf internationalization and feedback for RFC button 2015-05-05 11:23:31 +02:00
cf19dfa7a2 Matrix Support 2015-04-30 18:22:20 +02:00
13f13f5ecb Only show max the last 100 in UI cause fetching all breaks the app. 2015-04-28 18:44:00 +02:00
89683dab9d Try to fix bug 2015-04-28 17:11:06 +02:00
c1fdc30c7e Disable copy comments for now 2015-04-28 17:05:04 +02:00
c39fd9d6ce Revert stuff 2015-04-28 16:48:52 +02:00
23ddfaca11 current_user nil not false 2015-04-28 16:12:43 +02:00
2480c51c2b Cleanup logs 2015-04-28 16:02:22 +02:00
ea027656b7 Nicer fetch of empty relations 2015-04-28 14:20:21 +02:00
0447b076c6 set user_type correct for comments 2015-04-27 17:59:28 +02:00
725fd00256 removed new relic logging (caused errors) 2015-04-27 17:59:03 +02:00
72d96078af remove request-for-comments buttons 2015-04-27 11:20:10 +02:00
707c40a65b some more logging for missing @current_user 2015-04-27 10:52:23 +02:00
cc400989ee added ids to new relic error messages 2015-04-24 18:12:42 +02:00
f55fecba9d added more new relic debugging in submission_scoring.rb 2015-04-24 17:12:31 +02:00
3307ebbabb adedd new relic debugging to normalized_score 2015-04-24 16:28:51 +02:00
8697c8b23a Added mor new relic debugging 2015-04-23 18:14:20 +02:00
222783ef75 added som new relic debug messages 2015-04-23 17:39:18 +02:00
2d7c2945df fixed percentage method to reflect the new normalized_score method 2015-04-23 17:24:11 +02:00