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

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

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

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

resolved rebase merge conflicts

Updated locale files with proper labels for the plan export screen

updated application controller so that a user is redirected to the main landing page when then try to access a secure page when not logged in. Added the corresponding locale messages that will be displayed when this happens

setup dynamic omniauth provider structures and tied it into devise

Added a new identifier_schemes table and corresponding user_identifiers join table. Added the initial ORCID identifier scheme to the seeds.db file. Updated the locales file to include corresponding identifier tooltip language, logos, and initial connection message. Updated user profile page to dynamically display identifiers

Fixed issue with plan creation not properly saving guidance selections. Fixed contact us page typos

Added wkhtmltopdf binaries to gemfile. Moved wicked_pdf config to an initializer so that it can be custom to the server instance. Updated dead link to DMP Checklist pdf

fixed broken link on terms page

fixed typo in fr.yml locale file. Added custom failure app for devise that should redirect the user to the home page on a session timeout

Updated devise to redirect user to the home page after session expiration rather than the unauthorized page

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

Fixes to the users page

Added tooltip for 'published' checkbox on guidance page. Added confirmation alert when clicking delete on guidance and guidance groups. Removed invalid policy check for organisation id match when creating new guidance

fixed typo in invalid web address notification

Updated 'destroy' label on view plans page to read 'delete'

Changed 'plan title' to 'file name' in export settings to more accurately reflect what the information will be used for.

Added trap for Dragonfly exceptions on the organisation update. It will now display the logo upload error message stored in the locale files

fixed policy name typo in locale files

updated 'i accept the terms and conditions' link on sign up form so that the terms open in a separate window