Commit Graph

44 Commits

Author SHA1 Message Date
c5c42ca3bc Show list of feedback messages for specific exercises 2017-11-08 22:31:01 +01:00
9bebbe9a6c Merge remote-tracking branch 'origin/master' into error-info
# Conflicts:
#	app/controllers/concerns/submission_scoring.rb
#	app/views/application/_navigation.html.slim
#	config/locales/de.yml
#	config/locales/en.yml
#	db/schema.rb
2017-10-15 17:02:19 +02:00
44a3cabe98 Scaffold exercise collection routes 2017-09-27 16:08:56 +02:00
cea2781417 Implement unsubscribe route to delete subscriptions 2017-09-13 11:57:34 +02:00
954917d5a0 Add routes for subscriptions 2017-09-13 07:55:00 +02:00
6aaa0f3bca Remove code to delete all comments on one line and restore default delete route for comments 2017-08-25 18:15:02 +02:00
530e727d6e Merge remote-tracking branch 'origin/master' into error-info 2017-08-23 14:51:53 +02:00
726ef31ee7 Add new route to view all RFCs the user has commented on 2017-08-13 15:01:11 +02:00
28605fbe9b Support adding and removing attributes of error templates 2017-07-12 21:25:18 +02:00
0c8c8562f5 Scaffold error template attributes 2017-07-12 11:58:18 +02:00
4d38195c99 Scaffold error_templates UI 2017-07-12 10:11:52 +02:00
f0fb52d92a Add thank you note to rfc 2017-06-08 16:46:15 +02:00
5949d1208e Merge branch 'master' into client-routesv2 2017-04-25 13:50:08 +02:00
73c3b902a3 save progress. added user feedback view and stuff 2017-04-11 15:00:35 +02:00
3f398c6047 add feedback for exercises 2017-03-30 22:06:17 +02:00
8dad3a68e7 removed searches route 2017-03-22 10:06:40 +01:00
b05bb27ed9 search is now saved asynchron and without a form which caused some redirection through searches_controller
added asynchronous save of search, removed searches_controller,
2017-03-21 14:37:32 +01:00
695b8946f6 added search intervention. search opens new tab with search in the java course (at least in chrome)
send only 3 interventions per exercise at maximum
2017-03-21 10:31:33 +01:00
3d7f5bdf1a added intervention controller and stuff 2017-03-21 10:31:32 +01:00
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
3562aa9103 create remote evaluation 2017-02-02 18:14:33 +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