Merge branch 'branding' into CDL-MVP

update the schema with user's prefs

tweaks to header section and logo

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

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

(cherry picked from commit 4b4874a)

resolved cherry-pick conflicts

resolved cherry-pick conflicts

resolved cherry-pick conflicts

updated org-admin and plan create pages to reflect schema change

updated tests to work after annotations changes

merged development into annotations

updated references of suggested_answer to annotations

Merge local branch into feature/sso - fixes #39, #276, #287, #290. ...

Unified omniauth cases & updated tests.
Deleted Project Controller & tests (no longer needed).
Please db:migrate after this commit.

fixed merge conflict in schema.rb

forgot to add the schema changes DMPRoadmap/roadmap#251

updated models to relfect new name for join table between plans and guidance groups. fixes #198

change docx export to htmltoword. Hopefully fixes: #217

Change notes to work with AJAX calls.

resolve conflicts from merging Roadmap into DCC

Added a rake task to port orcids from the old field in the users table over to the new user_identifiers table. Removed the old unworking migration (because orcid is not in the table so it never runs). Added a new db migration to remove the old users.orcid_id column. The rake task would need to be run prior to the db migration though so commenting it out for now

change question_format to use enum rather than bits

Optimistic Locking ...

- add bit field to question_format so we don't have to test strings to determine format

- add isOptionBased to question so we dn't have to do multiple string comps for this - there was a boolean already in the DB not being used

- add migration to add bit field

- add migration to add lock_version field to answer

- change answers_controller to do optimistic locking

- change answers controller not to redirect to plans/phase/edit as it wasn't doing anything

- introduced answers/update.js.erb to handle the return from /answers/update.

- to do the conflict resolution you need the old answer and new answer objects. Tried using clone but it doesn't work because it only does a shallow copy. So adopted a "nuclear-option" deep copy but it's a bit much. A compromise would be better.

first step in reducing page edit sql queries

fixed merge conflicts in schema.rb

ran db:migrate on test

init commit of deep_copy for templates [untested]

removed region_group (and underlying table) and replaced with has_and_belongs_to_many relationship on Region so that we can do region.super_region and region.sub_regions. Added unit tests for Region

added templates history page

Moved orcid_id from users table to user_identifiers. Added option_based flag to question_formats. switched Object.const_defined to table_exists checks in db migrations because rails loads references to classes on demand so the objects are likely not defined when the migrations run. safer to check for the underlying table's existence

resolved merge conflicts