Sebastian Serth 1a26d67c82 Merge branch 'master' into add_roles_via_LTI ...

# Conflicts:
#	app/views/application/_breadcrumbs.html.slim
#	app/views/application/welcome.html.slim
#	app/views/exercise_collections/show.html.slim
#	app/views/external_users/index.html.slim
#	app/views/layouts/application.html.slim
#	app/views/proxy_exercises/index.html.slim
#	app/views/user_exercise_feedbacks/index.html.slim
#	app/views/user_mailer/send_thank_you_note.slim

2018-12-14 00:53:06 +01:00

..

deploy

Allow to specify a branch to deploy for staging

2016-09-02 15:05:48 +02:00

environments

enable ES6 syntax

2018-11-06 18:10:59 +01:00

initializers

Prevent creation of the Docker containers if just running a db rake task

2018-11-22 19:02:33 +01:00

locales

Merge branch 'master' into add_roles_via_LTI

2018-12-14 00:53:06 +01:00

webpack

Use webpack to deliver newest d3-tip.js, highlight.js and vis.js

2018-11-06 16:49:43 +01:00

action_mailer.yml.example

transferred Code Ocean from original repository to GitHub

2015-01-22 10:01:32 +01:00

action_mailer.yml.travis

added further configuration files for Travis CI

2015-01-29 08:45:45 +01:00

application.rb

Adopt new Rails defaults

2018-11-06 16:46:01 +01:00

boot.rb

Enable Spring and bootsnap for faster app load and respone times

2018-11-06 16:46:00 +01:00

cable.yml

Upgrade Rails to version 5.2.1 and adopt code & specs where necessary

2018-11-06 16:46:00 +01:00

code_ocean.yml.example

Upgrade Rails to version 5.2.1 and adopt code & specs where necessary

2018-11-06 16:46:00 +01:00

code_ocean.yml.travis

merged qa into codeocean

2015-03-27 21:27:40 +01:00

database.yml.example

transferred Code Ocean from original repository to GitHub

2015-01-22 10:01:32 +01:00

database.yml.travis

increased database pool size on Travis CI

2015-02-23 14:42:22 +01:00

deploy.rb

Adopt deployment after refactoring and reset puma to default

2018-11-06 16:49:43 +01:00

docker.yml.erb.example

Use standardized protocol string for Edge/IE11 compatibility

2018-04-30 13:22:03 +02:00

docker.yml.erb.travis

Use standardized protocol string for Edge/IE11 compatibility

2018-04-30 13:22:03 +02:00

environment.rb

Upgrade Rails to version 5.2.1 and adopt code & specs where necessary

2018-11-06 16:46:00 +01:00

mnemosyne.yml.example

support travis

2018-08-09 16:31:31 +02:00

mnemosyne.yml.travis

support travis

2018-08-09 16:31:31 +02:00

newrelic.yml.example

added New Relic

2015-04-11 16:54:48 +02:00

puma.rb

Adopt deployment after refactoring and reset puma to default

2018-11-06 16:49:43 +01:00

routes.rb

Merge branch 'master' into add_roles_via_LTI

2018-12-14 00:53:06 +01:00

schedule.rb

start with exercise collections that have 10 exercises with at least 50 submissions

2018-06-15 15:45:45 +02:00

secrets.yml.example

Upgrade Rails to version 5.2.1 and adopt code & specs where necessary

2018-11-06 16:46:00 +01:00

secrets.yml.travis

added further configuration files for Travis CI

2015-01-29 08:45:45 +01:00

sendmail.yml.example

transferred Code Ocean from original repository to GitHub

2015-01-22 10:01:32 +01:00

smtp.yml.example

transferred Code Ocean from original repository to GitHub

2015-01-22 10:01:32 +01:00

spring.rb

Upgrade Rails to version 5.2.1 and adopt code & specs where necessary

2018-11-06 16:46:00 +01:00

storage.yml

Upgrade Rails to version 5.2.1 and adopt code & specs where necessary

2018-11-06 16:46:00 +01:00

webpacker.yml

Include Webpack and use it for jQuery, Bootstrap and chosen.js

2018-11-06 16:46:01 +01:00