Removed devise/identifier scheme comparison from environment.rb. Cannot run data migrations with it in place because it references the IdentifierScheme model but the table has not yet been defined

Merge branch 'development' of https://github.com/CDLUC3/roadmap into development

fixed issue with the oauth hash in the registrations controller

finished application_helper tests

renamed hash_to_json_object in application_helper to hash_to_js_json_variable to make its purpose clearer

removed unused link_to_function and link_to_add_object methods from application_helper

added initial application_helper tests

added simplecov gem for testing to provide us with a test coverage report. Added a test for application_helper.rb. Removed tab characters from application_helper.rb and added some lines to help with readability

Merge pull request #16 from DMPRoadmap/development ...

Development

fixed typo in fr.yml locale file that was introduced while resolving merge conflicts

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.

added a initialization helper to assist with omniauth provider registration. Added a remove.png image for disconnecting providers from user accounts

Merge pull request #71 from DigitalCurationCentre/master ...

Latest changes from DCC Roadmap/master

Merge branch 'postgresql'

Merge branch 'reinstate_branding' into postgresql

reinstate branding.yml

Merge branch 'reset_password_link' into postgresql

add a reset_password_link method for convenience

Merge pull request #11 from DigitalCurationCentre/postgresql ...

Postgresql - pull latest changes into master

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

Merge branch 'double_sign_up' into postgresql

fix double sign-up bug: #69

Merge branch 'link_fixes' into postgresql

get rid of explcit urls in admin/superadmin links

fixed nil check bug in registrations controller

Moved org specific telephone, address and google maps link to config/branding.yml

moved orcid and remove images to lib

fixed authentication integration test. updated test_helper to compensate for Devise sometimes having an intermediate redirect

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 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