Browse code Merge pull request #226 from DigitalCurationCentre/development Latest changes from DCC dev
commit 1695330247a1267d5ea8a0ae99aabbc2ccc3fc80 2 parents 8a4b1b4 + 02ec675 Brian Riley authored on 6 Apr 2017 GitHub committed on 6 Apr 2017

Showing 31 changed files

• app/controllers/orgs_controller.rb
• app/controllers/plans_controller.rb
• app/controllers/registrations_controller.rb
• app/controllers/roles_controller.rb
• app/controllers/settings/plans_controller.rb
• app/mailers/user_mailer.rb
• app/models/exported_plan.rb
• app/models/role.rb
• app/policies/plan_policy.rb
• app/policies/role_policy.rb
• app/views/orgs/admin_edit.html.erb
• app/views/phases/_add_note.html.erb
• app/views/phases/edit.html.erb
• app/views/plans/_export.html.erb
• app/views/plans/_plan_details.html.erb
• app/views/plans/_plan_list_item.html.erb
• app/views/plans/_plan_nav_tabs.html.erb
• app/views/plans/_toolbar.html.erb
• app/views/plans/export.docx.caracal
• app/views/plans/export.html.erb
• app/views/plans/export.pdf.erb
• app/views/plans/share.html.erb
• app/views/plans/show_export.html.erb
• app/views/settings/phases/_export_formatting_form.html.erb
• app/views/shared/_export_links.html.erb
• app/views/user_mailer/permissions_change_notification.html.erb
• app/views/user_mailer/project_access_removed_notification.html.erb
• app/views/user_mailer/sharing_notification.html.erb
• config/locale/app.pot
• config/routes.rb
• lib/assets/javascripts/plans.js

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

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

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

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

Ignore Space Show notes View app/controllers/settings/plans_controller.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/role.rb

Ignore Space Show notes View app/policies/plan_policy.rb

Ignore Space Show notes View app/policies/role_policy.rb

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

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

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

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

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

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

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

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

Ignore Space Show notes View app/views/plans/export.docx.caracal

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

Ignore Space Show notes View app/views/plans/export.pdf.erb

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

Ignore Space Show notes View app/views/plans/show_export.html.erb 0 → 100644

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

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

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

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

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

Ignore Space Show notes View config/locale/app.pot

Ignore Space Show notes View config/routes.rb

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

Show line notes below