htwkmooc/codeocean
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,193 Commits 2 Branches 0 Tags
d1d948c71eae789f9fab2128f651b2daec0526b3
Commit Graph

180 Commits

Author SHA1 Message Date
Thomas Hille
bd0721da2e deleted search modal. reused roc modal for search modal. also added translations 2017-03-21 10:31:33 +01:00
Thomas Hille
c1209e4972 added translation for search bar 2017-03-21 10:31:33 +01:00
Thomas Hille
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
Thomas Hille
3d7f5bdf1a added intervention controller and stuff 2017-03-21 10:31:32 +01:00
Thomas Hille
0db11884bc Extended Exercises by worktime, difficulty and tags, added ProxyExercises as prework for recommendations 
Tags can be added to exercises in the edit view. Tags can monitored under /tags.
Added the concept of ProxyExercises which are a collection of Exercises. They can be found under /proxy_exercises
Added Interventions as prework to show interventions later to the user.
Added exercise/[:id]/working_time to return the working time of the user in this exercise and the average working time of all users in this exercise
 2017-03-21 10:31:32 +01:00
Ralf Teusner
8f927d5ac9 some howto text for request_for_comment usage, changed background color of read-only editor. 2017-03-15 16:15:29 +01:00
Ralf Teusner
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
Ralf Teusner
4a1721c6aa switch back from structure.sql to schema.rb 2017-02-22 17:20:26 +01:00
Tom Staubitz
76c7ddae9b removed relative_url_root for staging environment. 
The app can be accessed now via port 3000 instead of a subdirectory.
 2017-02-06 20:30:22 +01:00
Tom Staubitz
a4d8acf96d removed deprecated warnings again 2017-01-19 21:33:52 +01:00
Tom Staubitz
721c11bf28 fixed staging.rb according to rails update 2017-01-18 11:28:27 +01:00
Tom Staubitz
d8fa661c90 changed back "action" to "to" in routes 2017-01-18 10:52:24 +01:00
Tom Staubitz
dd4c789fed replaced session_paramerters with server params for security reasons 
cleaned up comments
 2017-01-12 15:10:34 +01:00
Tom Staubitz
41a61a8507 Fixed the destroy session logic. 
1. an exercise_id is provided ==> only the LtiParameter object for the current user, consumer, and exercise is deleted.
2. no exercise_id is provided ==> external user and consumer are removed from the session, all LtiParameter objects for this user and consumer are deleted.

This enables users to have several tabs with exercises open and submitting the results to the tool consumer.
When an exercise has been submitted, the user cannot use the back button to get back to CodeOcean and work on the submitted or any other exercise.
For now a warning has been added to the info text to tell users not to do this. (As the LtiParameters have been deleted, the points can no more be submitted to the consumer.)
@TODO disable/redirect back button?
 2016-12-31 17:21:46 +01:00
Tom Staubitz
ca28e0aa87 updated rails from 4.1.13 to 4.2.5. This is required for rails to make use of new features in postgres 9.5 
@Ralf
TODO: migration /Users/groucho/Documents/HPI/workspace/Xikolo-CodeOcean/codeocean/db/migrate/20160204111716_add_user_to_code_harbor_link.rb
is broken. A reference is made to table users which does not exist.
Workaround: run rake db:schema:load before running db:migrate. Still this should be fixed.
 2016-12-31 00:05:23 +01:00
Ralf Teusner
f82737a7d4 some small changes to staging environment (no caching and eager loading, some more errors). 2016-12-19 15:08:51 +01:00
Ralf Teusner
66de024195 enhance staging mode in order to show errors and web_console 2016-11-24 14:46:18 +01:00
Ralf Teusner
442b405927 added support for better_errors in virtual machines. If you want to use it, set the environment variable "TRUSTED_IP", for example: export TRUSTED_IP=192.168.59.3 2016-11-24 11:58:32 +01:00
Ralf Teusner
bfa12899a5 adjust german locales to comply with the standard form of address 2016-11-09 18:09:24 +01:00
Ralf Teusner
1511941d3d Merge branch 'master' into editor-frontend-refactor 
Conflicts:
	codeocean-dockerconfig.md
 2016-11-09 18:00:40 +01:00
Ralf Teusner
ff7446fde6 redirect to RFCs on max score: redirect users to their own RFCs if they are open, fixed wrong usage of user_id (external_id is not used in RFCs, normal id has to be used!). 2016-11-09 17:58:10 +01:00
Ralf Teusner
e8f93cb870 Removed bin folder from linked_dirs in deploy, otherwise no rails console can be started on the servers, because the directory will be empty (as stated on several stackoverflow questions, for example: http://stackoverflow.com/questions/29039927/rails-4-doesnt-detect-application-after-capistrano-deployment ) 2016-11-09 17:56:56 +01:00
Ralf Teusner
1dfd6f61dc some more relative url roots in editor_edit, removed javascript uglifying for staging, added debug message for docker websocket connection url. 
added doku for setting up docker daemon for codeocean
 2016-10-07 14:16:24 +02:00
Ralf Teusner
0f76b1cb90 Merge branch 'master' into editor-frontend-refactor 
Conflicts:
	app/assets/javascripts/editor.js.erb
---> kept refactored one
 2016-09-09 14:17:42 +02:00
Alexander Kastius
8fe9303288 Merge pull request #80 from openHPI/recommend_request_for_comment 
Some tidy up in request for comments (bugfix: removed leftover parts …
 2016-09-09 14:12:47 +02:00
Ralf Teusner
8f499b72da Feature: Auto-Completion in Source Code 
+ allow flags for exercises
 2016-09-07 17:34:20 +02:00
Ralf Teusner
99f1fe45a3 Allow to specify a branch to deploy for staging 2016-09-02 15:05:48 +02:00
Ralf Teusner
b8da4dea17 Merge branch 'master' into editor-frontend-refactor 
Conflicts:
	app/assets/javascripts/editor.js.erb
	app/views/exercises/implement.html.slim
 2016-09-02 15:04:18 +02:00
Ralf Teusner
ddaed5929b Naming of sidebars 2016-09-01 18:47:16 +02:00
Alexander Kastius
1c7b4c931b Added german locale. 2016-09-01 16:29:45 +02:00
Alexander Kastius
e42330cf1b Added tooltip to request-comments button. 
Added locale for all new texts.
 2016-09-01 16:27:40 +02:00
Ralf Teusner
7cfa6a21ee add staging settings for docker.yml.erb 2016-08-31 16:03:19 +02:00
Ralf Teusner
a9b273a902 Changes to support deploy staging 2016-08-31 15:54:19 +02:00
Ralf Teusner
1964c4a31f removed nginx.conf which is not necessary here 2016-08-19 16:33:28 +02:00
Alexander Kastius
c04fc85c3b Added docker.yml.erb to gitignore. 
Added docker.yml.erb.example
 2016-08-12 14:45:08 +02:00
Ralf Teusner
c12ee49d01 precompile of markdown buttons for edit of exercises. 2016-08-12 14:41:54 +02:00
Alexander Kastius
63f62a8efc Reconfigured docker-yml and added missing (something) to application.rb 2016-08-11 19:01:44 +02:00
Ralf Teusner
6e6c9143cd Some tidy up in request for comments (bugfix: removed leftover parts of requested_at attribute, some UI changes in comment dialog) 
Redirect to open rfc if an exercise has been solved
 2016-08-11 18:13:33 +02:00
rteusner
778b2cdd63 Merge pull request #79 from openHPI/dropdown3 
implement dropdown menu
 2016-08-03 14:39:31 +02:00
yqbk
b72b595388 implement dropdown menu 2016-08-03 14:32:01 +02:00
Ralf Teusner
ed3526a578 Merge branch 'master' into feature-file-templates 
Conflicts:
	app/views/application/_navigation.html.slim
	config/locales/de.yml
	config/locales/en.yml
	db/schema.rb
 2016-07-28 15:16:11 +02:00
Ralf Teusner
09533a5556 download complete submission as one zip file 2016-07-15 18:25:58 +02:00
yqbk
b0d468c0e0 remove rest of teams code -- NEED TO REMOVE TEAMS FROM DATABASE! 2016-06-30 12:17:19 +02:00
Ralf Teusner
2ff12dbeb6 Cached displaynames of users 
Added solved state and #comments to index of request_for_comments
Added translations
 2016-06-27 16:46:26 +02:00
Ralf Teusner
2a52b66daa rfc can now be solved. 
show.html still needs to be finished
 2016-06-24 16:44:34 +02:00
Ralf Teusner
b7ce389961 Adapted locales so that german as well as english texts are now sent for every new comment. 2016-06-23 10:47:44 +02:00
Ralf Teusner
e0eac20361 added some more line breaks to the mail bodys of mails on new comments. 2016-06-22 14:21:17 +02:00
Ralf Teusner
83cf3b2321 added line breaks (<br> tags) in the email body. 2016-06-22 14:16:23 +02:00
Ralf Teusner
918da5270d added id for h4 holding the rfc-id 
updated locales.
 2016-06-22 13:06:35 +02:00
Ralf Teusner
ec26a095f6 First working version of mails on comments. 2016-06-17 14:48:57 +02:00