Added 'visibility' to the list of potential columns for the plan list page

Added 'visibility' to the list of potential columns for the plan list page

Added is_test and is_public flags to the projects table. Added unit tests for new fields. Removed unecessary attr_accessible section from projects model. Added setters for new flag fields so that only one can be true at a given time

added and finalized unit tests for user, token_permission_types, identifier_Schemes, user_identifiers, organisations

added unit tests for question format

attempted to add some unit tests for Answers but the data will be changing so much that it did not make sense to continue at this point. Created tests for Language

Added test fixtures for answers, questions, question formats, and answer formats

finished up application controller tests

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

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.

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

commented out guidance and guidance_group tests

fixed some existing template and guidance tests. Fixed reference to user.organisations in the GuidanceGroup model

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

allowed organisations to save their details without submitting a contact email