removed ability to customize view branding folder name. It will just be called branded now

moved assets from app/assets to lib/assets. The files in lib/assets will be used by Rails unless override by an equivalent file in app/assets. Added logic to applicationController so that it will look first for a template in app/views/[:branded folder name] before using the default in app/views

Bug fix to the column layout handler on the view plans page

Corrected spelling of text_desription field in token_permission_types

Updated locale files with proper labels for the plan export screen

fixed issue with settings data saved to the DB using an old version of the gem. stripped html tags from question text for display in the export form.

attempting to silence the activerecord log during tests.

attempting to silence the activerecord log during tests.

removed mysql dependency from travis file and updated database_example.yml so that it uses sqlite instead of mysql for testing

added 'bundle exec' to the rake commands in travis file

removed mysql db from travis since we're using sqlite for testing now. added line to have it run db:migrate on test db

fixed merge conflict issue in travis file

tidied up new tests and fixtures. Commented out old tests that were failing. Updated relationship between TokenPermissionType and Organisation so that token_permission_type.organisations works

commented out guidance and guidance_group tests

fixed some existing template and guidance tests. Fixed reference to user.organisations in the GuidanceGroup model

updated fixture reference in api_projects_controller_test

removed forced test flunks from api_projects_controller_test

commented out guidance_group and guidance tests because they were referencing old defunct fixtures

removed template relationship tests in User test

added template, version and phase test fixtures

removed user_status and user_type from tests

switched User->Language relationship in Model from has_one to belongs_to

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

moved in new fixtures

moved in some initial unit tests for user and org models

Merge pull request #14 from DMPRoadmap/master ...

rebase with DCC changes from the Nov. 1st sprint

Merge pull request #56 from DigitalCurationCentre/master ...

Latest changes from DCCRoadmap coming back

merge postgresql -> master

Merge pull request #7 from DMPRoadmap/master ...

Merge latest DMPRoadmap changes to DCC

Merge pull request #49 from CDLUC3/master ...

Bug fixes - Plan and Template pages and Devise authentication