Merge updates since 24 Dec 2024 from uptream

[hongquan]

No description provided.

[hongquan]

One challenge is the divergence of DB migration scripts:

eventyay-talk-db-migrations.txt

pretalx-db-migrations.txt

[hongquan]

Checking the applying order of those DB migration scripts:

1. "person" module
   

The person/migrations/0033_merge_20241022_1752.py file was added in #225. After that, the upstream has not added any file. So this module can safely go.

2. "submission" module

The submission/migrations/0078_submissioncomment.py file was added in #255.
After that, the 0078_submissioncomment was added on upstream.

So, the first step is for the commits before the 0078_submissioncomment.py file was added (7931000).

[hongquan]

First attempt to merge (all commits until e4449e6) (128 conflicted files):

• Conflict of the submission/migrations/0076_submissionfavourite.py because the file is different between two repos (causing different changes of DB schema). It was added to our repo earlier than upstream.

(Left is upstream, right is our repo)

-- Update --
The difference of SubmissionFavourite model was resolved in 0077_rename_submissionfavourite_submissionfavouritedeprecated.py and 0078_submissionfavourite.py by renaming our model to SubmissionFavouriteDeprecated then copying upstream SubmissionFavourite model.
So to resolve the conflict of 0076, we just accept our version.

[hongquan]

A commit, 3723a89, was skipped in the last merge (Dec 2024). I think this commit should be taken because it enhances security.
But this commit will require us to re-implement the dropdown menu, to trigger a POST Ajax call for "logout" entry.

[hongquan]

One of our commit, bfee7ec, deleted this checking in test cases:

assert "fa-video" not in content

Don't know why.