I18n replaced from controllers. DMPRoadmap/roadmap#98

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 DMPRoadmap/roadmap#159

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

switched registrations controller to user org_id instead of organisation_id. fixes DMPRoadmap/roadmap#145

Installed Administrate as Super Admin backend

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

switched to using the hash for data access for admin_template view and associated partials

created a to_hash method for templates to help remove data access from views

Merge branch 'review_feedback' into development ...

3 fixes:
.radiobuttons -> .radiobuttons?
remove debugging console.log
change isOptionBased? to option_based?

minor fixes from code review

Removed ActiveAdmin

Replaced I18n.t(...) from controllers. DMPRoadmap/roadmap#98

leaving the two migrations caused schema issues this cleans it up

Merge branch 'fix_answer_timestamp' into development ...

make answer timestamp run off updated_at rather than created_at
remove some of the JS that gets called on accordion section show
and on answer save.

timestamp off updated_at rather than created_at plus other tidying up

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

Merge branch 'reinstate_funder_id' into development ...

funder_id on plan had been commented out but it's used in plan creation
- reinstate and we can revaluate later.

reinstate funder_id used in create plan

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

updated old rake task to properly seed languages, created a new rake task to ensure the languages are in the correct formats

Merge branch 'change_to_enum_tidyup' into development ...

remove leftover constants from earlier attempt to stop all the string
comps for determining question format.
With enum we no longer need these.

remove unneeded format constants

Merge branch 'question_format_enum' into development

change question_format to use enum rather than bits

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

language fixes post merge

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

updated statistics api endpoint to be in line with the new data model

merge optimistic locking into dev

Optimistic Locking ...

- add bit field to question_format so we don't have to test strings to determine format

- add isOptionBased to question so we dn't have to do multiple string comps for this - there was a boolean already in the DB not being used

- add migration to add bit field

- add migration to add lock_version field to answer

- change answers_controller to do optimistic locking

- change answers controller not to redirect to plans/phase/edit as it wasn't doing anything

- introduced answers/update.js.erb to handle the return from /answers/update.

- to do the conflict resolution you need the old answer and new answer objects. Tried using clone but it doesn't work because it only does a shallow copy. So adopted a "nuclear-option" deep copy but it's a bit much. A compromise would be better.