Merge pull request #1148 from ThibG/glitch-soc/merge-upstream Merge upstream changes
Merge branch 'master' into glitch-soc/merge-upstream
Optimize makeGetStatus (#11211) * Optimize makeGetStatus Because `ImmutableList.filter` always returns a new object and `createSelector` memoizes based on object identity, the selector returned by `makeGetStatus` would *always* execute. To avoid that, we wrap `getFilters` into a new memoizer that memoizes based on deep equality, thus returning the same object as long as the filters haven't changed, allowing the memoization of `makeGetStatus` to work. Furthermore, we memoize the compiled regexs instead of recomputing them each time the selector is called. * Fix memoized result being cleared too often * Make notifications use memoized getFiltersRegex
When sending a toot, ensure a CW is only set if the CW field is visible (#11206) In some occasions, such as the browser or a browser extension auto-filling the existing but disabled/hidden CW field, a CW can be set without the user knowing.
Use ScrollToOptions for smooth scrolling if supported (#11207)
Merge pull request #1146 from ThibG/glitch-soc/merge-upstream Merge upstream changes
Merge branch 'master' into glitch-soc/merge-upstream
Display FTS warning based on actual search term, not the one being typed (#11202) Follow-up to #11112
Merge pull request #1145 from ThibG/glitch-soc/merge-upstream Merge upstream changes
Add categories for custom emojis (#11196) Fix #7940
Fix swiping columns on mobile sometimes failing (#11200) Fixes #9779
Merge branch 'master' into glitch-soc/merge-upstream
Add message telling FTS is disabled when no toot can be found because of this (#11112) * Add message telling FTS is disabled when no toot can be found because of this Fixes #11082 * Remove info icon and reword message
Merge pull request #1142 from ThibG/glitch-soc/merge-upstream Merge upstream changes
Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - app/controllers/settings/preferences_controller.rb - app/lib/user_settings_decorator.rb - app/models/user.rb - config/locales/simple_form.en.yml
Add option to disable blurhash previews (#11188) * Add option to disable blurhash previews * Update option text * Change options order
Scroll to compose form rather than reply indicator on focus (#11182)
Removed extra pipes from regex. (#11181)
Merge pull request #1138 from ThibG/glitch-soc/merge-upstream Merge upstream changes
Apply filters to poll options (#11174) * Apply filters to poll options in WebUI Fixes #11128 * Apply filters to poll options server-side * Add poll options to searchable text