began changing models to reflect the new model names and relationships, additionally deleting some old/unused models which no longer apply in the new schema.

removed unused models

added migration to add foreign keys. Also needed to remove the temporary models, and update existing models to reflect the new relationships

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.

updated code to write user-generated content (answers/notes)

fixes from feedback from french testing of dmponline

bugs found in fr dmponline

updated models for data migration

add a reset_password_link method for convenience

removed the unused user_id field from the dmptemplates table

removed models and super admin pages for removed tables user_role_type, user_status, and user_type

removed domain and stylesheet_id from organisation. Both were unused on the front and back ends of the tool

removed role_in_plans, resource_id, and resource_type from the roles table. All were unused

removed parent_id field from questions table

removed option_warnings table and unused code surrounding the structure

removed user_statuses, user_types, and user_role_types tables and associations which referenced them

Added new ORCID field to the export pages

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

Merge branch 'master' into postgresql

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

fixed bug where templates were not based on most recent version, causing organizational customizations of templates to not show up to the end user

resolved rebase merge conflicts

Corrected spelling of text_desription field in token_permission_types

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.