Browse code Merge pull request #1354 from DMPRoadmap/master Pulling fixes for template customization back into development dev
commit 16bcf7abd28f6f89347f5c3e4e4e617f08f0039d 2 parents b28acb0 + a1136a2 Brian Riley authored on 6 Apr 2018 GitHub committed on 6 Apr 2018

Showing 15 changed files

• app/controllers/answers_controller.rb
• app/controllers/org_admin/templates_controller.rb
• app/controllers/phases_controller.rb
• app/controllers/questions_controller.rb
• app/models/question.rb
• app/models/template.rb
• app/views/annotations/_show.html.erb
• app/views/answers/_locking.html.erb
• app/views/answers/_new_edit.html.erb
• app/views/phases/_edit_plan_answers.html.erb
• app/views/phases/_guidances_notes.html.erb
• app/views/phases/admin_preview.html.erb
• app/views/questions/_edit_question.html.erb
• app/views/questions/_show_question.html.erb
• test/unit/question_test.rb

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

Ignore Space Show notes View app/controllers/org_admin/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/models/question.rb

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

Ignore Space Show notes View app/views/annotations/_show.html.erb

Ignore Space Show notes View app/views/answers/_locking.html.erb

Ignore Space Show notes View app/views/answers/_new_edit.html.erb

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

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

Ignore Space Show notes View app/views/phases/admin_preview.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 test/unit/question_test.rb

Show line notes below