Commit Graph

316 Commits

Author SHA1 Message Date
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
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
194984a620 add cause to testruns
trigger run and assess on request_for_comment
2017-09-21 17:21:10 +02:00
8ce46d2cb8 Add a custom jquery-ui library for minimal mouse interaction support 2017-09-05 15:48:19 +02:00
530e727d6e Merge remote-tracking branch 'origin/master' into error-info 2017-08-23 14:51:53 +02:00
653aefa2c7 Update "last saved at" label after all types of submissions, not only autosaves 2017-08-13 16:24:03 +02:00
f877cd675a move user-id for codeocean-events into in_context 2017-08-04 16:39:23 +02:00
28605fbe9b Support adding and removing attributes of error templates 2017-07-12 21:25:18 +02:00
ae04a5adc5 this should fix the "zombie file" bug. Turned out that the CodeOceanEditor object is not destroyed when navigating back and forth within the exercise context ( from an exercise back to the exercise index and forward to another exercise). Therefore, CodeOceanEditor.editors[] kept all "old" editors and added the new ones behind the old ones. On next autosave, they were persisted into a submission. 2017-07-03 14:57:08 +02:00
56aa9f4495 tidy up the autosave timer when exiting the page 2017-07-03 14:54:51 +02:00
ec1be437de Merge pull request #120 from openHPI/minor-fixes
Close flash messages
2017-06-26 13:36:23 +02:00
6c353d611d make output scroll again! 2017-06-19 13:35:03 +02:00
ff9fb8d491 Remove unnecessary js.coffee file 2017-06-14 13:57:51 +02:00
341cd3a003 fix incomplete resizing of ace editors by triggering a resize event 2017-04-07 21:16:20 +02:00
cbaafa0383 stop intervention timer if user lost focus to the code ocean tab 2017-04-04 13:26:43 +02:00
cff46f963d added close button for requestForCommand-modal 2017-04-03 17:33:52 +02:00
a7effa7eb3 do now show intervention message for rfc modal if clicked on the button 2017-03-24 14:07:24 +01:00
7f6c433fe8 fixed time for interventions 2017-03-24 12:17:18 +01:00
4798ffcfcf - added abc group separator class to split users into different groups for testing proxy exercises and interventions
- shows 2 interventions per user and exercise max now
- only show break or rfc intervention to user
2017-03-23 18:52:46 +01:00
028876da60 fix javascript for autosave on beginning 2017-03-23 14:08:37 +01:00
c13c169657 creates an autosave submission on opening of the editor. otherwise we lose track of the time between opening the exercise and the first submission 2017-03-22 15:07:13 +01:00
f10af1f45b Merge pull request #93 from ThommyH/fixing_searches
search is now saved asynchron and without a form
2017-03-22 10:10:44 +01:00
7c986f2de7 fixed problem that no new files could be added to an exercise 2017-03-21 17:35:46 +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
d1d948c71e replaced ticks with string concatenation. Ticks are not possible, since execjs can't handle them. 2017-03-21 11:48:05 +01:00
5729a3ba5e removed this.resizeAceEditors() since it was only a test 2017-03-21 11:34:57 +01:00
8b67a70546 commenting, improved readability 2017-03-21 10:31:45 +01:00
12adfde6c2 search bar now searches in forum of the course from where the LTI request came from. alternatively searches in the java 2017 course.
show interventions only in the current java course
2017-03-21 10:31:45 +01:00
1eda266159 fixed calculation of time until intervention pops up 2017-03-21 10:31:45 +01:00
f1bf313280 changed times for rfc and break intervention to minimum 15 and 20 minutes. roc modal shows some additional text to the modal for less confusion 2017-03-21 10:31:33 +01:00
9761dd0a2a improved search bar and search button.
added button to collapsed sidebar
2017-03-21 10:31:33 +01:00
a481ec0da8 always show search on left side. placeholder in search input 2017-03-21 10:31:33 +01:00
eb0c79a043 added search bar to the side col 2017-03-21 10:31:33 +01:00
5d2eb6f381 fixed search in firefox 2017-03-21 10:31:33 +01:00
5b50deb70d split intervention modal into 2 separate modals 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
17d09accb7 only show interventions if condition is met. right now, only show one intervention per user and exercise 2017-03-21 10:31:33 +01:00
9c4b981bcb removed unnecessary stuff in Ajax 2017-03-21 10:31:33 +01:00
904868394a added interventions being saved once they are fired 2017-03-21 10:31:33 +01:00
bfc96328c4 added interventions back to code. added post method to be able to save interventions 2017-03-21 10:31:33 +01:00
2456f46b2b changed name of intervention modal, timer in editor.js set text now. some time calculations in editor for interventions 2017-03-21 10:31:32 +01:00
b82018dd8f changed some variable names 2017-03-21 10:31:32 +01:00
2caf4b123e added intervention modals back into editor.js and html 2017-03-21 10:31:32 +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
a52b27bb59 render html and or markdown for feedback messages 2017-02-08 16:19:41 +01:00
0ddcf3a5bb remove # from socket url... 2017-02-03 18:29:22 +01:00
2d5125dfa2 resize ace editors on toggle of description text 2017-02-03 13:53:32 +01:00
252a6ba5d8 strip # from filename if it is there by error. 2017-02-02 12:04:22 +01:00
a53e884cea refined previous commit 2017-01-21 10:02:34 +01:00