fixed bug with saving shib identifiers (#2289)

removed extra div tag (#2290)

Modify Merge Account messaging (#2287) ...

* revised user merge text and made responsive

* remove debug  lines

* update for eslint errors

* actually fixes eslint issues, this time with testing locally

[Feature] Create plan from link (#2284) ...

* Added direct link for plan creation from templates list

* Moved link generation to helper

* Added modal for link copy

* Added JS for link copy

* Improved modal style and moved it to a partial

* Added template link copy to admin area (organisation templates)

* Added confirmation modal for creation link

* Minor changes for direct_link helper

* Fixed typo in YARD doc

fixed issue with archiving users (#2286)

Fix for making the Guidance/Comments sections of plan accessible by (#2283) ...

* Fix for making the Guidance/Comments sections of plan accessible by
tabbing. The links were not accessible by keyboard tabbing.

Change:
- added tabindex="0" to links within Guidance/Comments sections as a
hack as they were being ignored as links for tabbing. According to https://webaim.org/techniques/keyboard/tabindex

   tabindex="0"
      - allows elements besides links and form elements to receive
      keyboard focus. It does not change the tab order, but places the element
      in the logical navigation flow, as if it were a link on the page.
      - a value of 0 indicates that the element should be placed in the default navigation order.
      This allows elements that are not natively focusable (such as <div>, <span>, <p>, and <a> with no href)
      to receive keyboard focus. Links and form controls are best for almost all interactive elements,
      but tabindex="0" allows other elements to be focusable and able to trigger interaction.

Fix for #1444.

* Updated gem for nokogiri.

Merge pull request #2282 from DMPRoadmap/issue2240 ...

These feature are part of the request for improving the Admin view of

Renamed privately_private & private visibility as private & administrator visibility

These feature are part of the request for improving the Admin view of ...

users.

Changes:
- on the Editing profile of a user the School or Department dropdown
menu has been made the same horizontal size as other inputs.
- A link has been created on the Users page from Plans (i.e, no. of
plans) to a Plans page for the user.

Fix for #2240.

Merge pull request #2273 from DMPRoadmap/issue1656 ...

Fix to make labels for the Permissions radio buttons on the Plan

Updated Org admins template table Action menu. ...

Change:
  - Re-worded "Export as pdf" to "Download".
  - Removed "Export as docx".

Fix for #2091.

Fix to make labels for the Permissions radio buttons on the Plan ...

Share tab clickable.

All the Write Plan sections seen to have clickable labels for radio
buttons and checkboxes.

Change:
- renamed the f.label helper method object to match id added to
f.radio_button helper.

Fix for issue #1656.

Merge pull request #2266 from DMPRoadmap/issue2240 ...

Updated functionality for Admin View of Users.

Merge pull request #2268 from DMPRoadmap/issue2147 ...

Fix for the formatting issues with bullet points for exported docx plans

Added functionality to allow Org admins to export their org's templates. ...

Re-used the template_export templates template_export.docx.erb
and template_export.pdf.erb.

Changes:
 - Moved templates template_export.docx.erb and template_export.pdf.erb
to a separate view folder template_exports.
- Added functionality for Org admins to export both current and historic
templates for their organisation. The version name has been appended to
the templates, e.g., My_Template_v0.docx or  My_Template_v5.pdf.

Fix for issue #2091.

Fix for the formatting issues with bullet points for exported docx plans ...

when viewed in an old Word editor.

The fix follows the solution suggested in  the HtmlToWord bug "List item
bullets corrupted in Microsoft Word"
https://github.com/karnov/htmltoword/issues/73 suggested by David
Verhasselt @dv.

Changes:
   - Firstly, removed earlier attempted fix in commit
     5ef7e05 (Fix for format issues for
     bullet points in Plan docx exports).
   - Made a copy of Htmltoword (1.1.0) xslt stylesheets functions.xslt
     and numbering.xslt and made changes suggested by https://github.com/karnov/htmltoword/issues/73
   - Prepended the Htmltoword library XSLTHelper method xslt_path() in
     config/initializers/htmlto_word_xslt_helper.rb. This method ensures
     the Htmltoword library picks up the changed  numbering.xslt template instead of
     the library's version.
   - pinned version of htmltoword to 1.1.0

Fix for issue #2147.

Plan sharing notification should display the email of the inviter next to his name

The first research output can no longer be moved or deleted

Changed FAQ URL

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

Translations fixes & added FAQ to footer & contact form

Added Stats chart for org template usage

Updated functionality for Admin View of Users. ...

Changes:
 - for Super Admins: Added user department and plans.
 - for Org Admins:
        (1) The user view now has a clickable link for opening up
            a view of a user's profile and plans.
        (2) In a user's profile view the Department if it exists for the
            organisation is editable. The Organisation must have
            departments in systerm to avail of this functionality.

Fix for #2240.

Added research output in answers extraction

Added question based option extraction in theme API

Fix for shibboleth login

Removed front page logo & CSS fix

Fixes to french translation

Added DMP OPIDoR logo on frontpage

Rework on navigation menu