Browse code fixed merge conflicts dev
commit d684012fb9cd95503b70a6242778e9d54feb3488 2 parents aafba69 + eec141f Brian Riley authored on 15 Jun 2017

Showing 37 changed files

• app/controllers/api/v0/guidance_groups_controller.rb
• app/controllers/api/v0/plans_controller.rb
• app/controllers/api/v0/statistics_controller.rb
• app/controllers/api/v0/templates_controller.rb
• app/controllers/phases_controller.rb
• app/controllers/questions_controller.rb
• app/controllers/sections_controller.rb
• app/controllers/templates_controller.rb
• app/models/guidance_group.rb
• app/models/org.rb
• app/models/plan.rb
• app/models/template.rb
• app/policies/api/v0/plans_policy.rb
• app/views/api/v0/guidance_groups/index.json.jbuilder
• app/views/api/v0/plans/create.json.jbuilder
• app/views/api/v0/statistics/plans.json.jbuilder
• app/views/api/v0/statistics/plans_by_template.json.jbuilder
• app/views/api/v0/statistics/using_template.json.jbuilder
• app/views/api/v0/templates/index.json.jbuilder
• app/views/devise/registrations/new.html.erb
• app/views/layouts/_signin_signout.html.erb
• app/views/orgs/admin_show.html.erb
• app/views/phases/_answer_form.html.erb
• app/views/questions/_add_question.html.erb
• app/views/questions/_edit_question.html.erb
• app/views/questions/_show_question.html.erb
• app/views/static_pages/about_us.html.erb
• app/views/user_mailer/api_token_granted_notification.html.erb
• 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
• config/routes.rb
• lib/tasks/migrate.rake

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

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

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

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

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

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

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

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

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

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

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

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

Ignore Space Show notes View app/policies/api/v0/plans_policy.rb 0 → 100644

Ignore Space Show notes View app/views/api/v0/guidance_groups/index.json.jbuilder

Ignore Space Show notes View app/views/api/v0/plans/create.json.jbuilder

Ignore Space Show notes View app/views/api/v0/statistics/plans.json.jbuilder

Ignore Space Show notes View app/views/api/v0/statistics/plans_by_template.json.jbuilder

Ignore Space Show notes View app/views/api/v0/statistics/using_template.json.jbuilder

Ignore Space Show notes View app/views/api/v0/templates/index.json.jbuilder

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

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

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

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

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

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

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

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

Ignore Space Show notes View app/views/user_mailer/api_token_granted_notification.html.erb

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

Ignore Space Show notes View config/routes.rb

Ignore Space Show notes View lib/tasks/migrate.rake

Show line notes below