Commit Graph

24 Commits

Author SHA1 Message Date
0db11884bc Extended Exercises by worktime, difficulty and tags, added ProxyExercises as prework for recommendations
Tags can be added to exercises in the edit view. Tags can monitored under /tags.
Added the concept of ProxyExercises which are a collection of Exercises. They can be found under /proxy_exercises
Added Interventions as prework to show interventions later to the user.
Added exercise/[:id]/working_time to return the working time of the user in this exercise and the average working time of all users in this exercise
2017-03-21 10:31:32 +01:00
a4d8acf96d removed deprecated warnings again 2017-01-19 21:33:52 +01:00
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
b0d468c0e0 remove rest of teams code -- NEED TO REMOVE TEAMS FROM DATABASE! 2016-06-30 12:17:19 +02:00
2a52b66daa rfc can now be solved.
show.html still needs to be finished
2016-06-24 16:44:34 +02:00
4d2676fea7 Only show file templates which are available for the selected file type 2016-06-10 17:48:04 +02:00
1cd879bcb6 Scaffold file templates 2016-06-09 22:38:19 +02:00
f787445e5b Rename #import_thin_common_cartridge to #import_proforma_xml
- everywhere

(leoselig/codeocean#1)
2016-02-12 11:11:20 +01:00
855abe25a6 Merge branch 'issue-1-codeharbor-endpoint' 2016-02-04 12:26:15 +01:00
76bf3dd3f0 Scaffold CodeHarbourLink with field oauth2token
(leoselig/codeocean#2)
2016-02-04 11:02:26 +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
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
78422647fe Add execution environment statistics 2015-10-29 14:19:31 +01: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
9c8d0b01eb Fix reset of tasks 2015-04-20 22:30:31 +02:00
b8ec3edef2 Show requests for comments and begin work on a view for executing them 2015-03-27 18:10:47 +01:00
e31675f136 Commit just for you, Ralf :) 2015-03-27 10:32:10 +01:00
6ee0b6bf81 implemented partial batch update for exercises 2015-03-12 11:05:11 +01:00
7477d4c6dd transitionally downgraded to Rails 4.1 since activerecord-jdbcpostgresql-adapter is not fully compatible with Active Record 4.2 2015-03-02 15:04:37 +01:00
56acd4c3c3 updated to Rails 4.2 2015-02-18 10:41:26 +01:00
59ca0a57c3 administrator dashboard for observing the Docker container pool 2015-02-10 12:23:26 +01:00
dd624b26c8 started implementing teams 2015-01-28 12:28:09 +01:00
4cbf9970b1 transferred Code Ocean from original repository to GitHub 2015-01-22 10:01:32 +01:00