fixed merge conflicts

fixed merge conflicts in branding.yml and schema.rb

added in new files for public plans page. added code coverage to .gitignore

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

put validation back in place that ensures a question can only have a single answer within a plan

changed schema to be correct for data migration

updated schema to reflect final set of migrations after going through process from scratch

fixed merge conflict in seeds.rb file. installed substance-rails gem and updated code to swap in the substance-forms text-area for tinymce on the answer section of the edit plans page

Switched answer text area to substance editor.

fixed template versioning and customisers in migration

switched visibility to be a bit flag using FlagShihTzu instead of a lookup table. adjusted db migration. Removed all of the empty stub test files generated by the rails scaffolding mechanism.

Added visibility model, and started updating tests for public dmps controller but we need to create fixtures which is extremely difficult with the current state of the DB. Will wait for refactor before finishing tests.

removed old is_test and is_public migrations for projects table and added migration for visibilities table

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

fixed bug in is_test and is_public setters so that it allows both a true boolean or an int

Added an index to the projects table for id, is_test and is_public

Added is_test and is_public flags to the projects table. Added unit tests for new fields. Removed unecessary attr_accessible section from projects model. Added setters for new flag fields so that only one can be true at a given time

final tweks to ensure all migrations happen together

replaces Organisation. with Org. in all files

updated schema

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

Added domain to the identifier_Scheme table. Added unit and functional tests for the identifier_scheme functionality

added identifier_Schemes table check to user.rb model. Both ActiveAdmin and Devise attempt to initialize the object during a rake command which forces a 'table does not exist' error.

Added tests for the new omniauth functionality

Removed logo from identifier_schemes db table and added it to yaml locales. Added more entries for to the locales for oauth. Added red 'x' removal link for oauths on profile page. updated registrations controller so that users hitting the oauth handler that are not already signed in are brought to a registration page with a new user record that is connected to the oauth identifier

resolved rebase merge conflicts

Corrected spelling of text_desription field in token_permission_types

fixed db migration so that it does not update user records in TEST mode. Added sqlite3 to gemfile for tests. Added languages fixture

resolving merge conflicts during rebase

ran db migrations