766 Commits

Author SHA1 Message Date
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
f82737a7d4 some small changes to staging environment (no caching and eager loading, some more errors). 2016-12-19 15:08:51 +01:00
66de024195 enhance staging mode in order to show errors and web_console 2016-11-24 14:46:18 +01:00
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
bfa12899a5 adjust german locales to comply with the standard form of address 2016-11-09 18:09:24 +01:00
1511941d3d Merge branch 'master' into editor-frontend-refactor
Conflicts:
	codeocean-dockerconfig.md
2016-11-09 18:00:40 +01:00
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
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
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
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
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
8f499b72da Feature: Auto-Completion in Source Code
+ allow flags for exercises
2016-09-07 17:34:20 +02:00
99f1fe45a3 Allow to specify a branch to deploy for staging 2016-09-02 15:05:48 +02:00
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
ddaed5929b Naming of sidebars 2016-09-01 18:47:16 +02:00
1c7b4c931b Added german locale. 2016-09-01 16:29:45 +02:00
e42330cf1b Added tooltip to request-comments button.
Added locale for all new texts.
2016-09-01 16:27:40 +02:00
7cfa6a21ee add staging settings for docker.yml.erb 2016-08-31 16:03:19 +02:00
a9b273a902 Changes to support deploy staging 2016-08-31 15:54:19 +02:00
1964c4a31f removed nginx.conf which is not necessary here 2016-08-19 16:33:28 +02:00
c04fc85c3b Added docker.yml.erb to gitignore.
Added docker.yml.erb.example
2016-08-12 14:45:08 +02:00
c12ee49d01 precompile of markdown buttons for edit of exercises. 2016-08-12 14:41:54 +02:00
63f62a8efc Reconfigured docker-yml and added missing (something) to application.rb 2016-08-11 19:01:44 +02:00
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
778b2cdd63 Merge pull request #79 from openHPI/dropdown3
implement dropdown menu
2016-08-03 14:39:31 +02:00
b72b595388 implement dropdown menu 2016-08-03 14:32:01 +02:00
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
09533a5556 download complete submission as one zip file 2016-07-15 18:25:58 +02:00
b0d468c0e0 remove rest of teams code -- NEED TO REMOVE TEAMS FROM DATABASE! 2016-06-30 12:17:19 +02:00
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
2a52b66daa rfc can now be solved.
show.html still needs to be finished
2016-06-24 16:44:34 +02:00
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
e0eac20361 added some more line breaks to the mail bodys of mails on new comments. 2016-06-22 14:21:17 +02:00
83cf3b2321 added line breaks (<br> tags) in the email body. 2016-06-22 14:16:23 +02:00
918da5270d added id for h4 holding the rfc-id
updated locales.
2016-06-22 13:06:35 +02:00
ec26a095f6 First working version of mails on comments. 2016-06-17 14:48:57 +02:00
a1ead9658e Update de.yml 2016-06-14 17:27:15 +02:00
7ef401f75a Add navigation item for file templates 2016-06-10 18:15:37 +02:00
4d2676fea7 Only show file templates which are available for the selected file type 2016-06-10 17:48:04 +02:00
4f8feb38e1 Use file template to generate new file content 2016-06-10 13:41:38 +02:00
1cd879bcb6 Scaffold file templates 2016-06-09 22:38:19 +02:00
10e68915d8 add key exercise_deadline_passed 2016-05-12 17:34:30 +02:00
3cd29556bb Merge pull request #53 from openHPI/fix-file-creation-behavior
Fix file creation behavior
2016-05-10 18:34:21 +02:00
87d4eb8b0d Let everyone see all comments and polish request for comments overview 2016-05-10 18:17:02 +02:00
aba6d56a87 Enable exercise forms to manipulate file creation flag 2016-05-10 17:14:07 +02:00
9fc974af20 Implement file name validation based on path, name, and filetype upon file creation 2016-05-10 16:03:52 +02:00
1f7f2865a0 Some cosmetic changes. Fade out of button after asking a question, some margin to avoid interference of the button with scrollbars, reduced timeframe upon appearance and changed modal window description text. 2016-05-01 12:12:46 +02:00
88a81dceb5 Fix labels for comment deletion 2016-04-30 14:27:36 +02:00
ee164b9e68 Fix I18n for request success message 2016-04-30 14:17:37 +02:00
268b723f3a Fallback for no question asked 2016-04-30 14:02:49 +02:00