Commit Graph

204 Commits

Author SHA1 Message Date
6cec69d7b9 Update locales 2017-06-12 13:43:03 +02:00
e43b71bd7f Allow to hide thank you note 2017-06-09 14:46:20 +02:00
eaac43ac63 Send e-Mail to all commenters if thank you note is given 2017-06-09 14:40:44 +02:00
f0fb52d92a Add thank you note to rfc 2017-06-08 16:46:15 +02:00
9a71405c49 Add thank you note frontend 2017-06-08 16:02:05 +02:00
5949d1208e Merge branch 'master' into client-routesv2 2017-04-25 13:50:08 +02:00
d706de28d9 adjusted locales 2017-04-18 17:02:35 +02:00
60e587b690 removed comment on exercise in the RFC view. redirect 10% of user instead of redirecting to the RFC view to the feedback view. redirect all users how submitted to the feedback view if score is less than 100% 2017-04-12 11:47:39 +02:00
3cf123c61e added working time estimation into user feedback 2017-04-12 10:57:44 +02:00
8ca944558c improved texts of feedback, added ok button 2017-04-12 10:13:23 +02:00
e4d28452bf save progress 2017-04-11 16:29:29 +02:00
73c3b902a3 save progress. added user feedback view and stuff 2017-04-11 15:00:35 +02:00
58f76f53e6 added a search for request_for_comments.
fixed translation of model for request_for_comments
2017-04-03 19:49:03 +02:00
3bf5e69f8d fixed links and a typo in rfc mails 2017-04-03 19:29:53 +02:00
73a7d9ef4d Merge pull request #110 from ThommyH/reduceInterventionAmount
do not show interventions on solved exercises, reduce to 2 interventions per day
2017-04-03 18:52:51 +02:00
cff46f963d added close button for requestForCommand-modal 2017-04-03 17:33:52 +02:00
13758747e2 extended rfc mails 2017-04-03 11:39:16 +02:00
655147a610 changes in comment for exercise text 2017-03-31 16:43:43 +02:00
3f398c6047 add feedback for exercises 2017-03-30 22:06:17 +02:00
420d8b3844 minor wording changes in locale for german beak intervention 2017-03-23 14:09:11 +01: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
bd0721da2e deleted search modal. reused roc modal for search modal. also added translations 2017-03-21 10:31:33 +01:00
c1209e4972 added translation for search bar 2017-03-21 10:31:33 +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
8f927d5ac9 some howto text for request_for_comment usage, changed background color of read-only editor. 2017-03-15 16:15:29 +01:00
dec45880b9 fix edge compatibility in docker config file (wss:// --> wss: ). also clean up hash removal of url and add docker.yml to the files to be deployed by capistrano 2017-03-07 18:09:31 +01:00
4a1721c6aa switch back from structure.sql to schema.rb 2017-02-22 17:20:26 +01:00
672303266e removed relative_url_root for staging environment.
The app can be accessed now via port 3000 instead of a subdirectory.
2017-02-06 20:38:11 +01:00
76c7ddae9b removed relative_url_root for staging environment.
The app can be accessed now via port 3000 instead of a subdirectory.
2017-02-06 20:30:22 +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
721c11bf28 fixed staging.rb according to rails update 2017-01-18 11:28:27 +01:00
d8fa661c90 changed back "action" to "to" in routes 2017-01-18 10:52:24 +01:00
dd4c789fed replaced session_paramerters with server params for security reasons
cleaned up comments
2017-01-12 15:10:34 +01:00
41a61a8507 Fixed the destroy session logic.
1. an exercise_id is provided ==> only the LtiParameter object for the current user, consumer, and exercise is deleted.
2. no exercise_id is provided ==> external user and consumer are removed from the session, all LtiParameter objects for this user and consumer are deleted.

This enables users to have several tabs with exercises open and submitting the results to the tool consumer.
When an exercise has been submitted, the user cannot use the back button to get back to CodeOcean and work on the submitted or any other exercise.
For now a warning has been added to the info text to tell users not to do this. (As the LtiParameters have been deleted, the points can no more be submitted to the consumer.)
@TODO disable/redirect back button?
2016-12-31 17:21:46 +01:00
ca28e0aa87 updated rails from 4.1.13 to 4.2.5. This is required for rails to make use of new features in postgres 9.5
@Ralf
TODO: migration /Users/groucho/Documents/HPI/workspace/Xikolo-CodeOcean/codeocean/db/migrate/20160204111716_add_user_to_code_harbor_link.rb
is broken. A reference is made to table users which does not exist.
Workaround: run rake db:schema:load before running db:migrate. Still this should be fixed.
2016-12-31 00:05:23 +01:00
f82737a7d4 some small changes to staging environment (no caching and eager loading, some more errors). 2016-12-19 15:08:51 +01:00
66de024195 enhance staging mode in order to show errors and web_console 2016-11-24 14:46:18 +01:00
442b405927 added support for better_errors in virtual machines. If you want to use it, set the environment variable "TRUSTED_IP", for example: export TRUSTED_IP=192.168.59.3 2016-11-24 11:58:32 +01:00
bfa12899a5 adjust german locales to comply with the standard form of address 2016-11-09 18:09:24 +01:00
1511941d3d Merge branch 'master' into editor-frontend-refactor
Conflicts:
	codeocean-dockerconfig.md
2016-11-09 18:00:40 +01:00
ff7446fde6 redirect to RFCs on max score: redirect users to their own RFCs if they are open, fixed wrong usage of user_id (external_id is not used in RFCs, normal id has to be used!). 2016-11-09 17:58:10 +01:00
e8f93cb870 Removed bin folder from linked_dirs in deploy, otherwise no rails console can be started on the servers, because the directory will be empty (as stated on several stackoverflow questions, for example: http://stackoverflow.com/questions/29039927/rails-4-doesnt-detect-application-after-capistrano-deployment ) 2016-11-09 17:56:56 +01:00
1dfd6f61dc some more relative url roots in editor_edit, removed javascript uglifying for staging, added debug message for docker websocket connection url.
added doku for setting up docker daemon for codeocean
2016-10-07 14:16:24 +02:00
0f76b1cb90 Merge branch 'master' into editor-frontend-refactor
Conflicts:
	app/assets/javascripts/editor.js.erb
---> kept refactored one
2016-09-09 14:17:42 +02:00
8fe9303288 Merge pull request #80 from openHPI/recommend_request_for_comment
Some tidy up in request for comments (bugfix: removed leftover parts …
2016-09-09 14:12:47 +02:00
8f499b72da Feature: Auto-Completion in Source Code
+ allow flags for exercises
2016-09-07 17:34:20 +02:00