Claire 32c70d2f09 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/views/admin/announcements/edit.html.haml`: Upstream change too close to theming-related glitch-soc change. Ported upstream changes. - `app/views/admin/announcements/new.html.haml` Upstream change too close to theming-related glitch-soc change. Ported upstream changes.		2022-11-14 08:35:55 +01:00
..
base.rb	Add support for language preferences for trending statuses and links (#18288)	2022-10-08 16:45:40 +02:00
history.rb	Change algorithm of tootctl search deploy to improve performance (#18463)	2022-05-22 22:16:43 +02:00
links.rb	Add support for language preferences for trending statuses and links (#18288)	2022-10-08 16:45:40 +02:00
preview_card_batch.rb	Add trending statuses (#17431)	2022-02-25 00:34:14 +01:00
preview_card_filter.rb	Fix error when passing unknown filter param in REST API (#20626)	2022-11-14 08:06:06 +01:00
preview_card_provider_batch.rb	Add trending statuses (#17431)	2022-02-25 00:34:14 +01:00
preview_card_provider_filter.rb	Fix error when passing unknown filter param in REST API (#20626)	2022-11-14 08:06:06 +01:00
query.rb	Fix trends returning less results per page when filtered in REST API (#17996)	2022-04-08 17:10:53 +02:00
status_batch.rb	Fix using wrong policy on status-related actions in admin UI (#19490)	2022-10-28 00:48:30 +02:00
status_filter.rb	Fix error when passing unknown filter param in REST API (#20626)	2022-11-14 08:06:06 +01:00
statuses.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-10-28 19:23:58 +02:00
tag_batch.rb	Add trending statuses (#17431)	2022-02-25 00:34:14 +01:00
tag_filter.rb	Add trending statuses (#17431)	2022-02-25 00:34:14 +01:00
tags.rb	Change trending statuses to only show one status from each account (#18181)	2022-04-29 22:42:42 +02:00