Updated controller so that user is kept on the edit profile page after saving their changes

added json response back to the settings/projects controller. This just returns the list of selected and available columns for the user's preferences

fixed position and look of organisation dropdown in Sign Up form

ran bundle update to rebuild Gemfile.lock

updated 'i accept the terms and conditions' link on sign up form so that the terms open in a separate window

increased width of nav bar so that 'change language' and german/french versions stop wrapping

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

Merge pull request #11 from DMPRoadmap/master ...

rebase with DCC changes

Merge pull request #32 from DigitalCurationCentre/master ...

Merge DCC work into shared Roadmap

fixed issue where orgs cannot customise other org's(funders) templates. logic for this auth limiting dosent make me happy as it potentially allows organisations to submit edited json via post and change the other organisations existing sections, even if that option is not available through the ui

fixed bug where projects_controller wouldnt compile. there was an end in the middle of the file, terminiateing the class prematurely

Merge branch 'fix_ul_html'

allow display of html in question

merged local into remote

added authorization to settings/plans and settings/projects

final updates to routes

removed json responces from settings/plans and settings/projects controllers

updated routes to reflect usable actions in controllers

removed unused controllers: User_org_roles, user_org_types, user_statuses, user_types

added auth and removed json from project_groups controller. additionally added constraint to projects and plans controllers that all actions must be authenticated through pundit

added auth and removed json from project_groups controller. additionally added constraint to projects and plans controllers that all actions must be authenticated through pundit

removed unused json responses and added auth to plans controller

removed json and added authorization to projects controller

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

moved authorization logic from comments controller to policy file. Additionally removed unused crud methods

moved logic for authorization out of answers controller into the policy

removed json and added authorization to answers_controller