Merge pull request #189 from DigitalCurationCentre/development ...

Reinstating Formtastic which was prematurely removed.

Reinstating Formtastic which was prematurely removed.

Merge branch 'development' into development

updated recaptcha gem to 4.x. Updated gemfile and example initializer because 4.x changed the vraible names for its API

- Fixed app/controllers/admin/application_controller.rb oopsie ...

- Upgraded Administrate to 0.4.0 release

Added a rake task to port orcids from the old field in the users table over to the new user_identifiers table. Removed the old unworking migration (because orcid is not in the table so it never runs). Added a new db migration to remove the old users.orcid_id column. The rake task would need to be run prior to the db migration though so commenting it out for now

Installed Administrate as Super Admin backend

Removed ActiveAdmin

removed old references to the Amoeba gem which was used to clone models. Fixed typo in Question.deep_copy. Added generic test for deep_copy methods.

added checks in migration code where we try to manipulate data belonging to a table that no longer exists in the current codebase

resolved merge conflicts

put validation back in place that ensures a question can only have a single answer within a plan

removed substance-forms from gemfile

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.

Added substance-rails gem and then included the appropriate js and css libraries into the asset pipeline

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.

added gem rack-mini-profiler to facilitate logging

added Gemfile with new gem flag_shih_tzu

replaces Organisation. with Org. in all files

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

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

resolved rebase merge conflicts

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

resolving merge conflicts during rebase

ran db migrations

resolving merge conflicts

Added both DB gems for dev/merging compatibility

setup dynamic omniauth provider structures and tied it into devise

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