6174 Commits

Author SHA1 Message Date
f229a85603 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-03 19:04:38 +02:00
8e9f19f41d Merge pull request #20 from openHPI/rt/comments
Rt/comments
2015-09-02 16:17:50 +02:00
369d045466 Merge pull request #22 from loewis/master
Provide deployment into vagrant box. Closes #21.
2015-09-02 16:08:48 +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
4d5cefb7a3 Add shared folder. 2015-08-27 23:07:20 +02:00
8a38e08f98 Add code_ocean.yml to copied configuration. 2015-08-27 21:49:35 +02:00
1c795c0796 Provide deployment into vagrant box. Closes #21. 2015-08-27 21:18:16 +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
bc51948ada fixed some tests.. 2015-08-25 16:02:14 +02:00
8bb98dc8e9 fixed some errors concerning pooling, container cleanup, timeouts etc. 2015-08-21 16:32:25 +02:00
d1297609f8 Merge remote-tracking branch 'origin/master' into rt/comments 2015-08-21 14:45:02 +02:00
646e45700b some changes on logging output (better readability) 2015-08-21 14:43:57 +02:00
3f4eea9738 Update Added instruction about linux-paths to LOCAL_SETUP.md 2015-08-20 18:52:45 +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
5d753e1ed8 Merge commit '51fa137b9d5e36eb3ac569505f7d90ba43ca4ce6' into rt/comments 2015-08-04 15:14:12 +02:00
51fa137b9d try to delete volume dir of any killed execution dcontainer on container deletion 2015-07-27 16:07:57 +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
5c678ce703 Merge pull request #19 from flxw/master
merged flxws changes
2015-07-16 15:14:48 +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
6af614ca7c use stdout 2015-06-18 20:13:43 +02:00
278e30ccf8 Fix adapter 2015-06-18 19:34:28 +02:00
7f5a76038f Fix adapter 2015-06-18 19:04:35 +02:00
fc68b3b3b0 Merge remote-tracking branch 'origin/master' 2015-06-17 15:30:04 +02:00
35b2177c71 Add mocha adpater 2015-06-17 15:29:35 +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