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'

Merge pull request #2379 from DigitalCurationCentre/bug/tinymce_styling ...

Fixed an issue where the tinymce content css was not being loaded

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

let karma know where the webpacker config is, also --no-sandbox so I can run the tests inside docker

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)

added wkhtmltopdf package and updated postgres image to latest (#2401) ...

debug statement to test github workflow issue

debug statement to test github workflow issue

debug statement to test github workflow issue

debug statement to test github workflow issue

debug statement to test github workflow issue

debug statement to test github workflow issue

debug statement to test github workflow issue

debug statement to test github workflow issue

debug statement to test github workflow issue

cleanup

trying to fix wkhtmltopdf

trying to fix wkhtmltopdf

trying to fix wkhtmltopdf

trying to fix wkhtmltopdf

trying to fix wkhtmltopdf

added wkhtmltopdf fix to mysql workflow

added 'unique' to usage helper test

Bump dependencies (#2396) ...

* bumped rack and tinymce

* updated tinymce

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

Merge pull request #2392 from DMPRoadmap/bug/usage_dashboard_template_counts ...

fixed an inconsistency in  the template counts for the usage dashboard

fixed an inconsistency in the template counts for the usage dashboard

fixed bug with default language on profile form

Merge branch 'OPIDoR-fix/issue2314' into development

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

Merge pull request #2381 from DMPRoadmap/issue_2371 ...

Remove additional validation added to the hash for the funder_name.

pray to js-test gods

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

Merge pull request #2378 from DigitalCurationCentre/issue/2119/fix ...

defaulted usage_dashboard to 12 months, reversed selector order

fix import path for karma test (tinymce)

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

Merge pull request #2377 from DigitalCurationCentre/bug/roadmap_static_page ...

Remove `#static_pages/roadmap` route