Browse code fixed a few merge conflicts dev
commit 51e933e089f19959f165048a0e4a7aeca6be3aec 2 parents d0825df + df0fbdd briley authored on 2 Feb 2017

Showing 55 changed files

• app/controllers/answers_controller.rb
• app/controllers/home_controller.rb
• app/controllers/notes_controller.rb
• app/controllers/phases_controller.rb
• app/controllers/plans_controller.rb
• app/controllers/projects_controller.rb
• app/helpers/phases_helper.rb
• app/helpers/projects_helper.rb
• app/models/answer.rb
• app/models/guidance_group.rb
• app/models/plan.rb
• app/models/plan_guidance_group.rb
• app/models/user.rb
• app/policies/note_policy.rb
• app/policies/plan_policy.rb
• app/views/layouts/_navigation.html.erb
• app/views/phases/_add_note.html.erb
• app/views/phases/_answer_form.html.erb
• app/views/phases/_answer_form_ro.html.erb
• app/views/phases/_archive_note.html.erb
• app/views/phases/_edit_note.html.erb
• app/views/phases/_list_notes.html.erb
• app/views/phases/_note.html.erb
• app/views/phases/_view_note.html.erb
• app/views/phases/edit.html.erb
• app/views/plans/_add_note.html.erb
• app/views/plans/_archive_note.html.erb
• app/views/plans/_dropdowns_new_plan.html.erb
• app/views/plans/_edit_note.html.erb
• app/views/plans/_export.html.erb
• app/views/plans/_list_notes.html.erb
• app/views/plans/_note.html.erb
• app/views/plans/_plan_details.html.erb
• app/views/plans/_plan_nav_tabs.html.erb
• app/views/plans/_plan_title.html.erb
• app/views/plans/_view_note.html.erb
• app/views/plans/create.html.erb
• app/views/plans/edit.html.erb
• app/views/plans/index.html.erb
• app/views/plans/new.html.erb
• app/views/plans/show.html.erb
• app/views/projects/new.html.erb
• app/views/settings/plans/_export_formatting_form.html.erb
• app/views/shared/_export_links.html.erb
• config/initializers/devise.rb
• config/locales/en-UK.yml
• config/routes.rb
• db/migrate/20170130105546_create_plan_guidance_groups.rb
• db/migrate/20170130111947_add_selected_to_plan_guidance_groups.rb
• lib/assets/javascripts/application.js
• lib/assets/javascripts/plans.js
• lib/assets/javascripts/projects.js
• lib/assets/stylesheets/bootstrap_and_overrides.css.less
• test/fixtures/plan_guidance_groups.yml
• test/models/plan_guidance_group_test.rb

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

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

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

Ignore Space Show notes View app/controllers/phases_controller.rb 0 → 100644

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/helpers/phases_helper.rb 0 → 100644

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

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

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

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

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

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

Ignore Space Show notes View app/policies/note_policy.rb

Ignore Space Show notes View app/policies/plan_policy.rb

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

Ignore Space Show notes View app/views/phases/_add_note.html.erb 0 → 100644

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

Ignore Space Show notes View app/views/phases/_answer_form_ro.html.erb 0 → 100644

Ignore Space Show notes View app/views/phases/_archive_note.html.erb 0 → 100644

Ignore Space Show notes View app/views/phases/_edit_note.html.erb 0 → 100644

Ignore Space Show notes View app/views/phases/_list_notes.html.erb 0 → 100644

Ignore Space Show notes View app/views/phases/_note.html.erb 0 → 100644

Ignore Space Show notes View app/views/phases/_view_note.html.erb 0 → 100644

Ignore Space Show notes View app/views/phases/edit.html.erb 0 → 100644

Show notes View app/views/plans/_add_note.html.erb 100644 → 0

Show notes View app/views/plans/_archive_note.html.erb 100644 → 0

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

Show notes View app/views/plans/_edit_note.html.erb 100644 → 0

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

Show notes View app/views/plans/_list_notes.html.erb 100644 → 0

Show notes View app/views/plans/_note.html.erb 100644 → 0

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

Ignore Space Show notes View app/views/plans/_plan_nav_tabs.html.erb 0 → 100644

Ignore Space Show notes View app/views/plans/_plan_title.html.erb 0 → 100644

Show notes View app/views/plans/_view_note.html.erb 100644 → 0

Ignore Space Show notes View app/views/plans/create.html.erb 0 → 100644

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

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

Ignore Space Show notes View app/views/plans/new.html.erb 0 → 100644

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

Show notes View app/views/projects/new.html.erb 100644 → 0

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

Ignore Space Show notes View app/views/shared/_export_links.html.erb

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

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

Ignore Space Show notes View config/routes.rb

Ignore Space Show notes View db/migrate/20170130105546_create_plan_guidance_groups.rb 0 → 100644

Ignore Space Show notes View db/migrate/20170130111947_add_selected_to_plan_guidance_groups.rb 0 → 100644

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

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

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

Ignore Space Show notes View lib/assets/stylesheets/bootstrap_and_overrides.css.less

Ignore Space Show notes View test/fixtures/plan_guidance_groups.yml 0 → 100644

Ignore Space Show notes View test/models/plan_guidance_group_test.rb 0 → 100644

Show line notes below