Claire fe5f6bc7ed Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `.github/workflows/build-image.yml`: Fix erroneous deletion in a previous merge. - `Gemfile`: Conflict caused by glitch-soc-only hCaptcha dependency - `app/controllers/auth/sessions_controller.rb`: Minor conflict due to glitch-soc's theming system. - `app/controllers/filters_controller.rb`: Minor conflict due to glitch-soc's theming system. - `app/serializers/rest/status_serializer.rb`: Minor conflict due to glitch-soc having an extra `local_only` property		2022-06-28 11:11:18 +02:00
..
accounts	Merge branch 'main' into glitch-soc/merge-upstream	2022-05-03 10:16:49 +02:00
admin	Add /api/v1/admin/domain_allows (#18668)	2022-06-23 23:12:01 +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	…
filters	Revamp post filtering system (#18058)	2022-06-28 09:42:13 +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 edit history to web UI (#17390)	2022-02-09 01:17:07 +01:00
timelines	…
trends	Fix pagination header on empty trends responses in REST API (#17986)	2022-04-07 18:06:15 +02:00
accounts_controller.rb	Change unapproved and unconfirmed account to not be accessible in the REST API (#17530)	2022-05-26 15:50:33 +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	…
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
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	…