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 the migration to set the customizing organisation properly

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 over to an enum. updated the project objects accordingly. Added some more unit tests. Updated locale files with visibility text

updated foreign keys null refreence ripper to remove things from a join table

re-aranged migrations so that big_flags for orgs happen before foreign keys

re-aranged migraitons so that bit_flags for roles happens before foreign keys

added role scrubbing to foreign keys 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.

commented out problematic index in db migration for active admin table

commented out problematic index in db migration for active admin table

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

replaced plan roles with bitflags

removed organisation_types and replaced with bitflags

replaces Organisation. with Org. in all files

updated data migration to not over-write organisation_id for templates with nil