Commit Graph

240 Commits

Author SHA1 Message Date
Maximilian Grundke
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
rteusner
85ee40f118 Merge pull request #130 from openHPI/exercise-collections-ui
Exercise Collections UI
2017-10-04 15:43:01 +02:00
Maximilian Grundke
93797a665d Implement index page 2017-09-27 16:37:52 +02:00
Maximilian Grundke
44a3cabe98 Scaffold exercise collection routes 2017-09-27 16:08:56 +02:00
Maximilian Grundke
c9eb2be911 Merge remote-tracking branch 'origin/master' into rfc_run_assess_messages
# Conflicts:
#	app/assets/stylesheets/request-for-comments.css.scss
2017-09-27 15:09:24 +02:00
Maximilian Grundke
92e523b030 Re-design RfC page and make long texts collapsible 2017-09-27 15:04:20 +02:00
Ralf Teusner
af67208fd3 added token to proxy exercise view, also added locale 2017-09-27 11:59:59 +02:00
Maximilian Grundke
ca04050344 Display output and test results below RfC description 2017-09-23 09:05:58 +02:00
Maximilian Grundke
a6bc971659 Add I18n for tags 2017-09-21 16:15:17 +02:00
rteusner
28741854a6 Merge pull request #125 from openHPI/rework-comment-modal
Rework comment modal
2017-09-20 16:51:47 +02:00
Ralf Teusner
9ce29d211b Cleanup of Intervention and Bonus Exercise Experiments 2017-09-14 16:53:59 +02:00
Maximilian Grundke
85928361cb Add unsubscribe link to emails and cleanup user mailer 2017-09-13 14:37:10 +02:00
Maximilian Grundke
cea2781417 Implement unsubscribe route to delete subscriptions 2017-09-13 11:57:34 +02:00
Maximilian Grundke
0e8df9d738 Fix typo 2017-09-13 09:57:31 +02:00
Maximilian Grundke
954917d5a0 Add routes for subscriptions 2017-09-13 07:55:00 +02:00
Maximilian Grundke
811fc72e1e Add mailer for subscriptions 2017-09-13 07:07:06 +02:00
Maximilian Grundke
f628774995 Add checkbox to subscribe to author's comments 2017-09-06 14:25:18 +02:00
Maximilian Grundke
cc5da9ccfc Only most recent comments in preview if there are more than three comments on one line 2017-09-06 13:33:54 +02:00
Maximilian Grundke
b3cf7affa6 Add line number to modal title 2017-09-06 13:08:39 +02:00
Maximilian Grundke
17fb22b9df Add basic edit button functionality 2017-08-31 17:06:40 +02:00
Maximilian Grundke
9d7c751bbc Fix small inconsistency 2017-08-25 18:53:48 +02:00
Maximilian Grundke
bb79852e42 Do not delete comment containers; replace them with success message. This also fixes a visual bug when deleting the last comment 2017-08-25 18:33:39 +02:00
Maximilian Grundke
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
Maximilian Grundke
530e727d6e Merge remote-tracking branch 'origin/master' into error-info 2017-08-23 14:51:53 +02:00
rteusner
b90392f580 Merge pull request #124 from openHPI/rfc-enhancements
Rfc enhancements
2017-08-23 14:44:23 +02:00
Maximilian Grundke
48227d68f3 Add edited-label to edited comments 2017-08-17 14:32:36 +02:00
Maximilian Grundke
5de32edcc9 Add link to comment activity to session menu 2017-08-13 16:13:40 +02:00
Maximilian Grundke
726ef31ee7 Add new route to view all RFCs the user has commented on 2017-08-13 15:01:11 +02:00
Maximilian Grundke
b2344cfd97 Add last activity label to RFCs 2017-08-13 14:33:12 +02:00
Ralf Teusner
9592b5c939 removed tabs from rfc comment overlays
fixed minor typo in thank you emails
2017-08-11 18:23:16 +02:00
Maximilian Grundke
28605fbe9b Support adding and removing attributes of error templates 2017-07-12 21:25:18 +02:00
Maximilian Grundke
24fd142d3c Add localization and plural forms for error templates and error template attributes 2017-07-12 15:15:19 +02:00
Maximilian Grundke
0c8c8562f5 Scaffold error template attributes 2017-07-12 11:58:18 +02:00
Maximilian Grundke
2f759c03a9 List error template attributes 2017-07-12 11:23:51 +02:00
Maximilian Grundke
9eadc3a4db Make error template UI usable 2017-07-12 11:04:29 +02:00
Maximilian Grundke
4d38195c99 Scaffold error_templates UI 2017-07-12 10:11:52 +02:00
Maximilian Grundke
6cec69d7b9 Update locales 2017-06-12 13:43:03 +02:00
Maximilian Grundke
e43b71bd7f Allow to hide thank you note 2017-06-09 14:46:20 +02:00
Maximilian Grundke
eaac43ac63 Send e-Mail to all commenters if thank you note is given 2017-06-09 14:40:44 +02:00
Maximilian Grundke
f0fb52d92a Add thank you note to rfc 2017-06-08 16:46:15 +02:00
Maximilian Grundke
9a71405c49 Add thank you note frontend 2017-06-08 16:02:05 +02:00
Niklas Kiefer
5949d1208e Merge branch 'master' into client-routesv2 2017-04-25 13:50:08 +02:00
Ralf Teusner
d706de28d9 adjusted locales 2017-04-18 17:02:35 +02:00
Thomas Hille
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
Thomas Hille
3cf123c61e added working time estimation into user feedback 2017-04-12 10:57:44 +02:00
Thomas Hille
8ca944558c improved texts of feedback, added ok button 2017-04-12 10:13:23 +02:00
Thomas Hille
e4d28452bf save progress 2017-04-11 16:29:29 +02:00
Thomas Hille
73c3b902a3 save progress. added user feedback view and stuff 2017-04-11 15:00:35 +02:00
Ralf Teusner
58f76f53e6 added a search for request_for_comments.
fixed translation of model for request_for_comments
2017-04-03 19:49:03 +02:00
Ralf Teusner
3bf5e69f8d fixed links and a typo in rfc mails 2017-04-03 19:29:53 +02:00