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

Merge branch 'master' into postgresql

removed commented out code from new branding changes

renamed layout partials to remove reference to dmponline. Updated configurations so that the code default assets are stored in lib/assets and any instance specific versions would be stored within app/assets. Move static page content out of the large locales files and placed examples of them into config/locales/static_pages

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

Added tests for the new omniauth functionality

Removed logo from identifier_schemes db table and added it to yaml locales. Added more entries for to the locales for oauth. Added red 'x' removal link for oauths on profile page. updated registrations controller so that users hitting the oauth handler that are not already signed in are brought to a registration page with a new user record that is connected to the oauth identifier

Merge branch 'master' into add-orcid-functionality

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

added additional locale message for identifier schemes and a remove icon

Merge branch 'add-orcid-functionality' of https://github.com/CDLUC3/roadmap into add-orcid-functionality