Browse code fix merge conflicts dev
commit f1afc15e3276235c57b124edae7624e6ac080960 2 parents facecda + c707058 ray.carrick authored on 14 Mar 2017

Showing 49 changed files

• app/controllers/api/v0/plans_controller.rb
• app/controllers/application_controller.rb
• app/controllers/guidance_groups_controller.rb
• app/controllers/guidances_controller.rb
• app/controllers/notes_controller.rb
• app/controllers/orgs_controller.rb
• app/controllers/phases_controller.rb
• app/controllers/plans_controller.rb
• app/controllers/projects_controller.rb
• app/controllers/questions_controller.rb
• app/controllers/roles_controller.rb
• app/controllers/sections_controller.rb
• app/controllers/static_pages_controller.rb
• app/controllers/suggested_answers_controller.rb
• app/controllers/templates_controller.rb
• app/controllers/users_controller.rb
• app/helpers/plans_helper.rb
• app/models/exported_plan.rb
• app/models/plan.rb
• app/models/question.rb
• app/models/settings/plan_list.rb
• app/models/settings/template.rb
• app/models/template.rb
• app/views/admin/dmptemplates/settings.html.erb
• app/views/answers/update.js.erb
• app/views/devise/registrations/edit.html.erb
• app/views/layouts/_navigation.html.erb
• app/views/phases/_answer.html.erb
• app/views/phases/_answer_form.html.erb
• app/views/plans/_dropdowns_new_plan.html.erb
• app/views/plans/_plan_details.html.erb
• app/views/projects/_dropdowns_new_project.html.erb
• app/views/questions/_show_question.html.erb
• app/views/settings/phases/_export_formatting_form.html.erb
• app/views/static_pages/about_us.html.erb
• app/views/static_pages/help.html.erb
• app/views/static_pages/public_plans.html.erb
• app/views/static_pages/roadmap.html.erb
• app/views/static_pages/termsuse.html.erb
• app/views/templates/_show_phases_sections.html.erb
• app/views/templates/admin_template.html.erb
• config/initializers/constants.rb
• config/initializers/fast_gettext.rb
• config/locale/app.pot
• config/locale/de/app.po
• config/locale/en_GB/app.po
• config/locale/en_US/app.po
• config/locale/es/app.po
• config/locale/fr/app.po

Ignore Space Show notes View app/controllers/api/v0/plans_controller.rb

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Ignore Space Show notes View app/helpers/plans_helper.rb

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

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

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

Ignore Space Show notes View app/models/settings/plan_list.rb

Ignore Space Show notes View app/models/settings/template.rb

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

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

Ignore Space Show notes View app/views/answers/update.js.erb

Ignore Space Show notes View app/views/devise/registrations/edit.html.erb

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

Ignore Space Show notes View app/views/phases/_answer.html.erb

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

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

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

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

Ignore Space Show notes View app/views/questions/_show_question.html.erb

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

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

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

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

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

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

Ignore Space Show notes View app/views/templates/_show_phases_sections.html.erb

Ignore Space Show notes View app/views/templates/admin_template.html.erb

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

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

Ignore Space Show notes View config/locale/app.pot

Ignore Space Show notes View config/locale/de/app.po

Ignore Space Show notes View config/locale/en_GB/app.po

Ignore Space Show notes View config/locale/en_US/app.po

Ignore Space Show notes View config/locale/es/app.po

Ignore Space Show notes View config/locale/fr/app.po

Show line notes below