Claire 221580a3af Merge branch 'main' into glitch-soc/merge-upstream ...

Conflicts:
- `app/controllers/home_controller.rb`:
  Upstream made it so `/web` is available to non-logged-in users
  and `/` redirects to `/web` instead of `/about`.
  Kept our version since glitch-soc's WebUI doesn't have what's
  needed yet and I think /about is still a much better landing
  page anyway.
- `app/models/form/admin_settings.rb`:
  Upstream added new settings, and glitch-soc had an extra setting.
  Not really a conflict.
  Added upstream's new settings.
- `app/serializers/initial_state_serializer.rb`:
  Upstream added a new `server` initial state object.
  Not really a conflict.
  Merged upstream's changes.
- `app/views/admin/settings/edit.html.haml`:
  Upstream added new settings.
  Not really a conflict.
  Merged upstream's changes.
- `app/workers/scheduler/feed_cleanup_scheduler.rb`:
  Upstream refactored that part and removed the file.
  Ported our relevant changes into `app/lib/vacuum/feeds_vacuum.rb`
- `config/settings.yml`:
  Upstream added new settings.
  Not a real conflict.
  Added upstream's new settings.

2022-10-02 18:46:22 +02:00

..

importer

Revamp post filtering system (#18058)

2022-06-28 09:42:13 +02:00

push_notifications

Do not override the default push notification settings (#6037)

2018-05-19 14:45:58 +02:00

account_notes.js

Change design of account notes in web UI (#14208)

2020-07-07 01:24:03 +02:00

accounts.js

Add logged-out access to the web UI (#18961)

2022-09-29 04:39:33 +02:00

alerts.js

Fix 404 and 410 API errors being silently discarded in WebUI (#13279)

2020-03-28 17:59:45 +01:00

announcements.js

Change how unread announcements are handled (#13020)

2020-02-03 01:53:09 +01:00

app.js

Fix pop-out player appearing on mobile screens in web UI (#15157)

2020-11-16 05:16:39 +01:00

blocks.js

Add explanation to mute dialog, refactor and clean up mute/block UI (#11992)

2019-09-29 21:46:05 +02:00

bookmarks.js

Add bookmarks (#7107)

2019-11-13 23:02:10 +01:00

boosts.js

Fix eslint error (#16212)

2021-05-11 14:17:38 +02:00

bundles.js

Lazy load components (#3879)

2017-07-08 00:06:02 +02:00

columns.js

Put "Media Only" option in column settings instead of content area headline (#7801)

2018-06-15 11:15:15 +02:00

compose.js

Merge branch 'main' into glitch-soc/merge-upstream

2022-07-17 22:07:20 +02:00

conversations.js

Change conversations UI (#11896)

2019-09-21 20:01:16 +02:00

custom_emojis.js

Fix loading indicator inconsistency (#9252)

2018-11-10 15:04:13 +01:00

directory.js

Add profile directory to web UI (#11688)

2019-08-30 00:14:36 +02:00

domain_blocks.js

Change account domain block to clear out notifications and follows (#11393)

2019-07-25 04:17:35 +02:00

dropdown_menu.js

Freeze scroll position when a dropdown menu is open in the TL (#14271)

2020-07-09 15:09:19 +02:00

emojis.js

Track frequently used emojis in web UI (#5275)

2017-10-08 21:47:15 +02:00

favourites.js

Fix loading indicator inconsistency (#9252)

2018-11-10 15:04:13 +01:00

filters.js

Add ability to filter individual posts (#18945)

2022-08-25 04:27:47 +02:00

height_cache.js

Fix height cache (#4909)

2017-09-13 10:24:33 +02:00

history.js

Add edit history to web UI (#17390)

2022-02-09 01:17:07 +01:00

interactions.js

Add dropdown for boost privacy in boost confirmation modal (#15704)

2021-02-11 00:53:12 +01:00

languages.js

Add language dropdown to compose in web UI (#18420)

2022-05-16 11:18:35 +02:00

lists.js

Add configuration option to filter replies in lists (#9205)

2020-09-01 13:31:28 +02:00

markers.js

Add logged-out access to the web UI (#18961)

2022-09-29 04:39:33 +02:00

modal.js

Fix reply button on media modal not giving focus to compose form (#17626)

2022-02-25 00:51:01 +01:00

mutes.js

Add duration parameter to muting. (#13831)

2020-10-13 01:01:14 +02:00

notifications.js

Fix quickly switching notification filters resulting in empty or incorrect list (#19052)

2022-08-25 17:36:54 +02:00

onboarding.js

Change onboarding by replacing tutorial with follow recommendations in web UI (#16060)

2021-04-19 14:45:15 +02:00

picture_in_picture.js

Fix WebUI crash when a toot with a playing video gets deleted (#16384)

2021-06-25 04:45:17 +02:00

pin_statuses.js

Store objects to IndexedDB (#6826)

2018-03-24 13:06:27 +01:00

polls.js

Fix poll options not rendering text after vote/refresh (#10189)

2019-03-06 05:35:52 +01:00

reports.js

Fix reporting from profile (#17632)

2022-02-23 21:37:02 +01:00

rules.js

Change report modal to include category selection in web UI (#17565)

2022-02-23 20:03:46 +01:00

search.js

Fix "You might be interested in" flashing while searching in web UI (#16162)

2021-05-06 02:11:43 +02:00

settings.js

Improve web api protect (#6343)

2018-04-17 15:23:46 +02:00

statuses.js

Add user content translations with configurable backends (#19218)

2022-09-23 23:00:12 +02:00

store.js

Store objects to IndexedDB (#6826)

2018-03-24 13:06:27 +01:00

streaming.js

Revamp post filtering system (#18058)

2022-06-28 09:42:13 +02:00

suggestions.js

Change follow recommendations to be limited to 20 instead of 40 in web UI (#16077)

2021-04-20 15:07:51 +02:00

tags.js

Fix action type for unfollowHashtag (#18924)

2022-08-25 04:38:01 +02:00

timelines.js

Auto-fill timeline gaps when getting re-connecting to Websocket/EventSource stream (#17987)

2022-04-08 19:17:54 +02:00

trends.js

Add pagination for trending statuses in web UI (#17976)

2022-04-06 22:53:29 +02:00