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

fixed a few merge conflicts

added theme unit tests and started cleanup of remaining existing tests

merge in changes from origin

first port of plan creation and editing to new data model

resolved merge conflicts

merged final_schema changes into visibility

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

switched visibility over to an enum. updated the project objects accordingly. Added some more unit tests. Updated locale files with visibility text

hacked templates landing page to work

Added a few 'TODO:' statements indicating some methods we should remove. (Do a "grep -r 'TODO:' ./app"). Added some template and comments unit tests

finsihed adding visibility to project details page as radio button options. Updated public DMPs page to work with new visibility and moved it to the static pages controller since it falls outside of normal security. Updated all locale files accordingly

added unit test for new visibility model and updated projects test to check visibility

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.

working on public dmp export

worked on routing and controller tests for new public dmps. Fixed routing tests so that they use rails route helpers

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

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

fixed equality bug in is_test and is_public setters on Projects model

added JS logic to prevent is_test and is_public from both being true on the project edit page. Also added include to projects show page so that it pulls in the projects.js file

updated locale files so that helpers.yes and helpers.no work. Those are yaml keywords so they must be quoted (e.g. 'yes': 'Oui' instead of yes: 'Oui'). Added is_public and is_test checkboxes to projects edit/create forms

fixed typo in params security on Projects controller. verified that plans can be created and updated

Added permitted parameter list to projects controller to replace old attr_accessible on Project model

replaces Organisation. with Org. in all files

replaced invalid SQL conditionals "&&" with "AND"

fixed bug where projects_controller wouldnt compile. there was an end in the middle of the file, terminiateing the class prematurely

added auth and removed json from project_groups controller. additionally added constraint to projects and plans controllers that all actions must be authenticated through pundit

removed json and added authorization to projects controller

Removal of ajax calls from the Create Plan page (#31)

Merging current stable development branch into master (#23) ...

This is our unofficial v.0.1.0 release. It includes:
- Rails 4.2 migration
- Internationalization
- API
- Institutional logo upload (thanks to Weiwei and the Univ. of Alberta)
- Generic branding
- General cleanup of code and bug fixes