Merge pull request #3506 from DMPRoadmap/main

Merge `main` changes back into `development`

Author: aaronskiba

CHANGELOG.md

@@ -1,5 +1,7 @@
 # Changelog
 
+## v5.0.0
+
 - Updated app to Rails 7 [#3426](https://github.com/DMPRoadmap/roadmap/pull/3426), [#3496](https://github.com/DMPRoadmap/roadmap/pull/3496)
 - Address Some Bullet Warnings / Optimise Mean Request Times [#3440](https://github.com/DMPRoadmap/roadmap/pull/3440)
 - Fix Flaky Tests / Optimize Checking of `plan.title` Within `spec/features/plans/exports_spec.rb` [#3451](https://github.com/DMPRoadmap/roadmap/pull/3451)
@@ -15,6 +17,7 @@
 - Fixed issues with Conditional Question serialization offered by @briri from PR https://github.com/CDLUC3/dmptool/pull/667 for DMPTool. There is a migration file with code for MySQL and Postgres to update the Conditions table to convert JSON Arrays in string format records in the conditions table so that they are JSON Arrays.
 - Refactor `org_admin/conditions/_form.html.erb` [#3502](https://github.com/DMPRoadmap/roadmap/pull/3502)
 - Refactor `Question.save_condition` [#3501](https://github.com/DMPRoadmap/roadmap/pull/3501)
+- Bump tinymce from 6.8.5 to 7.2.0 [#3505](https://github.com/DMPRoadmap/roadmap/pull/3505)
 
 ## v4.2.0
 

README.md

@@ -42,5 +42,3 @@ See the [Contribution Guide](https://github.com/DMPRoadmap/roadmap/blob/developm
 
 #### License
 The DMP Roadmap project uses the <a href="./LICENSE.md">MIT License</a>.
-
-foobar

app/javascript/src/utils/tinymce.js

@@ -25,6 +25,7 @@ import { isObject, isString, isUndefined } from './isType';
 // // https://www.tinymce.com/docs/advanced/usage-with-module-loaders/
 export const defaultOptions = {
   selector: '.tinymce',
+  license_key: 'gpl',
   statusbar: true,
   menubar: false,
   toolbar: 'bold italic | bullist numlist | link | table',