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

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

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

removed commented out code from new branding changes

removed commented out code from new branding changes

removed local version of app/assets/logo from version control

renamed layout partials to remove reference to dmponline. Updated configurations so that the code default assets are stored in lib/assets and any instance specific versions would be stored within app/assets. Move static page content out of the large locales files and placed examples of them into config/locales/static_pages

removed ability to customize view branding folder name. It will just be called branded now

moved assets from app/assets to lib/assets. The files in lib/assets will be used by Rails unless override by an equivalent file in app/assets. Added logic to applicationController so that it will look first for a template in app/views/[:branded folder name] before using the default in app/views

Added tests for the new omniauth functionality

fixed typo in fr.yml locale

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

Merge branch 'master' into add-orcid-functionality

Bug fix to the column layout handler on the view plans page

added additional locale message for identifier schemes and a remove icon

reverted travis file back to db:migrate

remove db:test:prepare and replaced with specific drop, create and migrate

remove db:test:prepare and replaced with specific drop, create and migrate

switch travis to use db:test:prepare instead of db:migrate

switch travis to use db:test:prepare instead of db:migrate