commented out unecessary org_token_permission model. We use a has_and_belongs_to_many relationship which defines the join table directly

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

commented out organisation getter/setter in user. switched calls to org

removed references to organisation_id in several models and replaced with .org.id

added some missing unit tests. fixed typo on Template.has_customisations? method

renamed projects_helper to plans_helper. moved template.settings tests to settings:template_test

Merge branch 'final_schema' of https://github.com/CDLUC3/roadmap into final_schema

Merge pull request #28 from DigitalCurationCentre/final_schema ...

changes from DCC for Tuesday

Updated projects_helper by renaming 'project_list_column_body' to 'plan_list_column_body'. updated references to that code block. moved hard-coded 'Unknown' to locale files. Added tests for projects_helper

initial customization functionality

fixed bug where sections not editable, questions not saveable

fixed minor typo in admin_phase view

Merge branch 'final_schema' of https://github.com/CDLUC3/roadmap into final_schema

corrected test for title check of the 'my plans' page

Merge pull request #27 from DigitalCurationCentre/final_schema ...

settings and reducing queries

first step in reducing page edit sql queries

Merge pull request #26 from DigitalCurationCentre/final_schema ...

pulling in changes from DCC

Merge branch 'final_schema' of https://github.com/DigitalCurationCentre/roadmap into final_schema

move plan list settings from project to plan

Merge pull request #19 from CDLUC3/final_schema ...

Further work on tests

added answers_controller tests

fixed issue with static_pages_controller_test

updated test_helper to use model_name.human.pluralize.titleize instead of calling out to I18n

fixed issues with application_controller tests

started correcting issues with function tests for application_controller

added a few attributes to Plan and User attr_accessible sections

fixed issue with routes test

switched references to Project to Plan in routes test

fixed User.name test due to new param added to method

updated generic deep copy test to check for uniqueness of excluded attributes (e.g. id, slug, dates, etc.). Fixed typo in Question.deep_copy. Added calls to deep_copy test for template, phase and section