Merge branch 'answers_and_notes' into development
dev
commit 4722f1b650870c7e460be5422076d2cadab81f79
2 parents ea71f05 + cd2169f
@ray.carrick ray.carrick authored on 28 Mar 2017
Showing 14 changed files
View
app/controllers/notes_controller.rb
View
app/policies/note_policy.rb
View
app/views/answers/update.js.erb
View
app/views/layouts/application.html.erb
View
app/views/phases/_add_note.html.erb
View
app/views/phases/_answer_form.html.erb
View
app/views/phases/_archive_note.html.erb
View
app/views/phases/_edit_note.html.erb
View
app/views/phases/_list_notes.html.erb
View
app/views/phases/_note.html.erb
View
app/views/phases/_view_note.html.erb
View
config/routes.rb
View
db/schema.rb
View
lib/assets/javascripts/plans.js