Browse code Merge branch 'french_fixes' into postgresql dev
commit c72bf6d33683c5cd14d8d19a7af6a26ea2a16afa 2 parents f2c2fa9 + 613defb Ray Carrick authored on 30 Nov 2016

Showing 18 changed files

• app/controllers/registrations_controller.rb
• app/controllers/settings/projects_controller.rb
• app/models/exported_plan.rb
• app/models/user.rb
• app/views/dmptemplates/_add_question.html.erb
• app/views/dmptemplates/_admin_nav_tabs.html.erb
• app/views/layouts/_navigation.html.erb
• app/views/layouts/_signin_signout.html.erb
• app/views/plans/_answer_form.html.erb
• app/views/projects/_project_nav_tabs.html.erb
• app/views/settings/plans/_export_formatting_form.html.erb
• app/views/static_pages/about_us.html.erb
• config/branding.yml
• config/initializers/wicked_pdf.rb.example
• config/locales/contact_us/contact_us.en-UK.yml
• config/locales/fr.yml
• db/migrate/20131118094629_change_versions_published.rb
• lib/assets/javascripts/export_configure.js

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

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

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

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

Ignore Space Show notes View app/views/dmptemplates/_add_question.html.erb

Ignore Space Show notes View app/views/dmptemplates/_admin_nav_tabs.html.erb

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

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

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

Ignore Space Show notes View app/views/projects/_project_nav_tabs.html.erb

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

Ignore Space Show notes View app/views/static_pages/about_us.html.erb

Ignore Space Show notes View config/branding.yml

Ignore Space Show notes View config/initializers/wicked_pdf.rb.example 0 → 100644

Ignore Space Show notes View config/locales/contact_us/contact_us.en-UK.yml

Ignore Space Show notes View config/locales/fr.yml

Ignore Space Show notes View db/migrate/20131118094629_change_versions_published.rb

Ignore Space Show notes View lib/assets/javascripts/export_configure.js

Show line notes below