Browse code Merge branch 'master' of https://github.com/DigitalCurationCentre/roadmap dev
commit c674a0ad3da57c16b6ca0cb1995d22be238dfd0b 2 parents 4ca447a + 97cb77a xsrust authored on 25 Jul 2016

Showing 37 changed files

• app/controllers/application_controller.rb
• app/controllers/guidances_controller.rb
• app/controllers/projects_controller.rb
• app/mailers/user_mailer.rb
• app/models/language.rb
• app/models/plan.rb
• app/models/question.rb
• app/views/contact_us/contacts/new.html.erb
• app/views/guidance_groups/admin_edit.html.erb
• app/views/guidance_groups/admin_new.html.erb
• app/views/guidance_groups/admin_show.html.erb
• app/views/guidances/admin_edit.html.erb
• app/views/guidances/admin_new.html.erb
• app/views/layouts/_dmponline_navigation.html.erb
• app/views/settings/plans/show.html.erb
• config/initializers/locale.rb
• config/initializers/swagger.rb
• config/locales/de.bootstrap.yml
• config/locales/de.yml
• config/locales/devise.de.yml
• config/locales/devise.en-UK.yml
• config/locales/devise.en.yml
• config/locales/devise.fr.yml
• config/locales/devise_invitable.de.yml
• config/locales/devise_invitable.en-UK.yml
• config/locales/devise_invitable.en.yml
• config/locales/devise_invitable.fr.yml
• config/locales/en-UK.bootstrap.yml
• config/locales/en-UK.yml
• config/locales/en.bootstrap.yml
• config/locales/en.yml
• config/locales/fr.bootstrap.yml
• config/locales/fr.yml
• config/routes.rb
• db/migrate/20160719140055_create_languages.rb
• db/schema.rb
• db/seeds.rb

Ignore Space Show notes View app/controllers/application_controller.rb

Ignore Space Show notes View app/controllers/guidances_controller.rb

Ignore Space Show notes View app/controllers/projects_controller.rb

Ignore Space Show notes View app/mailers/user_mailer.rb

Ignore Space Show notes View app/models/language.rb 0 → 100644

Ignore Space Show notes View app/models/plan.rb

Ignore Space Show notes View app/models/question.rb

Ignore Space Show notes View app/views/contact_us/contacts/new.html.erb

Ignore Space Show notes View app/views/guidance_groups/admin_edit.html.erb

Ignore Space Show notes View app/views/guidance_groups/admin_new.html.erb

Ignore Space Show notes View app/views/guidance_groups/admin_show.html.erb

Ignore Space Show notes View app/views/guidances/admin_edit.html.erb

Ignore Space Show notes View app/views/guidances/admin_new.html.erb

Ignore Space Show notes View app/views/layouts/_dmponline_navigation.html.erb

Ignore Space Show notes View app/views/settings/plans/show.html.erb

Ignore Space Show notes View config/initializers/locale.rb

Ignore Space Show notes View config/initializers/swagger.rb

Ignore Space Show notes View config/locales/de.bootstrap.yml 0 → 100644

Ignore Space Show notes View config/locales/de.yml 0 → 100644

Ignore Space Show notes View config/locales/devise.de.yml 0 → 100644

Ignore Space Show notes View config/locales/devise.en-UK.yml 0 → 100644

Show notes View config/locales/devise.en.yml 100644 → 0

Ignore Space Show notes View config/locales/devise.fr.yml 0 → 100644

Ignore Space Show notes View config/locales/devise_invitable.de.yml 0 → 100644

Ignore Space Show notes View config/locales/devise_invitable.en-UK.yml 0 → 100644

Show notes View config/locales/devise_invitable.en.yml 100644 → 0

Ignore Space Show notes View config/locales/devise_invitable.fr.yml 0 → 100644

Ignore Space Show notes View config/locales/en-UK.bootstrap.yml 0 → 100644

Ignore Space Show notes View config/locales/en-UK.yml 0 → 100644

Show notes View config/locales/en.bootstrap.yml 100644 → 0

Show notes View config/locales/en.yml 100644 → 0

Ignore Space Show notes View config/locales/fr.bootstrap.yml 0 → 100644

Ignore Space Show notes View config/locales/fr.yml 0 → 100644

Ignore Space Show notes View config/routes.rb

Ignore Space Show notes View db/migrate/20160719140055_create_languages.rb 0 → 100644

Ignore Space Show notes View db/schema.rb

Ignore Space Show notes View db/seeds.rb

Show line notes below