updated gitignore to include initializers that should be server specfic. removed reference to missing spinner.css

translation no longer breaks on header link to create plan

updated seeds file with the correct orcid id scheme settings

Fixed the way params are pulled into the identifier scheme intialization

fixed display bug on plan creation confirmation pop up

updated user permissions conversion to migrate org_admin details properly

removed spinner css from application.rb

removed user_org_roles from active admin

updated user organisation in active-admin

added rake task to seed database with key values, additionally added rake task to perform all migration tasks

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