removed substance-forms modifications from the dev branch. will place in a separate branch so that we can continue development

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 answer text area to substance editor.

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

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

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 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.

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 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

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

renamed hash_to_json_object in application_helper to hash_to_js_json_variable to make its purpose clearer

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

get rid of explcit urls in admin/superadmin links

Moved org specific telephone, address and google maps link to config/branding.yml

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

Added authentication test and registration controller test. Added troubleshooting info to README. Added generic omniauth id to registration form

text changes requested by Sarah 2016/11/14

if no title for news tab miss it out

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 in locale entries for identifier schemes

Updated routes to check for the existence of the new identifier_schemes table because rake db:migrate initializes the Rails app and devise tries to make use of the new table

Merge branch 'master' into add-orcid-functionality

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 <p> wrapping from default answers in preview