Merged DMP Roadmap V2.1.5

remove non-existant route (no template so it throws errors, doesnt look to be in use on any Roadmap instance I could find)

Refactor of usage dashboard (moved logic from JS to Ruby) (#2336) ...

* removed erroneous div tag

* Updated deep_copy on PLan model to set feedback_requested to false

* fixed typo in plan export

* refactored usage code to place most of the presentation logic into Rails instead of JS

finished up changes to usage

fixed eslinter issues

fixed rubocop issues

fixed additional rubocop issues

fixed issue with filter

fixed issue with totals

removed old controller test and added new usage_controller tests

added tests for new usage_helper

added usage_policy tests and pundit test helper

fixed some rubocop complaints

fixed up remaining rubocop issues

* removed opens in a new window for usage download buttons and moved org selector to below filters

* fixed some rubocop complaints in spec test

User can't choose deactivated orgs in registration form & profil

Small fix in share plan translation

Many HTML & Accessibility fixes

Adjustements to external link, the title should tell the link opens a new window

Fix to French translations

Fixes to French Translation

Merged DMP Roadmap V2.1.4

Merge branch 'master' into pt_BR

Merge branch 'hugoecarl-pt_BR'

updates for pt_BR issues (#2298)

fixed issue with archiving users (#2286)

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 #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

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

update translation support of pt_BR

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.

Fixes to french translation

updated cookie serialization from hybrid to json, fixes #2255