updated gitignore to include initializers that should be server specfic. removed reference to missing spinner.css

resolving merge conflicts

removed comparison from boolean value to an integer in organisation model

modifying relationship between users and organisations \n -users now belong_to organisation \n -organisations now have_many users \n -removed the depricated user_org_roles structure with migration \n -moved data out of that structure into the existing organisation_id field of users to complete relationship \n -re-evaluated functions to do with organisation_id field, as it was used as a placeholder before

fixed issue with 'make small changes' selection on template version edit modal

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

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

Fixed JS issues with select2 boxes not properly updating contents when 'not applicable' clicked and not updating the funder/institution on the confirm dialog

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

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

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

fixed broken link between organisations and users

updated the update_user_permissions function to make it more performant

added nil check to user model's keep token method

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

removed trailing ] from plans_controller

removed tooltip for now defunct description field from the organisation page

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

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

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.