Claire eee36267d6 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/mastodon/locales/ja.json`: Upstream change too close to a glitch-soc-specific string. The glitch-soc-specific string should not have been in this file, so it has been moved to `app/javascript/flavours/glitch/locales/ja.js`. - `app/javascript/packs/public.js`: Upstream refactored a part, that as usual is split and duplicated in various pack files. Updated those pack files accordingly. - `app/views/layouts/application.html.haml`: Upstream fixed custom.css path in a different way than we did, went with upstream's change.		2022-10-30 18:15:28 +01:00
..
accounts	Merge branch 'main' into glitch-soc/merge-upstream	2022-10-02 18:46:22 +02:00
admin	Fix admin APIs returning deleted object instead of empty object upon delete (#19479)	2022-10-30 02:43:57 +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	Change about page to be mounted in the web UI (#19345)	2022-10-13 14:42:37 +02:00
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	Merge branch 'main' into glitch-soc/merge-upstream	2022-10-28 19:23:58 +02:00
trends	Add support for language preferences for trending statuses and links (#18288)	2022-10-08 16:45:40 +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 featured tag updates to add/remove activity (#19409)	2022-10-22 18:30:55 +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	Add server banner to web app, add GET /api/v2/instance to REST API (#19294)	2022-10-09 19:51:39 +02:00
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-10-30 18:15:28 +01: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