Browse code Merge remote-tracking branch 'upstream/CDL-MVP' into xsrust/mvp dev
commit e727ed9ac49cf76cc13acfae2c29d7a58aa79ebc 2 parents 1d62149 + 3a12f00 xsrust authored on 24 Jul 2017

Showing 34 changed files

• app/views/annotations/_show.html.erb
• app/views/answers/_new_edit.html.erb
• app/views/answers/update.js.erb
• app/views/contact_us/contacts/new.html.erb
• app/views/devise/passwords/new.html.erb
• app/views/guidance_groups/_show.html.erb
• app/views/guidances/admin_index.html.erb
• app/views/guidances/untitled.txt
• app/views/notes/_add.html.erb
• app/views/notes/_list.html.erb
• app/views/notes/_view.html.erb
• app/views/notes/create.js.erb
• app/views/orgs/admin_edit.html.erb
• app/views/phases/_DELETE_answer_form.html.erb
• app/views/phases/_answer_form.html.erb
• app/views/phases/_guidance_section.html.erb
• app/views/phases/_note.html.erb
• app/views/phases/edit.html.erb
• app/views/plans/_progress.html.erb
• app/views/plans/index.html.erb
• app/views/plans/new.html.erb
• app/views/sections/_progress.html.erb
• app/views/shared/_accessible_combobox.html.erb
• app/views/templates/admin_index.html.erb
• app/views/templates/admin_template_history.html.erb
• app/views/users/admin_index.html.erb
• lib/assets/javascripts/dmproadmap/accordions.js
• lib/assets/javascripts/plans.js
• lib/assets/javascripts/views/phases/edit.js
• lib/assets/javascripts/views/plans/edit.js
• lib/assets/stylesheets/dmproadmap/accordions.scss
• lib/assets/stylesheets/dmproadmap/base.scss
• lib/assets/stylesheets/dmproadmap/forms.scss
• test/functional/answers_controller_test.rb

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

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

Ignore Space Show notes View app/views/answers/update.js.erb

Ignore Space Show notes View app/views/contact_us/contacts/new.html.erb

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

Ignore Space Show notes View app/views/guidance_groups/_show.html.erb 0 → 100644

Ignore Space Show notes View app/views/guidances/admin_index.html.erb

Ignore Space Show notes View app/views/guidances/untitled.txt 0 → 100644

Ignore Space Show notes View app/views/notes/_add.html.erb

Ignore Space Show notes View app/views/notes/_list.html.erb

Ignore Space Show notes View app/views/notes/_view.html.erb

Ignore Space Show notes View app/views/notes/create.js.erb

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

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

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

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

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

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

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

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

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

Ignore Space Show notes View app/views/sections/_progress.html.erb

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

Ignore Space Show notes View app/views/templates/admin_index.html.erb

Ignore Space Show notes View app/views/templates/admin_template_history.html.erb

Ignore Space Show notes View app/views/users/admin_index.html.erb

Ignore Space Show notes View lib/assets/javascripts/dmproadmap/accordions.js

Show notes View lib/assets/javascripts/plans.js 100644 → 0

Ignore Space Show notes View lib/assets/javascripts/views/phases/edit.js 0 → 100644

Show notes View lib/assets/javascripts/views/plans/edit.js 100644 → 0

Ignore Space Show notes View lib/assets/stylesheets/dmproadmap/accordions.scss

Ignore Space Show notes View lib/assets/stylesheets/dmproadmap/base.scss

Ignore Space Show notes View lib/assets/stylesheets/dmproadmap/forms.scss

Ignore Space Show notes View test/functional/answers_controller_test.rb

Show line notes below