Added magic strings and identifier schemes to new ES locale file. Updated names of magic string categories so that they match the table names

replaces Organisation. with Org. in all files

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.

fixes from feedback from french testing of dmponline

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

bugs found in fr dmponline

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

text changes requested by Sarah 2016/11/14

add spanish translations

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

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