Fixed the way params are pulled into the identifier scheme intialization

removed spinner css from application.rb

updated nil/empty check in orcid callback

tweaked user_identifier record creation

changed render to redirect for post oauth

fixed syntax error in orcid omniauth callback

updated omniauth callback handler for orcid

ignored wicked_pdf.rb initializer because it will likely need to be server specific. Updated from_omniauth method on User

Added user_identifiers back to the User.rb object and added comments to new function

Updated devise initializer to load orcid omniauth provider without params

resolving merge conflicts during rebase

ran db migrations

resolving merge conflicts

Merge pull request #52 from DigitalCurationCentre/master ...

Merging latest bugfixes/ postgres compatibility fixes

Added both DB gems for dev/merging compatibility

setup dynamic omniauth provider structures and tied it into devise

moved migrating user permissions to a rake task migrate:permissions

fixed issue where users needed an unconfirmed_email field due to faulty devise setting

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

renamed example files which get loaded by rails and cause configuration problems.

removed comparison from boolean value to an integer in organisation model

modifying relationship between users and organisations \n -users now belong_to organisation \n -organisations now have_many users \n -removed the depricated user_org_roles structure with migration \n -moved data out of that structure into the existing organisation_id field of users to complete relationship \n -re-evaluated functions to do with organisation_id field, as it was used as a placeholder before

Added a new identifier_schemes table and corresponding user_identifiers join table. Added the initial ORCID identifier scheme to the seeds.db file. Updated the locales file to include corresponding identifier tooltip language, logos, and initial connection message. Updated user profile page to dynamically display identifiers

fixed issue with 'make small changes' selection on template version edit modal

Fixed issues with modal dialog functionality when trying to edit a published template

factor out question guidance to reduce sql queries

Added tinymce configuration line to the template/phase edit page

fixed authorization variable issue in dmptemplates_controller#admin_cloneversion

Merge branch 'master' of https://github.com/DMPRoadmap/roadmap into postgresql

Fixed issue with plan creation not properly saving guidance selections. Fixed contact us page typos