resolved merge conflicts

merged final_schema changes into visibility

fixed merge conflicts

fixed merge conflicts in branding.yml and schema.rb

updated api templates endpoints to use new data access

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

added gemfile and broken branding file

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

began updating roles

fixed functional tests on static_pages controller

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

updated users_controller, mainly renaming roles to perms

renamed comments to notes

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 locale specific column headers for new visibility column. Made the new column NOT a default

Added logic to display the correct visibility based on whether the project is_test or is_public or neither

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

Added magic strings and identifier schemes to new ES locale file. Updated names of magic string categories so that they match the table names

replaces Organisation. with Org. in all files

Removed devise/identifier scheme comparison from environment.rb. Cannot run data migrations with it in place because it references the IdentifierScheme model but the table has not yet been defined

added migration to add foreign keys. Also needed to remove the temporary models, and update existing models to reflect the new relationships

Merge pull request #16 from DMPRoadmap/development ...

Development

fixed typo in fr.yml locale file that was introduced while resolving merge conflicts

Resolved merge conflicts with fr.yml locale file and the user.rb model. Kept 'language_id' in the attr_accessible list and kept both the self.from_omniauth and reset_password_link methods.

fixes from feedback from french testing of dmponline

added a initialization helper to assist with omniauth provider registration. Added a remove.png image for disconnecting providers from user accounts

bugs found in fr dmponline

total schema data migration: now with customized templates