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

Development

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

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

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

Vyruss/bugfixes

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 branch 'development' into vyruss/bugfixes

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

removed test to edit plan page. edit plan is rendederd by phases controller

Merge branch 'development' into vyruss/bugfixes

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.

Merge pull request #321 from DigitalCurationCentre/issue_317 ...

Fixed sign up form. DMPRoadmap/roadmap#317
looks good @jollopre

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

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

updated other email notifications to use the user email if no name is defined

updated template processing so that a new version is created when the user edits a published version. Updated tests to work with this new paradigm

fixed user name on sharing email notification DMPRoadmap/roadmap#271

added placeholder text to accessible autocomplete box to help users understand that they need to type in the box

Updated size of buttons in new scss file to match existing boostrap size

Merge pull request #315 from DigitalCurationCentre/annotations ...

Annotations
Looks good @xsrust. 👍 for building out the tests