fixed a few merge conflicts

added theme unit tests and started cleanup of remaining existing tests

merge in changes from origin

port of plan creation and editing to new data model

removed region_group (and underlying table) and replaced with has_and_belongs_to_many relationship on Region so that we can do region.super_region and region.sub_regions. Added unit tests for Region

added templates history page

Moved orcid_id from users table to user_identifiers. Added option_based flag to question_formats. switched Object.const_defined to table_exists checks in db migrations because rails loads references to classes on demand so the objects are likely not defined when the migrations run. safer to check for the underlying table's existence

resolved merge conflicts

replaced use of fixtures with db/seeds.rb. no point in maintaining both

added new seed file that works with new schema. commented out plans and answers for now though because plan model is unfinished

Added checks to migration files that manipulate data to make sure that the model they are attempting to access is defined in the current codebase

added some more attr_accessible attributes for new fields. finished up seed.rb file.

started seeds.rb rebuild to work with new schema. Removed guidance_in_group association from guidance. added some attr_accessible attributes

added checks in migration code where we try to manipulate data belonging to a table that no longer exists in the current codebase

resolved merge conflicts

merged final_schema changes into visibility

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