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

reinstate branding.yml

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

text changes requested by Sarah 2016/11/14

add spanish translations

add new french translations

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

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

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

added additional locale message for identifier schemes and a remove icon

Fixed name of wicked_pdf initializer example and removed devise.rb initializer

fixed typo in devise.rb.example

Added check to devise initializer so that it does not try to access the IdentifierSchemes table before it has been created (happens when running db:migrate)

Added check to devise initializer so that it does not try to access the IdentifierSchemes table before it has been created (happens when running db:migrate)

resolved rebase merge conflicts

Updated locale files with proper labels for the plan export screen

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.