renamed example files which get loaded by rails and cause configuration problems.

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.

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 branding variable resolution on plan modal dialogs

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

Fixed bug in yaml files. Updated help page content so that it lists an MIT license

updated links and email addresses on the static forms

Changed Digital Curation 'Center' to 'Centre' in all locale files

Added fix for issues when displaying column headings on the view plans page. Setup and 'Unknown' column heading that defaults to ' - ' but is updateable in the locale files. If there are issues determining the column heading it will use that value

final updates to routes

updated routes to reflect usable actions in controllers

updated routes to reflect earlier changes i.e. removing unused CRUD, exposed resources and actions

removed unused actions and json from users controller

reverted back changes to user<-->org relationship. added missing api and magic strings sections to the other locale files.

Commented out deprecated user.organisation_id method (#29) ...

* updated dragonfly max logo height/width to 160px to fit with current max size of DMPRoadmap logo

* updated organisation edit page's error messages so that errors are placed in the alert text section. Updated wording in locale files to reflect the 160x160 file size.

* removed height and width constraints to logo upload function. Added method that will resize the uploaded logo so that the width is 160px (maintaining aspect ratio) so that the logo fits within the layout properly

* changed logo size to a height of 100 and moved logo so that it appears alongside the DMPRoadmap logo per the current specifications

* Removed description field from organisation. Add contact email to the organisation. Change the way the logo is displayed on the organisation screen.

* commented out legacy user.organisation_id method in user model. Each user now belongs to one organisation

Merged branding changes from the development branch into the master branch that now contains DCC's changes to permissions/roles, internationalization and bug fixes

merged DCC changes into master

added ability to grant permissions to other users

finished changes to update_user_permissions

removed initalizer for rollify

added granting api to orgs permission