Claire 077183a121 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/settings/preferences_controller.rb`: Upstream dropping `digest` from notifications emails while we have more notification emails settings. Removed `digest` from our list while keeping our extra settings. - `app/javascript/packs/admin.js`: Conflicts caused by glitch-soc's theming system. Applied the changes to `app/javascript/core/admin.js`. - `app/views/settings/preferences/other/show.html.haml`: Upstream removed a setting close to a glitch-soc-only setting. Applied upstream's change.		2022-08-28 11:31:00 +02:00
..
accounts	Merge branch 'main' into glitch-soc/merge-upstream	2022-05-03 10:16:49 +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	…
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	…
timelines	…
trends	Add ability to follow hashtags (#18809)	2022-07-17 13:49:29 +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	…
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	…
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	…
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	…
mutes_controller.rb	…
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	…
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