Commit Graph

1589 Commits

Author SHA1 Message Date
b25681a63e removed (partly outdated) xikolo-client that was used for name retrieval. 2017-12-12 14:33:46 +01:00
9234f11eac remove failed option (it is not there yet) 2017-12-05 10:57:11 +01:00
53df8f9d92 correct method call 2017-11-29 16:35:18 +01:00
c62e9f53e5 fixed broken methodname (missing questionmark...) 2017-11-29 16:06:45 +01:00
32c274d455 Rename attribute and restructure conditions 2017-11-29 10:39:05 +01:00
901d35c59c updates for codeclimate 2017-11-29 09:57:27 +01:00
a292322138 updated gemfile 2017-11-24 16:21:48 +01:00
1369f9285b The .co file of downloaded submissions has to contain the (original) file_id of the respective files, not the "id".
Otherwise, the merge of the files does not work and will result in duplicate files...
2017-11-22 16:20:56 +01:00
0cee275278 Merge pull request #141 from openHPI/fix-user-exercise-feedback-ui
Update exercise feedback UI
2017-11-22 14:07:17 +01:00
2ed54705ff Remove anomaly detection artifact from schema 2017-11-22 14:06:33 +01:00
34b2bf9eb1 Fix styling and link to exercise 2017-11-22 13:22:10 +01:00
4d8cee6fcb Add timestamps to user exercise feedback 2017-11-20 19:26:14 +01:00
23a804a6eb Link to user statistics from feedback 2017-11-20 15:05:25 +01:00
a9439a4df5 Message for no feedback 2017-11-20 15:01:34 +01:00
762a8233ab Link to exercise and show exercise description 2017-11-20 14:48:13 +01:00
2dcaf9d155 Show feedback creation date alongside username 2017-11-20 14:45:42 +01:00
282059c3f6 Merge pull request #133 from ThommyH/limitInterventionsToOnePerExercise
allow only one intervention per user and exercise but 3 interventions per user and day
2017-11-16 17:36:58 +01:00
8a94905f17 merged with current master 2017-11-16 17:16:22 +01:00
851beac4e7 removed == true in condition 2017-11-16 17:11:37 +01:00
9733d32665 switched ! to not and && to and 2017-11-15 22:53:18 +01:00
340c5f2223 Merge pull request #139 from openHPI/factoryGirlToBot
Factory girl to bot
2017-11-15 16:11:47 +01:00
fc873cb053 second run of replacement regex from https://github.com/thoughtbot/factory_bot/blob/4-9-0-stable/UPGRADE_FROM_FACTORY_GIRL.md ...
Nested calls seem to be fun..
2017-11-15 15:37:42 +01:00
451d453618 updated gitignore 2017-11-15 15:29:42 +01:00
960025cbf8 pushed Gemfile.lock 2017-11-15 15:24:36 +01:00
204902ef0b updated gemfile to use factory_bot 2017-11-15 15:19:55 +01:00
0e26ab98c8 rename factory_girl_(rails) to factory_bot_(rails) 2017-11-15 15:18:07 +01:00
951b71780c Merge pull request #129 from ThommyH/removeExpectedWorkingTime
removed expected working time from show/create/index of exercises
2017-11-15 14:26:12 +01:00
0a66a5b758 Merge pull request #134 from openHPI/user_exercise_feedback_backend
User exercise feedback backend UI
2017-11-15 14:19:04 +01:00
6161d6caaf clean up code, use method instead of magic constant. 2017-11-15 14:17:55 +01:00
94713ce7d5 Merge pull request #138 from openHPI/add-exercise-feedback-to-exercise-view
Show list of feedback messages for specific exercises
2017-11-09 11:49:37 +01:00
c5c42ca3bc Show list of feedback messages for specific exercises 2017-11-08 22:31:01 +01:00
69250901a1 Fix typo 2017-11-08 21:24:46 +01:00
2118e610f9 fixed broken migration 2017-11-08 17:06:19 +01:00
03141409e8 Fix tests for user_exercise_feedback 2017-11-08 15:41:48 +01:00
7fa5765cdd Merge remote-tracking branch 'origin/user_exercise_feedback_backend' into user_exercise_feedback_backend 2017-11-08 15:39:52 +01:00
c4cf11f299 Refactor user redirect after submission 2017-11-08 15:39:04 +01:00
3608712706 forgot some minor changes in spec.. (still work in progress) 2017-11-06 15:38:50 +01:00
ac14e2d0ca first steps towards testing the redirect with regards to user_feedbacks 2017-11-01 11:57:56 +01:00
1551498358 Merge branch 'master' into user_exercise_feedback_backend
# Conflicts:
#	app/views/application/_navigation.html.slim
2017-11-01 10:29:43 +01:00
97d8409557 add association between exercise and user_exercise_feedback 2017-11-01 10:14:52 +01:00
08c7154708 removed duplicate logging statement 2017-11-01 10:14:03 +01:00
dbd6db69b7 Merge pull request #136 from openHPI/fix-tests
Fix Tests
2017-11-01 10:10:04 +01:00
04baf6c5d5 Make paths explicit to fix tests 2017-10-26 16:14:40 +02:00
0fd993c1cd Move submission url attributes to controller test 2017-10-26 15:48:21 +02:00
34e96e40be Fix submissions controller test json response 2017-10-26 15:43:14 +02:00
14a135a0c9 Add explanatory comment to config 2017-10-26 15:42:20 +02:00
13e33bf977 Add optional logging for tests 2017-10-26 15:42:06 +02:00
0bade2c2e7 Fix recommending too difficult questions if user has too low level 2017-10-25 14:05:10 +02:00
b384dffe34 Merge pull request #135 from ThommyH/fix_proxy_exercises
fixed problem in ProxyExercise that caused: ActiveRecord::Association…
2017-10-25 12:43:20 +02:00
87f280089d Fix return value of logger being assigned to exercise 2017-10-25 12:07:16 +02:00