Merge branch 'development' of https://github.com/DMPRoadmap/roadmap into issue/1682

usage dashboard working but not dry, moving machines

removed old unused Feedjira code and dependency (#2412) ...

* removed old unused Feedjira code and dependency

* removed old Feedjira sanitize helper method and replaced with Rails'

horizontally align usage-filter with other elements

bring global usage button and csv separator off of header line

minor refactor of the template filter UI to make things align and feel related

Merge branch 'development' into bug/tinymce_styling

issue#2375 allow change of delimiter for csv download (#2403) ...

* issue#2375 allow change of delimiter for csv download

* fix eslint issues, bugfix usage-dashboard when no stats exist, Styling tweaks to csv separator

* fix issues with tests by defaulting the separator to a comma NOTE: does not enforce tests on the separator param working

* fix issues with new separator argument in stat-created-plan and spec

Co-authored-by: Sam Rust <xsrust@gmail.com>

changed overflow setting for the guidance area (#2400)

add department to org-admin user export (#2399)

add a test_plan field and filtering logic to stats/full-text api endpoints (#2394)

convert display values to integers (#2393)

Merge pull request #2391 from DMPRoadmap/bug/new_account_language ...

Bug/new account language

fixed an inconsistency in the template counts for the usage dashboard

fixed bug with default language on profile form

Merge branch 'fix/issue2314' of https://github.com/OPIDoR/DMPOPIDoR into OPIDoR-fix/issue2314

Remove additional validation added to the hash for the funder_name. And remove the conditional check for the template name in the plan export coversheet

enable js.erb parsing with webpacker, rename references to tinymce.js, and properly get the asset_path for the tinymce content stylesheet

defaulted usage_dashboard to 12 months, reversed selector order

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

added browser_spellcheck to tinymce

space for rubocop

comparison differs substantially from assignment

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

fixed indentation [RUBOCOP], will start running style-lints before I create PRs

refactored change according to github's ruby-styling-nagging

redirect user to sign_in/sign_up page when they have a shibboleth session but have not yet signed-into an account

made the user_edit_profile lang field default to DB default language

Merge pull request #2342 from DMPRoadmap/issue2341 ...

check for agreement to T&Cs was wrong

accept_terms is inside user