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

added and finalized unit tests for user, token_permission_types, identifier_Schemes, user_identifiers, organisations

added unit tests for question format

attempted to add some unit tests for Answers but the data will be changing so much that it did not make sense to continue at this point. Created tests for Language

Added test fixtures for answers, questions, question formats, and answer formats

removed test fixtures for Settings.

Added test fixtures for ExportedPlan and Settings.

finished up application controller tests

updated roles test fixture to use the modified magic string name

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

fixed bug in new config test

moved devise config checks to a test

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

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

fixed issue with the oauth hash in the registrations controller

finished application_helper tests

renamed hash_to_json_object in application_helper to hash_to_js_json_variable to make its purpose clearer

removed unused link_to_function and link_to_add_object methods from application_helper

added initial application_helper tests

added simplecov gem for testing to provide us with a test coverage report. Added a test for application_helper.rb. Removed tab characters from application_helper.rb and added some lines to help with readability

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.

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

Merge pull request #71 from DigitalCurationCentre/master ...

Latest changes from DCC Roadmap/master

Merge branch 'postgresql'

Merge branch 'reinstate_branding' into postgresql

reinstate branding.yml