trying to fix settings routes and views

sort out post merge issues

resources -> resource

mege in head changes

trying to reduce data access queries. Needs more work

some cleanup of irrelevant objects (e.g. removal of remaining OrganisationType)

merge in changes from origin

first port of plan creation and editing to new data model

added templates history page

resolved merge conflicts

merged final_schema changes into visibility

updated api templates endpoints to use new data access

extracted plan visibility work out of dev branch for PR to DCC

hacked templates landing page to work

began updating roles

finsihed adding visibility to project details page as radio button options. Updated public DMPs page to work with new visibility and moved it to the static pages controller since it falls outside of normal security. Updated all locale files accordingly

updated users_controller, mainly renaming roles to perms

renamed comments to notes

worked on routing and controller tests for new public dmps. Fixed routing tests so that they use rails route helpers

Added initial public DMPs page to display public plans to unauthenticated users

replaces Organisation. with Org. in all files

added migration to add foreign keys. Also needed to remove the temporary models, and update existing models to reflect the new relationships

Had to remove code that was building devise omniauth connections dynamically. The timing of when the rails engine builds the routes and the models is not conducive to this approach

fixed merge conflicts

Updated routes to check for the existence of the new identifier_schemes table because rake db:migrate initializes the Rails app and devise tries to make use of the new table

Added tests for the new omniauth functionality

added additional locale message for identifier schemes and a remove icon

setup dynamic omniauth provider structures and tied it into devise

final updates to routes

updated routes to reflect usable actions in controllers