* expert-settings-and-serverside:
lint
pre-emptively wipe serverside settings on logout
fix errors in choicesetting
fix typos in profile page
hidden away more settings when logged out
fix settings behaving erratically and not updating properly
fix stripping rich content not working
revert changes related to streaming/firehose setting, reword it so it's not confused with websocket streaming
fix firefox rendering (??????????)
revert to using local setting for default nsfw since backend is broken
better phrasing
new defaults
expert settings toggle + server-side settings
* tusooa/from/develop/tusooa/tree-threading: (48 commits)
Fix showingLongSubject not correctly propagated
Fix timeline jump when scrolling
Make replying and mediaPlaying controlled
Clean up debug code for tree threading
Fix virtual scrolling for tree threading
Fix controlled status display toggles
Add English translations for other replies count
Add other replies count for reply list link
Add English translation for position of other replies button pref
Make position of other replies button a pref
Add English translation for show all conversation button improvement
Improve "show full conversation" interaction
Make other replies button stretch along the row
Optimise thread ancestor borders
Optimise thread ancestor display style
Reset thread open state when collapsed
Clean up
Highlight ancestor of the current status when diving back to top
Add English translation for Misskey-style tree view
Implement Misskey-style tree view
...
$refs is not a reliable way to deal with child components under
tree threading as it is not reactive, but the children may change at
any time. The only good way seems to be making these states aggregated on
the conversation component.
Ref: tree-threading
Now the tree will be always rooted at the highlighted status, and
all its ancestors shown linearly on the top.
Enhancement: If an ancestor has more
than one reply (i.e. it has a child that is not on current status's
ancestor chain), we are given a link to root the thread at that status.
* tusooa/from/develop/tusooa/media-touch-actions: (26 commits)
Lint
Prevent hiding media viewer if swiped over SwipeClick
Fix webkit image blurs
Fix video in media modal not displaying properly
Add changelog for https://git.pleroma.social/pleroma/pleroma-fe/-/merge_requests/1403
Remove image box-shadow in media modal
Clean up debug code for image pinch zoom
Bump @kazvmoe-infra/pinch-zoom-element to 1.2.0 on npm
Bump pinch-zoom-element version
Clean up
Check whether we swiped only for mouse pointer
Scale swipe threshold with viewport width
Update pinch-zoom-element
Allow pinch-zoom to fill the whole screen
Use native click for hiding overlay
Reset position on swipe end even if we cannot navigate
Make lint happy
Prevent the click event from firing on content below modal
Add missing swipe click component
Clean up
...
