Commit Graph

1486 Commits

Author SHA1 Message Date
7887bdf30e Merge pull request #116 from ThommyH/fixProxyExercise
fix NaN exception if user attend spielweise
2017-04-12 13:37:04 +02:00
b9fb743cf8 fix NaN exception if user attend spielweise 2017-04-12 13:24:56 +02:00
51b4f1acbc redirect only external user to feedback page after submission 2017-04-12 11:49:47 +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
5002f9bbce allow iframe requests 2017-04-11 12:19:41 +02:00
341cd3a003 fix incomplete resizing of ace editors by triggering a resize event 2017-04-07 21:16:20 +02:00
4a8ed1d1fb show comments with breaks after 80 chars and tab subsequent lines in. 2017-04-07 21:15:52 +02:00
a8b88664a1 Merge pull request #113 from ThommyH/addInterventionToExternalUserStatistics
added intervention to statistics of exercises of external users
2017-04-06 16:43:40 +02:00
ade38f0e05 Merge pull request #112 from ThommyH/stopInterventionCounterOnLostFocus
stop intervention timer if user lost focus to the code ocean tab
2017-04-06 16:42:49 +02:00
870549944d added intervention to statistics of exercises of external users 2017-04-05 12:08:27 +02:00
cbaafa0383 stop intervention timer if user lost focus to the code ocean tab 2017-04-04 13:26:43 +02:00
6eea338f84 supply search object for my_request_for_comments 2017-04-04 11:08:20 +02:00
516d29d40d only redirect if there are less than 5 comments on a RFC yet. 2017-04-03 20:27:59 +02:00
a455305912 Merge pull request #111 from openHPI/set_rfc_solved_default_to_false
set request_for_comment.solved default to false and set all null valu…
2017-04-03 20:02:51 +02:00
b1f9f1cc92 set request_for_comment.solved default to false and set all null values in database for that attribute to false 2017-04-03 19:51:32 +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
686abd6fe0 3 interventions per day 2017-04-03 18:52:17 +02:00
5a099a42b8 changed working time calculation to only consider submissions within 5 minutes instead of 30 2017-04-03 18:09:30 +02:00
cff46f963d added close button for requestForCommand-modal 2017-04-03 17:33:52 +02:00
8197d40c6c fixed copy and paste error... 2017-04-03 17:20:50 +02:00
392dd77b4a do not show interventions on solved exercises
do not show more than 2 interventions per day
2017-04-03 17:17:34 +02:00
ce2823e871 restrict name to be set to lis_person_name_full (should be display name) or to lis_person_name_given (should be first name).
don't use xikolo api any longer for consumer openHPI, use the values in CodeOcean.
2017-04-03 15:26:02 +02:00
778ee7c374 correct the fallback 2017-04-03 15:16:41 +02:00
dc702f3d6e fix 2017-04-03 14:28:57 +02:00
1e6160fa4f Merge pull request #108 from openHPI/enhanced_rfc_mails
extended rfc mails
2017-04-03 13:23:43 +02:00
7222a10f8d Merge pull request #107 from openHPI/display_name_in_header
Display name in header
2017-04-03 13:23:09 +02:00
156d921145 removed the possibility that the name of external users might be in the displayname alltogether 2017-04-03 13:22:12 +02:00
75481d902b added a nil check for consumer. 2017-04-03 13:13:58 +02:00
59bbb3edeb set the default to_s of user to displayname 2017-04-03 11:45:39 +02:00
13758747e2 extended rfc mails 2017-04-03 11:39:16 +02:00
865bd59127 quickfix: wrong text on comment button. 2017-03-31 20:36:51 +02:00
8d70671b13 Merge pull request #106 from ThommyH/addUserFeatback
Add user featback
2017-03-31 16:44:06 +02:00
655147a610 changes in comment for exercise text 2017-03-31 16:43:43 +02:00
b0e7ebebea Merge pull request #105 from ThommyH/addBonusExerciseTesting
Add bonus exercise testing
2017-03-31 16:34:17 +02:00
af0cc8cdb0 changed button design 2017-03-30 22:10:02 +02:00
3f398c6047 add feedback for exercises 2017-03-30 22:06:17 +02:00
ed485f32e6 change mail sending 2017-03-30 19:02:09 +02:00
20c8a95a87 quickfix 2017-03-30 16:56:55 +02:00
ad29551bb4 added code to test bonus exercise with different descriptions. 2017-03-30 16:54:22 +02:00
a1b6927864 Merge pull request #104 from ThommyH/fixAccumulated_working_time_for_only
quickfixed not working Exercise.accumulated_working_time_for_only(user)
2017-03-30 15:48:49 +02:00
d4a9df709a quickfixed not working Exercise.accumulated_working_time_for_only(user) 2017-03-30 15:02:44 +02:00
15c0020f8c Merge pull request #102 from ThommyH/ignoreDummyExerciseForRecommendation
ignore dummy exercise in recommendation
2017-03-28 13:53:25 +02:00
80f8bddab1 Merge pull request #103 from ThommyH/fixWorkingTimeCalculation
Fix working time calculation
2017-03-28 13:53:03 +02:00
025212c90e changed retrieval of user data from openHPI to API v2 2017-03-28 13:52:02 +02:00