1c3a1a6aab
Authenticate action import_proforma_xml via OAuth2
...
- currently done manually, we should definitely consider a gem here
(doorkeeper)
- right now, the provided Bearer token from the Authorization header is
just looked up in the configured code harbor links of the current user,
if one is found -> authenticated -> exercise gets imported
(leoselig/codeocean#1 )
2016-02-12 11:11:09 +01:00
71dda088d1
Associate code harbor links with current user always
...
- this applies to creations and updates
- code harbor links are only every edited in the context of the
authenticated user
(leoselig/codeocean#1 )
2016-02-12 11:05:30 +01:00
68e74a9d85
Add association User has many CodeHarborLink
...
- add migration tht associates User with CodeHarborLink
- add belongs_to from CodeHarborLink to User
- changed CodeHarborLinkController#index to only serve current user's
CodeHarborLinks
(leoselig/codeocean#2 )
2016-02-04 12:38:46 +01:00
855abe25a6
Merge branch 'issue-1-codeharbor-endpoint'
2016-02-04 12:26:15 +01:00
f2a1a748d5
Replace CodeHarbourLink .erb wtih .slim templates
...
- this is consistent with the remaining view architecture
(leoselig/codeocean#2 )
2016-02-04 12:06:59 +01:00
e534a8cb2d
Add authorization to CodeHarborLink controller
...
(leoselig/codeocean#2 )
2016-02-04 11:42:03 +01:00
ca9a9c7e85
Merge branch 'master' of https://github.com/openHPI/codeocean
2016-02-04 11:02:56 +01:00
76bf3dd3f0
Scaffold CodeHarbourLink with field oauth2token
...
(leoselig/codeocean#2 )
2016-02-04 11:02:26 +01:00
92f6c7a06f
Revert "Add CodeHarborLink controller"
...
This reverts commit b5b8b3ab68leoselig/codeocean#2 )
2016-02-04 11:02:11 +01:00
b5b8b3ab68
Add CodeHarborLink controller
...
(leoselig/codeocean#2 )
2016-02-04 10:28:13 +01:00
aa8870b8c8
Add endpoint for import ( leoselig/codeocean#1 )
...
- currently route is still named /thin_common_cartridge
- points to exercise controller for simplicity (open for discussion)
2016-02-04 09:28:50 +01:00
491bcc9bde
Merge pull request #40 from openHPI/statistics
...
Statistics
2016-01-28 16:35:58 +01:00
4ee474a7d2
Speed up external user statistics
2016-01-28 14:46:25 +01:00
de84638979
Try to re-combine websocket message chunks containing an image tag.
2016-01-27 16:42:25 +01:00
5b8f710196
added standard deviations
2016-01-11 19:00:53 +01:00
cb98f6d0fa
Fix controller
2016-01-07 17:44:43 +01:00
e1e6eb04f4
Make user stats in exercise statistics faster
2016-01-07 17:01:47 +01:00
a508d47e3e
Retrieve user statistics in an execution environment for all exercises at once
2016-01-07 15:42:53 +01:00
943e3c6c3a
reworked execution_environment statistics
2016-01-07 13:19:02 +01:00
95ec5b0231
Routes, empty views and controller changes for statistics concerning external_users, exercises and external_users having exercises
2015-11-25 18:47:49 +01:00
41b2c80b39
Merge remote-tracking branch 'origin/master' into statistics
2015-11-19 16:01:53 +01:00
95c461a055
Hide parametrized run and test commands. Some logging changes, comment on possible thread code to release database connections, not sure whether necessary.
2015-11-08 12:37:11 +01:00
b29a41e693
some more logging
2015-11-03 17:34:34 +01:00
6a41e7dde4
Merge remote-tracking branch 'origin/master' into statistics
2015-11-03 16:13:39 +01:00
ef60494911
some more logging (and cleanup)
2015-10-29 16:27:12 +01:00
78422647fe
Add execution environment statistics
2015-10-29 14:19:31 +01:00
30d0270744
Show correct timeout message on timeout. Do not show a message on valid exit.
2015-10-21 17:18:28 +02:00
e88520f43b
corrected log message.
2015-10-19 15:50:58 +02:00
0b9cda4f84
Fix container pooling #2
2015-10-19 15:13:42 +02:00
56f2cc221a
filter and hide run_command and test_command in websocket message
2015-09-25 12:53:45 +02:00
10da12f950
option to hide the file tree in exercises.
2015-09-22 18:22:25 +02:00
13be0f65dd
Improve error and output handling
...
Display websocket and container status messages as well as line feeds
to the user.
2015-09-16 19:14:36 +02:00
81aa5d5d8f
Fixed submission-scoring.
...
Added parsing of exit cmd.
2015-09-16 18:34:04 +02:00
e6eeebfd4b
Filter and colour output, handle exit properly
2015-09-15 19:34:22 +02:00
c8253a6ba0
Manually merge changes from webpython branch.
2015-09-15 16:55:16 +02:00
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
e14ee6def3
Merge branch 'master' into rt/comments
...
Conflicts:
app/assets/javascripts/editor.js
2015-08-31 19:23:53 +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
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
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
69f7a93609
added submission id to error entries
2015-06-08 14:50:13 +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
