updated models to relfect new name for join table between plans and guidance groups. fixes #198

Merge branch 'development' of https://github.com/DigitalCurationCentre/roadmap into development

ensure correct guidance groups display for plan editing

fixes guidance group selection for plans

Added admin :show action missing from routes.rb - oops.

Fixes issues discussed in DMPRoadmap/roadmap#132

Merge branch 'development' of https://github.com/DigitalCurationCentre/roadmap into development

updated function call to sharing_notification mailer

fixes spacing issues in share plan mailer and adds additional dialog

Merge branch 'docx_export_htmltoword' into development

change docx export to htmltoword. Hopefully fixes: #217

Merge branch 'question_options' into development

change options to question_options

Merge branch 'development' of https://github.com/DigitalCurationCentre/roadmap into development

Merge branch 'correct_section_order' into development

order sections by number

removed old reference to plan.to_hash

fixes issue with changing roles for a shared plan #231

Merge branch 'create_plan_permissions' into development

assign permissions on create plan. Fixes: #220

Merge branch 'tidyup_plan_model' into development

remove some old code

Merge pull request #28 from DMPRoadmap/development ...

Latest CDL changes pulled through Roadmap

Merge pull request #229 from CDLUC3/development ...

Emergency bug fixes for show_export.html.erb and jquery.timeago.js

removed test that checks fastgettext locale value after sign_in. Having trouble testing Fastgettext in the application_controller test as well.

finished functional tests DMPRoadmap/roadmap/#212

further bug fix for show_export page and controller test for this endpoint

bug fix for show_export.html.erb and to jquery.timeago.js

Merge branch 'create_plan_messages' into development

Add messages to create plan explaining decisions. Fixes https://github.com/DMPRoadmap/roadmap/issues/207