removed devise.rb initializer. this should be specific to the server running the application

fixed broken link on terms page

reverted changes to devise that were attempting to redirect users to the login page after session expiration. It was causing occassional sign_in issues due to a redirect loop

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

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

fixed typo with class name

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

added nil check to user model's keep token method

removed tooltip for now defunct description field from the organisation page

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.

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

fixed issue with plan list column display issue

fixed issue with branding variable resolution on plan modal dialogs

Fixed typos: changed all change_org_detials to change_org_details

removed references to old existinguser controller that was used to handle logins from old DMPOnline v3 accounts

added errors to organisation controller flash notice

fixed bad route reference in organisations controller

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

Fixed duplicate table issue in edit organisation details page cause by an old merge conflict resolution

fixed organisation policy file to use user.organisation instead or user.organisation_id and fixed typos

fixed policy name typo in locale files

Updated association between User and Organisation to reflect the removed user_org_roles table. Each User now belongs_to an Organisation.