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

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

fixed issue with the oauth hash in the registrations controller

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

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

add a reset_password_link method for convenience

fix double sign-up bug: #69

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

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

text changes requested by Sarah 2016/11/14

if no title for news tab miss it out

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 'postgresql' of https://github.com/DigitalCurationCentre/roadmap into postgresql

fix save profile

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