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)

resolved cherry-pick conflicts

fix the table column with on share plan table ...

(cherry picked from commit 2a84f1b)

fixed bug with email validation JS by removing old method ...

(cherry picked from commit 44588ad)

fixed bug on contact_us page ...

(cherry picked from commit e041a9d)

updated contact-us to work with new form css and js ...

(cherry picked from commit fd16459)

cleanup of tabs and objects that are no longer in use DMPRoadmap/roadmap#305 ...

(cherry picked from commit 754a4e0)

resolved cherry-pick conflicts

started register form rewrite DMPRoadmap/roadmap#305 ...

(cherry picked from commit 4ff7313)

fixed tests to deal with placement of welcome header on home page DMPRoadmap/roadmap#305 ...

(cherry picked from commit 0d56b3d)

resolved cherry-pick conflicts

resolved cherry-pick conflicts

resolved cherry-pick conflicts

updated class for button, fixes issue brought up in #373

Merge pull request #404 from DigitalCurationCentre/issue337 ...

Fixed problem when creating a question. Fixed JS to display/hide defa…

Fixed problem when creating a question. Fixed JS to display/hide default answer. Fixed tinymce problem for example answer. DMPRoadmap/roadmap#337 ...

fixed create_a_new_question test. DMPRoadmap/roadmap#337

updated org-admin customization of templates according to #373

Table formatting toolbar without obscuring the view. DMPRoadmap/roadmap#272

Added method to validate answer according to each question format. Partial view for section progress. Eager loading of resources needed to calculate plan and section progress. Refactoring of code for progress plan. DMPRoadmap/roadmap#382 ...

Fixed merge conflict. DMPRoadmap/roadmap#382

onChange event for tinymce at plan answers. Removed unnecessary options passed to tinymce. DMPRoadmap/roadmap#382

Fixed timeago problem for when a new answer is created. Refactored JavaScript logic into its own file. Created a partial to handle answer status. DMPRoadmap/roadmap#355

Asset pipeline fix for bg.gif

Re-added table sort arrows to asset pipeline - Closes #342.

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

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

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

Fixed sign up form. DMPRoadmap/roadmap#317

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

Fix button sizes and add placeholder to autocomplete boxes