Commit Graph

1264 Commits

Author SHA1 Message Date
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
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
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
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
8dda5659a2 moved banners a little more to the top 2017-03-28 13:51:31 +02:00
c8609ffa81 improved quantile calculation by using only times until user has reached max points 2017-03-28 12:29:36 +02:00
b9e93a5b21 fixed accumulated_working_time_for_only in exercise 2017-03-28 12:13:47 +02:00
e1f1134992 ignore dummy exercise in recommendation 2017-03-28 11:51:51 +02:00
5e4b7c5dd1 Merge pull request #101 from ThommyH/fixGroupsProxyExercises
do now assign dummy exercise to random group
2017-03-27 18:59:44 +02:00
d6a25b8496 do now assign dummy exercise to random group 2017-03-27 18:52:44 +02:00
65256cdfd9 change intervention groups also to 20 20 60 2017-03-27 09:50:10 +02:00
87abe624a0 Merge pull request #99 from openHPI/save-run-results
Save run results
2017-03-24 18:49:53 +01:00
6c77b0743d updated schema with indexes. 2017-03-24 18:48:02 +01:00
bdbc372c0c fixed saving run results. also fixed websocket closing. 2017-03-24 18:47:30 +01:00
5aeda988b7 Merge branch 'master' into save-run-results 2017-03-24 16:15:07 +01:00
114f3799c8 Merge pull request #100 from ThommyH/seperate_user_in_ABC
Seperate user in groups for experiment in OOP2017
2017-03-24 15:42:13 +01:00
18bd8072cc Merge pull request #98 from ThommyH/add_index_submissions
added index to submissions for better performance in recommending exe…
2017-03-24 15:31:17 +01:00
f1a9b0613f remove puts 2017-03-24 14:11:08 +01:00
a7effa7eb3 do now show intervention message for rfc modal if clicked on the button 2017-03-24 14:07:24 +01:00