Browse code Merge pull request #255 from DigitalCurationCentre/development Development dev
commit a9d2b1a1e65ab4e1673ba5c86a9d9080946c037f 2 parents f072221 + 91aeac6 Brian Riley authored on 19 Apr 2017 GitHub committed on 19 Apr 2017

Showing 22 changed files

• Gemfile
• Gemfile.lock
• app/controllers/phases_controller.rb
• app/controllers/plans_controller.rb
• app/controllers/roles_controller.rb
• app/controllers/users_controller.rb
• app/dashboards/user_dashboard.rb
• app/mailers/user_mailer.rb
• app/models/exported_plan.rb
• app/models/plan.rb
• app/views/phases/_answer_form.html.erb
• app/views/phases/edit.html.erb
• app/views/plans/_dropdowns_new_plan.html.erb
• app/views/plans/_plan_details.html.erb
• app/views/plans/export.docx.erb
• app/views/plans/share.html.erb
• app/views/plans/show.html.erb
• app/views/shared/_export_links.html.erb
• app/views/user_mailer/sharing_notification.html.erb
• config/routes.rb
• db/migrate/20170412143945_add_phase_id_to_exported_plan.rb
• db/schema.rb

Ignore Space Show notes View Gemfile

Ignore Space Show notes View Gemfile.lock

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

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

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

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

Ignore Space Show notes View app/dashboards/user_dashboard.rb

Ignore Space Show notes View app/mailers/user_mailer.rb

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

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

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

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

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

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

Ignore Space Show notes View app/views/plans/export.docx.erb 0 → 100644

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

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

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

Ignore Space Show notes View app/views/user_mailer/sharing_notification.html.erb

Ignore Space Show notes View config/routes.rb

Ignore Space Show notes View db/migrate/20170412143945_add_phase_id_to_exported_plan.rb 0 → 100644

Ignore Space Show notes View db/schema.rb

Show line notes below