fixes an issue where annotations were being added to removed questions

fixed js logic to initilize the my_org partial when the org is the other_org (#2208)

fix issue with paginable guidance_controller throwing error when sort selected

changed tooltip text to use app name from branding

added gettext markup

updated plan sharing form according to #2111, also added text to the email field to clarify what happens if the user is not in our system

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

Fixed link for UC3 at footer since the page was previously not found.

Merge pull request #2167 from DMPRoadmap/issue2157 ...

Add template version to Plan view.

Merge pull request #2163 from DMPRoadmap/issue2093 ...

Re-introduced the drag feature for the TinyMCE editors.

Add template version to Plan view. ...

Changes added template version to plan overview.

Fix for issue #2157.

Fix for bugs arising for Super Admins editing Departments of an Oreganisation they did not belong to. ...

Fix for issue #2088.

Fix for issue associated with super-admins and department affiliation in a given organisation. (#2165) ...

Changes made:
  - Department policies now allow both org admins and super admins to
    create update and delete departments, whilst org_admins can only do this
    for their own org. Super admins can do it for any org department.
  - When a super admin switches organisation their department_id is cleared.

Fix for issue #2088.

Re-introduced the drag feature for the TinyMCE editors. ...

Note that we only allow re-sizing vertically. Resizing horizontally would allow the editor to stretch over
other elements in the flow.

Fix for Issue #2093.

Merge pull request #2155 from DMPRoadmap/issue1743 ...

Fix for humanizing the attribute name for feedback_email_msg in error…

Fix for humanizing the attribute name for feedback_email_msg in error messages. ...

Updated Org model by overriding the ActiveRecord::Base class method self.human_attribute_name.

Fix for #1743.

Fix for ordering of Departments in select dropdown list. ...

Change just orders the dropdown list by name.

Fix for issue #2088

Fix for foreign key violation error when a department is deleted ...

after some users have added its department_id.

Solution based on blog "Set Foreign keys to null"
https://til.hashrocket.com/posts/jqilnp3d0h--set-foreign-keys-to-null

Fix for issue #2088

Merge pull request #2149 from DigitalCurationCentre/bug/plan_ownership ...

Bug/plan ownership

Merge pull request #2150 from DMPRoadmap/issue2088 ...

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

ensure review_plans are active

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 issue where displayed plan owner was not the creator

rework logic around answer_text for CSV export

fix issue with declaring is_blank?

updated logic so nil answer.text dosent cause errors

Fix bug with reviewer plans where non-existing id's cause issues

Fix bug with comparison of :per_page param in plans_api

replaced timestamps on notes with timeago

updated reviewer to be under can_org_admin? and fixed table of plans to show owner instead of random user (#2140)