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 visibility over to an enum. updated the project objects accordingly. Added some more unit tests. Updated locale files with visibility text

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

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

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

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

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

fixed issue with the oauth hash in the registrations controller

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

Development

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.

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

fix double sign-up bug: #69

fixed nil check bug in registrations controller

Added registration controller tests, updated reference to Devise's deprectaed 'bypass' with bypass_sign_in', added some test helper to verify redirects to welcome page (for unauthorized attempts) and projects list page (for authorized). Added language_id back to attr_accessible on User model

Had to remove code that was building devise omniauth connections dynamically. The timing of when the rails engine builds the routes and the models is not conducive to this approach

Added domain to the identifier_Scheme table. Added unit and functional tests for the identifier_scheme functionality

fixed merge conflicts

Merge branch 'master' into add-orcid-functionality

fixed bug where selecting guidance was impropperly filtering