Merge pull request #422 from DigitalCurationCentre/xsrust/bugfixes ...

Xsrust/bugfixes

updated link in api mailer

fixes error with prefetching, now passes tests

Merge remote-tracking branch 'upstream/development' into xsrust/bugfixes

completed work on API

Merge branch 'CDL-MVP' of https://github.com/CDLUC3/roadmap into CDL-MVP

Merge branch 'plan-visibility' into CDL-MVP

added plan visibility to edit/view plan details DMPRoadmap/roadmap#151

api updates

css tweak and wording changes DMPRoadmap/roadmap#405

started converting over to the new column layout on view plans page

added 'create test plan' link to view plans page and default setting in application.rb DMPRoadmap/roadmap#83

Merge branch 'CDL-MVP' of https://github.com/CDLUC3/roadmap into CDL-MVP

fixed bug in edit profile page

updated size of shib_ds page org list columns and updated org links DMPRoadmap/roadmap#405

Merge pull request #415 from DigitalCurationCentre/issue414 ...

Issue414

css tweaks for DMPRoadmap/roadmap#408

Fixed problem when changing question format for editing. Implemented default answer for textfield and textarea. Example answer now loads tinymce for editing too. DMPRoadmap/roadmap#414

updated edit profile page to display api with same formatting as the rest of the page

Merge branch 'development' of ../roadmap_src into development

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

Merge pull request #413 from DigitalCurationCentre/xsrust/bugfixes ...

fixed logic which lead to guidance not being displayed

fixed logic which lead to guidance not being displayed

removed all occurrences of 'sign up' and replaced with 'create account' DMPRoadmap/roadmap#112

Merge pull request #412 from CDLUC3/remove-sign-up ...

Replace the term 'Sign up' with 'Create account'

Add Notification Preferences to User's profile page

removed all occurrences of 'sign up' and replaced with 'create account' DMPRoadmap/roadmap#112

shibboleth_ds changes to make org list links work DMPRoadmap/roadmap#405

fixed plans_controller_test

fixed double render issue in shibboleth_ds_passthru