Merge branch 'development' into development
dev
commit 8a4b1b443e2e0f886675cdcfccf571ad0d004c0c
2 parents 9a714a5 + 00b246e
@Ray Carrick Ray Carrick authored on 30 Mar 2017
GitHub committed on 30 Mar 2017
Showing 25 changed files
View
app/controllers/answers_controller.rb
View
app/controllers/notes_controller.rb
View
app/controllers/phases_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/notes/archive.js.erb 0 → 100644
View
app/views/notes/create.js.erb 0 → 100644
View
app/views/notes/update.js.erb 0 → 100644
View
app/views/orgs/admin_show.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
app/views/phases/edit.html.erb
View
app/views/plans/_plan_details.html.erb
View
app/views/plans/_progress.html.erb 0 → 100644
View
app/views/templates/_show_phases_sections.html.erb
View
config/routes.rb
View
db/schema.rb
View
lib/assets/javascripts/plans.js
View
test/functional/answers_controller_test.rb