???

Added Structured Question format in model

Changed how structured answers are handled in DB

Fix on migration

Added structured schema/answers models and tables

Merged DMP Roadmap V2.1.4

The Plans 'Request Feedback' has been relocated from the Share form to a ...

separate form.

Changes:
 - Removed "Request feedback" from the _share_form.html.erb partial and
created a new partial _request_feedback_form.html.erb.
- Added a tab to Plan _navigation.html.erb for 'Request feedback'.

Fix for #2234

Added Stats chart for org template usage

fixed issue with progress bar totals ...

updated logic to allow for phase sepcific progress or total progress

updated plan

Refactored num_answrered_questions

fixed deprecation warnings for Faker ...

updated to use new Webdrivers gem instead of chromedriver. Also added check to prevent redefining VerionableModel

renamed versionable_model

Merged DMPRoadmap V2.1.3

Merge pull request #2232 from DMPRoadmap/master ...

Sync Vulnerability patches from Master -> Development

optimistically fixed faulty annotation spec

empty token is changed to nil when removing_token

fix some discrepancies api token tests

updated gems and yarn dependencies (#2179) ...

* updated gems and yarn dependencies

* updated yarn

* added csrf gem to deal with omniauth vulnerability

* add in explicit disable of non-post omniauth methods, add ignore statement tobundle audit so Travis can run the remaining tests

* replaced depricated Faker::StarWars with new Faker::Movies::StarWars

* downgrading timeago.js to 4.0.0beta.1 from *beta.2

Merged DMPRoadmap V2.1.2

Datasets has been renamed as Research outputs

Add functionality for School/Department for an organisation. ...

Changes:
    - added a Department model whose instances belong to an org and require name.
    - added a DepartmentController and views for create, edit/update and a index view which is a tab
      of 'Organisational Details'.
    - added the optional attribute department_id to User model.
    - added Rspec tests.
    - updated app/controllers/registrations_controller.rb, app/models/org.rb and
      app/models/user.rb to get rid of outstanding Rubocop warnings

    Fix for issue #2088.

fix issues with plan spec (#2142)

Merge pull request #2128 from DMPRoadmap/feature/research-grant-id ...

Add typeahead field for Research Grant ID

Merge pull request #2129 from DigitalCurationCentre/feature/reviewer_role ...

Feature/reviewer role

fix error with test refactor

remove unneeded comments, remove further references to reviewer role from tests, dry up refactored tests

Merge branch 'development' into feature/research-grant-id

updated failing test to create questions in all sections of the template

updated tests

Datasets integration

Fix broken plans spec

updated templates_upgrade_customisations_spec to create a question in the created section so the template can validly be published