Merge pull request #351 from DigitalCurationCentre/vyruss/bugfixes ...

Vyruss/bugfixes

Merge pull request #353 from DigitalCurationCentre/issue_302 ...

radiobuttons question is now saving through its relation question_opt…

typo

Merge branch 'development' of https://github.com/DMPRoadmap/roadmap into vyruss/bugfixes

Fixes for #311, #345.

radiobuttons question is now saving through its relation question_options rather than options. Added whitelisting attributes for mass assignment. DMPRoadmap/roadmap#302

Colon separator between Guidance Group name and Guidance name - Fixes #333 ?

Merge pull request #350 from DigitalCurationCentre/vyruss/bugfixes ...

Vyruss/bugfixes

Removed strong tag from docx when exporting question.text. DMPRoadmap/roadmap#297

Set default sort order for Orgs to be Name ASC - fixes #340

Added confirmation message for guidance choices - closes #332

Added tooltips & strings for org admin/user permissions, closes #259

Quick'n'dirty touchscreen hack for Bootstrap's buggy dropdown, closes #316

Merge pull request #328 from DigitalCurationCentre/issue_272 ...

Guidances new/edit with table formatting displayed properly. DMPRoadm…

Closes #322. ...

Now deleting stem accounts of invited users who haven't followed invitation link and try to sign up (but their email already exists).

Fix for super admin (new annotation model)

Merge pull request #327 from DigitalCurationCentre/roles_and_plan_sharing ...

Roles and plan sharing

Guidances new/edit with table formatting displayed properly. DMPRoadmap/roadmap#272

Merge pull request #323 from DigitalCurationCentre/issue_295 ...

Issue 295

updated syntax to allow read-only view of a plan. \n app/views/phases/_answer_form_ro.html.erb probably needs a bigger re-write as the logic is horrendus and it renders the whole thing as a form...but it's not a form because it's read only and it checks to see if it's read only a bunch of times within it. but here's the quick and dirty making it work

Update _signin_signout.html.erb ...

the typo prevented you from navigating the site in permissions edge case (only 5)

removed comments from user model, fixes #314

Fixed bug when exporting a phase without sections. DMPRoadmap/roadmap#295

Admin settings returning either value or - for txt, html and pdf formats. DMPRoadmap/roadmap#295

Integrate/resolve PR #319 - Closes #251.

Merge remote-tracking branch 'cdluc3/template-publish-fix' into development

Template versioning update.

Fixed sign up form. DMPRoadmap/roadmap#317

Merge branch 'development' into template-publish-fix

Merge pull request #318 from CDLUC3/fix-button-sizes ...

Fix button sizes and add placeholder to autocomplete boxes