added additional locale message for identifier schemes and a remove icon

resolved rebase merge conflicts

fixed issue with settings data saved to the DB using an old version of the gem. stripped html tags from question text for display in the export form.

tidied up new tests and fixtures. Commented out old tests that were failing. Updated relationship between TokenPermissionType and Organisation so that token_permission_type.organisations works

switched User->Language relationship in Model from has_one to belongs_to

updated user permissions conversion to migrate org_admin details properly

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

resolving merge conflicts during rebase

setup dynamic omniauth provider structures and tied it into devise

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

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

updated the update_user_permissions function to make it more performant

added nil check to user model's keep token method

Fixed typos: changed all change_org_detials to change_org_details

Updated association between User and Organisation to reflect the removed user_org_roles table. Each User now belongs_to an Organisation.

reverted back changes to user<-->org relationship. added missing api and magic strings sections to the other locale files.

Revert "Fix to bug in user model that was preventing the organisation association from working (#30)" ...

This reverts commit 03941c1.

Fix to bug in user model that was preventing the organisation association from working (#30) ...

* updated dragonfly max logo height/width to 160px to fit with current max size of DMPRoadmap logo

* updated organisation edit page's error messages so that errors are placed in the alert text section. Updated wording in locale files to reflect the 160x160 file size.

* removed height and width constraints to logo upload function. Added method that will resize the uploaded logo so that the width is 160px (maintaining aspect ratio) so that the logo fits within the layout properly

* changed logo size to a height of 100 and moved logo so that it appears alongside the DMPRoadmap logo per the current specifications

* Removed description field from organisation. Add contact email to the organisation. Change the way the logo is displayed on the organisation screen.

* commented out legacy user.organisation_id method in user model. Each user now belongs to one organisation

* Commented out other deprecated user<-->organisation methods so that they use the user.organisation_id field instead of the user.organisations structure. This needs to be cleaned up and overhauled in the user and organisation models so that user belongs to an organisation and organisations have many users, and any references to the old code need to be updated.

Commented out deprecated user.organisation_id method (#29) ...

* updated dragonfly max logo height/width to 160px to fit with current max size of DMPRoadmap logo

* updated organisation edit page's error messages so that errors are placed in the alert text section. Updated wording in locale files to reflect the 160x160 file size.

* removed height and width constraints to logo upload function. Added method that will resize the uploaded logo so that the width is 160px (maintaining aspect ratio) so that the logo fits within the layout properly

* changed logo size to a height of 100 and moved logo so that it appears alongside the DMPRoadmap logo per the current specifications

* Removed description field from organisation. Add contact email to the organisation. Change the way the logo is displayed on the organisation screen.

* commented out legacy user.organisation_id method in user model. Each user now belongs to one organisation

updated efficiency of update_user_permissions

more merge conflicts

overhaul of performance of users admin-index

added docs to new function

finished changes to update_user_permissions

made changed to user.rb

made changes to update user permissions

added debug to update_user_permissions