You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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.		2 years ago
..
base.rb	Add support for language preferences for trending statuses and links (#18288)	2 years ago
history.rb	Change algorithm of `tootctl search deploy` to improve performance (#18463)	3 years ago
links.rb	Add support for language preferences for trending statuses and links (#18288)	2 years ago
preview_card_batch.rb	Add trending statuses (#17431)	3 years ago
preview_card_filter.rb	Fix error when passing unknown filter param in REST API (#20626)	2 years ago
preview_card_provider_batch.rb	Add trending statuses (#17431)	3 years ago
preview_card_provider_filter.rb	Fix error when passing unknown filter param in REST API (#20626)	2 years ago
query.rb	Fix trends returning less results per page when filtered in REST API (#17996)	3 years ago
status_batch.rb	Fix using wrong policy on status-related actions in admin UI (#19490)	2 years ago
status_filter.rb	Fix error when passing unknown filter param in REST API (#20626)	2 years ago
statuses.rb	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
tag_batch.rb	Add trending statuses (#17431)	3 years ago
tag_filter.rb	Add trending statuses (#17431)	3 years ago
tags.rb	Change trending statuses to only show one status from each account (#18181)	3 years ago