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

bug fix to shibboleth_ds_passthru when page has normal dropdown box

updated threshold on shib discovery service page DMPRoadmap/roadmap#405 ...

(cherry picked from commit 14cb3f2)

fixed typo in shib ds column sizes DMPRoadmap/roadmap#405 ...

(cherry picked from commit 4b4874a)

made shib discovery service disabled by default on application.rb specific installations can override in environments files DMPRoadmap/roadmap#405 ...

(cherry picked from commit b359983)

finsihed up shibboleth custom ds page DMPRoadmap/roadmap#405 ...

(cherry picked from commit 998f704)

tweaks to get shib sso login working when called from shibboleth_ds DMPRoadmap/roadmap#405 ...

(cherry picked from commit 2dc4fad)

added shibboleth Login.sso with entityID passthru action DMPRoadmap/roadmap#405 ...

(cherry picked from commit 314b24e)

updates to shib-ds css and js ...

(cherry picked from commit 3015163)

fixed some minor labeling of create account headers and links. updated login/register js so that they stop throwing js errors ...

(cherry picked from commit e91ed14)

resolved cherry-pick conflicts

added new custom shib ds page ...

(cherry picked from commit 5951ebe)