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

switched visibility to be a bit flag using FlagShihTzu instead of a lookup table. adjusted db migration. Removed all of the empty stub test files generated by the rails scaffolding mechanism.

commented out problematic index in db migration for active admin table

commented out problematic index in db migration for active admin table

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.

removed old is_test and is_public migrations for projects table and added migration for visibilities table

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

fixed bug in is_test and is_public setters so that it allows both a true boolean or an int

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

Added is_test and is_public flags to the projects table. Added unit tests for new fields. Removed unecessary attr_accessible section from projects model. Added setters for new flag fields so that only one can be true at a given time

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.

expand migration to work with pg

add spanish translations

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

added identifier_Schemes table check to user.rb model. Both ActiveAdmin and Devise attempt to initialize the object during a rake command which forces a 'table does not exist' error.

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

resolved rebase merge conflicts

Corrected spelling of text_desription field in token_permission_types

fixed db migration so that it does not update user records in TEST mode. Added sqlite3 to gemfile for tests. Added languages fixture

updated seeds file with the correct orcid id scheme settings

resolving merge conflicts during rebase

ran db migrations

setup dynamic omniauth provider structures and tied it into devise

modifying relationship between users and organisations \n -users now belong_to organisation \n -organisations now have_many users \n -removed the depricated user_org_roles structure with migration \n -moved data out of that structure into the existing organisation_id field of users to complete relationship \n -re-evaluated functions to do with organisation_id field, as it was used as a placeholder before

Added a new identifier_schemes table and corresponding user_identifiers join table. Added the initial ORCID identifier scheme to the seeds.db file. Updated the locales file to include corresponding identifier tooltip language, logos, and initial connection message. Updated user profile page to dynamically display identifiers

Merge branch 'master' of https://github.com/DMPRoadmap/roadmap into postgresql