* Use escapeHTML() when displaying filenames in upload.js
* Add a test in AttachmentIT to check for proper HTML escaping during upload

* Set only the original metadata author in XWikiUser.setDisabled
* Use the same disable/enable action everywhere
* Remove no longer needed request parameters

XWIKI-19180: In case of merge conflict choosing "Reload editors" won't refresh the content

Update xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-test/xwiki-platform-realtime-wysiwyg-test-docker/src/test/it/org/xwiki/realtime/wysiwyg/test/ui/RealtimeWYSIWYGEditorIT.java

Update test order.

Update xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-test/xwiki-platform-realtime-wysiwyg-test-docker/src/test/it/org/xwiki/realtime/wysiwyg/test/ui/RealtimeWYSIWYGEditorIT.java

Remove extra empty line.

Update xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-test/xwiki-platform-realtime-wysiwyg-test-docker/src/test/it/org/xwiki/realtime/wysiwyg/test/ui/RealtimeWYSIWYGEditorIT.java

Update test order.

Update xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-webjar/src/main/webjar/saver.js

Fix typo.

XWIKI-21558: If a macro is modified by another user while the macro edit modal is open, we cannot update the macro
* Fix failing test (restoring the focused and selected widgets by hand after an update is too fragile so better let CKEditor do it)

(cherry picked from commit 82aa87f8)

* remov e unused imports

XWIKI-19181: The autosave doesn't behave nicely when a merge conflict occurs

Prevent identical tasks to be queued at the same millisecond until XWIKI-21820 is closed.

* Fix the lost pointer cursor on the sort caret
* Fix broken translations
* Fix the unexpected change in behavior for the resize handle
* Improve cursor on various elements to fit the features they should help use
* Make the resize handles invisible when not focused again

XWIKI-21558: If a macro is modified by another user while the macro edit modal is open, we cannot update the macro
* Improve the way macros are updated after a remote patch is applied
* Save and entry in the Undo/Redo history after adding a macro (in order to trigger a change event).
* Add a test.

(cherry picked from commit 4e2ecea0)

  * Fix condition for watching / unwatching users

Avoids warning messages in the browser console.

XWIKI-13967: Confusion between Supported Languages and Default Languages when multilingual is set to no
* Fixed a test that should have been updated with the fixes for XWIKI-13967

  * Fix the wrong expectation for NotificationEmailsIT tests when
    checking mail content (was containing bad code for users' avatars)

  * Provide a test page for the notification email velocity template
  * Fix a bug in diff_macros.vm
  * Minor fix in NotificationRSSDefaultPageTest

XWIKI-13967: Confusion between Supported Languages and Default Languages when multilingual is set to no (#2770)

* Added a CSS ruleset to remove the supported languages field from the UI when it's not useful.

* Replaced inline styling with regular style for the panel wizard tooltip
* Removed the comment from the test for the panel wizard

* Added a missing space between attributes in the pdf generator select
* Replaced the comment with an actual test for the export PDF section

* Fixed a `label` copy pasted too fast: the for attribute did not get updated.
* Removed the comment from the test for WYSIWYG

* Added the panel header text color to the ThemeSheet.xml
* Changed the name of the variable to fit other variables in the tab
* Updated color themes
* Fixed property name
* Fixed colortheme files and homogeneized property names
* Fixed codestyle
* Fixed consistency
* Fixed backward compatibility

  * Remove pages that are no longer used and where kept only for
    ensuring old URLs would still work

  * Use the proper macro for displaying user in email notifications

XWIKI-21791: The background of unread events displayed with "Load older notifications" is not grey anymore, but white
* Fixed a couple comments
* Added back the JS class addition removed in XWIKI-18880

XWIKI-21807: Error when adding two properties of the same name not properly displayed in class editor (#2803)

Fix broken test.

Remove the confusing caption style on the description.

This reverts commit b06b4c0e.