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

Corrected spelling of text_desription field in token_permission_types

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.

attempting to silence the activerecord log during tests.

merge postgresql -> master

updated passwords controller to redirect user to the main landing page after initiating a password reset. Removed reference to invalid spinner css from main layout file

translation no longer breaks on header link to create plan

resolving merge conflicts during rebase

resolving merge conflicts

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 issues with modal dialog functionality when trying to edit a published template

factor out question guidance to reduce sql queries

Added tinymce configuration line to the template/phase edit page

fixed authorization variable issue in dmptemplates_controller#admin_cloneversion

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

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

removed data access from view of token_permission_types

Update users page logic so that current user cannot edit their own permissions

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 issue with missing organisation_id for current user

removed tooltip for now defunct description field from the organisation page

replaced invalid SQL conditionals "&&" with "AND"

fixed issue with policy check when saving changes to a plans export settings

Updated export page so that the settings section of each phase's accorordion panel is not an accordion. Its now just a div.

updated actionmailer to use the hostname when adding urls to emails. Also fixed bug in [object]_path route helpers contained within an ActionMailer view. ActionMailer was not proviing the localization portion of the url. Manually including the default locale now in links to the project