John Geiger 6bb5b53bad Merge branch 'master' into john-graph ...

# Conflicts:
#	Gemfile

2016-05-12 16:02:38 +02:00

..

deploy

Change deploy username

2015-04-15 12:12:26 +02:00

environments

whitelist localhost on development

2015-11-03 16:12:23 +01:00

initializers

minor refactoring of flash messages

2015-03-23 16:42:57 +01:00

locales

Merge pull request #53 from openHPI/fix-file-creation-behavior

2016-05-10 18:34:21 +02:00

action_mailer.yml

Bar chart

2016-03-28 18:25:06 +02: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

Enable ActiveRecord Mng

2015-11-23 18:01:26 +01:00

boot.rb

transitionally downgraded to Rails 4.1 since activerecord-jdbcpostgresql-adapter is not fully compatible with Active Record 4.2

2015-03-02 15:04:37 +01:00

code_ocean.yml

Bar chart

2016-03-28 18:25:06 +02:00

code_ocean.yml.example

Disable breaking standard enable of CodePilot

2015-03-28 18:52:31 +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

added New Relic

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

docker.yml.erb

Added websocket protocols to docker config

2015-12-12 00:46:52 +08:00

environment.rb

transferred Code Ocean from original repository to GitHub

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

newrelic.yml.example

added New Relic

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

nginx.conf

adapted Nginx configuration for SSL

2015-03-14 14:33:08 +01:00

routes.rb

Rename #import_thin_common_cartridge to #import_proforma_xml

2016-02-12 11:11:20 +01:00

secrets.yml

Bar chart

2016-03-28 18:25:06 +02:00

secrets.yml.example

transferred Code Ocean from original repository to GitHub

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

secrets.yml.travis

added further configuration files for Travis CI

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

sendmail.yml

Bar chart

2016-03-28 18:25:06 +02:00

sendmail.yml.example

transferred Code Ocean from original repository to GitHub

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

smtp.yml

Bar chart

2016-03-28 18:25:06 +02:00

smtp.yml.example

transferred Code Ocean from original repository to GitHub

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