Browse code Merge pull request #392 from DigitalCurationCentre/issue_382 Issue 382 dev
commit bf9dbde2fcd3fcd743121c80a33ae88fc2c6de3b 2 parents a037da2 + 509cbd2 Jimmy Angelakos authored on 2 Jun 2017 GitHub committed on 2 Jun 2017

Showing 26 changed files

• app/controllers/answers_controller.rb
• app/controllers/phases_controller.rb
• app/models/answer.rb
• app/models/plan.rb
• app/models/section.rb
• app/views/answers/_form_fields.html.erb
• app/views/answers/_locking.html.erb
• app/views/answers/_new_edit.html.erb
• app/views/answers/_status.html.erb
• app/views/answers/update.js.erb
• app/views/phases/_add_note.html.erb
• app/views/phases/_answer.html.erb
• app/views/phases/_answer_form.html.erb
• app/views/phases/admin_add.html.erb
• app/views/phases/admin_show.html.erb
• app/views/phases/edit.html.erb
• app/views/plans/_progress.html.erb
• app/views/plans/edit.html.erb
• app/views/sections/_progress.html.erb
• config/tinymce.yml
• lib/assets/javascripts/answers/status.js
• lib/assets/javascripts/plans.js
• lib/assets/stylesheets/bootstrap_and_overrides.css.less
• lib/assets/stylesheets/roadmap-form.scss
• test/functional/answers_controller_test.rb
• test/integration/answer_locking_test.rb

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

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

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

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

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

Ignore Space Show notes View app/views/answers/_form_fields.html.erb 0 → 100644

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

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

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

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

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

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

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

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

Ignore Space Show notes View app/views/phases/admin_show.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/edit.html.erb

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

Ignore Space Show notes View config/tinymce.yml

Ignore Space Show notes View lib/assets/javascripts/answers/status.js

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

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

Ignore Space Show notes View lib/assets/stylesheets/roadmap-form.scss

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

Ignore Space Show notes View test/integration/answer_locking_test.rb

Show line notes below