* tusooa/from/develop/tusooa/tree-threading:
Add English translations for fading ancestor option
Make fading ancestors optional
Update English translation for tree view settings
Split conversation display style into two different settings
Make 'Show full conversation' button have left border in embbeded mode
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
Do not display replies inside status as link if there are no other replies
* 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
* origin/develop: (306 commits)
fallback if shadows aren't defined
Translated using Weblate (Chinese (Traditional))
Translated using Weblate (Ukrainian)
Translated using Weblate (Italian)
Translated using Weblate (Ukrainian)
Translated using Weblate (Portuguese)
Translated using Weblate (Italian)
Translated using Weblate (Russian)
Translated using Weblate (Portuguese)
Translated using Weblate (Russian)
Translated using Weblate (Portuguese)
Translated using Weblate (Portuguese)
Translated using Weblate (Portuguese)
Translated using Weblate (Portuguese)
Translated using Weblate (Portuguese)
Translated using Weblate (Portuguese)
Translated using Weblate (Portuguese)
Translated using Weblate (Portuguese)
Translated using Weblate (Portuguese)
Translated using Weblate (Portuguese)
...
