mirrors/catstodon
1
0
Fork 0
mirror of https://git.kescher.at/CatCatNya/catstodon.git synced 2024-12-18 11:39:04 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
catstodon/app/models/trends
History
Claire 392ca0472a Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/packs/admin.js`:
  Conflicts due to glitch-soc's theming system.
  Upstream changes have been ported to `app/javascript/core/admin.js`
- `app/models/trends/statuses.rb`:
  Minor conflict due to glitch-soc's option to allow CWed toots in trends.
  Ported upstream changes.
2022-05-01 16:52:27 +02:00
..
base.rb Change trending statuses to only show one status from each account (#18181) 2022-04-29 22:42:42 +02:00
history.rb Add trending links (#16917) 2021-11-25 13:07:38 +01:00
links.rb Change trending statuses to only show one status from each account (#18181) 2022-04-29 22:42:42 +02:00
preview_card_batch.rb Add trending statuses (#17431) 2022-02-25 00:34:14 +01:00
preview_card_filter.rb Add trending statuses (#17431) 2022-02-25 00:34:14 +01:00
preview_card_provider_batch.rb Add trending statuses (#17431) 2022-02-25 00:34:14 +01:00
preview_card_provider_filter.rb Add trending statuses (#17431) 2022-02-25 00:34:14 +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 Add trending statuses (#17431) 2022-02-25 00:34:14 +01:00
status_filter.rb Add trending statuses (#17431) 2022-02-25 00:34:14 +01:00
statuses.rb Merge branch 'main' into glitch-soc/merge-upstream 2022-05-01 16:52:27 +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