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
..
accounts	Merge branch 'main' into glitch-soc/merge-upstream	2022-10-02 18:46:22 +02:00
admin	Add admin API for managing e-mail domain blocks (#19066)	2022-08-28 03:37:55 +02:00
announcements
apps
crypto
emails	Fix POST /api/v1/emails/confirmations not being available after sign-up (#17743)	2022-03-12 04:14:25 +01:00
featured_tags	Add ability to follow hashtags (#18809)	2022-07-17 13:49:29 +02:00
filters	Add ability to filter individual posts (#18945)	2022-08-25 04:27:47 +02:00
instances
lists
polls
push	use Notification::TYPES for api push subscription alerts (#18709)	2022-06-23 01:44:27 +02:00
statuses	Add user content translations with configurable backends (#19218)	2022-09-23 23:00:12 +02:00
timelines
trends	Add ability to follow hashtags (#18809)	2022-07-17 13:49:29 +02:00
accounts_controller.rb	Add ability to filter followed accounts' posts by language (#19095)	2022-09-20 23:51:21 +02:00
announcements_controller.rb
apps_controller.rb
blocks_controller.rb	Change follow scope to be covered by read and write scopes in REST API (#17678)	2022-03-03 16:13:40 +01:00
bookmarks_controller.rb	Fix 500 error when a bookmark or favorite has been reported and deleted (#18174)	2022-04-28 23:34:58 +02:00
conversations_controller.rb
custom_emojis_controller.rb
directories_controller.rb
domain_blocks_controller.rb	Change follow scope to be covered by read and write scopes in REST API (#17678)	2022-03-03 16:13:40 +01:00
endorsements_controller.rb
favourites_controller.rb	Fix 500 error when a bookmark or favorite has been reported and deleted (#18174)	2022-04-28 23:34:58 +02:00
featured_tags_controller.rb	Change how hashtags are normalized (#18795)	2022-07-13 15:03:28 +02:00
filters_controller.rb	Revamp post filtering system (#18058)	2022-06-28 09:42:13 +02:00
follow_requests_controller.rb	Fix duplicate notifications being possible after poll expiration (#17697)	2022-03-04 01:06:33 +01:00
followed_tags_controller.rb	Add ability to follow hashtags (#18809)	2022-07-17 13:49:29 +02:00
instances_controller.rb
lists_controller.rb
markers_controller.rb
media_controller.rb	Allow editing media attachments for scheduled toots (#17690)	2022-03-03 16:13:58 +01:00
mutes_controller.rb	Change follow scope to be covered by read and write scopes in REST API (#17678)	2022-03-03 16:13:40 +01:00
notifications_controller.rb	Fix incorrect permission check for notifications destroy/dismiss endpoints (#1787)	2022-05-27 16:21:59 +02:00
polls_controller.rb
preferences_controller.rb
reports_controller.rb	Fix report category not being saved in REST API (#17682)	2022-03-02 18:57:08 +01:00
scheduled_statuses_controller.rb
statuses_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-04-08 19:53:32 +02:00
streaming_controller.rb
suggestions_controller.rb
tags_controller.rb	Fix /api/v1/tags/:id route constraints (#18854)	2022-07-20 17:06:52 +02:00