switched visibility over to an enum. updated the project objects accordingly. Added some more unit tests. Updated locale files with visibility text

added unit test for exported_plan. added validations to exported_plan and has_many side of relationship to user and plan

Added magic strings and identifier schemes to new ES locale file. Updated names of magic string categories so that they match the table names

Resolved merge conflicts with fr.yml locale file and the user.rb model. Kept 'language_id' in the attr_accessible list and kept both the self.from_omniauth and reset_password_link methods.

add a reset_password_link method for convenience

Had to remove code that was building devise omniauth connections dynamically. The timing of when the rails engine builds the routes and the models is not conducive to this approach

profile save crashing

Added domain to the identifier_Scheme table. Added unit and functional tests for the identifier_scheme functionality

added identifier_Schemes table check to user.rb model. Both ActiveAdmin and Devise attempt to initialize the object during a rake command which forces a 'table does not exist' error.

fixed merge conflicts

Updated routes to check for the existence of the new identifier_schemes table because rake db:migrate initializes the Rails app and devise tries to make use of the new table

Removed logo from identifier_schemes db table and added it to yaml locales. Added more entries for to the locales for oauth. Added red 'x' removal link for oauths on profile page. updated registrations controller so that users hitting the oauth handler that are not already signed in are brought to a registration page with a new user record that is connected to the oauth identifier

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.