Added registration controller tests, updated reference to Devise's deprectaed 'bypass' with bypass_sign_in', added some test helper to verify redirects to welcome page (for unauthorized attempts) and projects list page (for authorized). Added language_id back to attr_accessible on User model

Added authentication test and registration controller test. Added troubleshooting info to README. Added generic omniauth id to registration form

Merge branch 'migrate_version_published' into postgresql

expand migration to work with pg

Merge branch 'text_changes' into postgresql

text changes requested by Sarah 2016/11/14

Merge branch 'add_spanish' into postgresql

add spanish translations

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

Merge branch 'add_new_fr' into postgresql

add new french translations

Merge branch 'optional_about_tab' into postgresql

if no title for news tab miss it out

Merge pull request #68 from CDLUC3/development ...

ORCID functionality added to user profile page

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

Merge branch 'add-orcid-functionality' into development

Merge branch 'master' into development

removed white space

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

Merge branch 'profile_save' into postgresql

fix save profile

Merge branch 'profile_save' into postgresql

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

added in locale entries for identifier schemes

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 add-orcid-functionality