8 Commits

Author	SHA1	Message	Date
Claire	c59fb65ddc	Merge commit '127503eb2cdd67126974bee304dde0f183300b84' into glitch-soc/merge-upstream ... Conflicts: - `app/helpers/accounts_helper.rb`: Conflict due to glitch-soc's option to hide followers count. Ported upstream changes. Additional changes: - `app/views/application/mailer/_account.html.haml`: Ported glitch-soc's option to hide followers count. - `app/views/settings/flavours/show.html.haml`: Ported the `frontend_asset_url` helper change to glitch-soc.	2024-01-17 18:32:15 +01:00
Renaud Chaput	cb5ac15923	Use a helper to avoid using media/ asset prefixes (#28756)	2024-01-17 12:19:51 +00:00
Vyr Cossont	c4a5e0ca0e	Advertise supported MIME types for statuses (#2090)	2023-01-20 13:57:32 +01:00
Claire	cb19be67d1	Merge branch 'main' into glitch-soc/merge-upstream	2022-10-28 19:23:58 +02:00
Takeshi Umeda	b0e3f0312c	Add synchronization of remote featured tags (#19380) ... * Add LIMIT of featured tag to instance API response * Add featured_tags_collection_url to Account * Add synchronization of remote featured tags * Deliver update activity when updating featured tag * Remove featured_tags_collection_url * Revert "Add featured_tags_collection_url to Account" This reverts commit cff349fc27b104ded2df6bb5665132dc24dab09c. * Add hashtag sync from featured collections * Fix tag name normalize * Add target option to fetch featured collection * Refactor fetch_featured_tags_collection_service * Add LIMIT of featured tag to v1/instance API response	2022-10-20 09:15:52 +02:00
Eugen Rochko	b04633a961	Add image processing and generate blurhash for server thumbnail (#19348) ... Remove separate server hero setting	2022-10-13 11:29:19 +02:00
Eugen Rochko	bf3cb42da7	Add server banner to web app, add GET /api/v2/instance to REST API (#19294) ... Cherry-picked d2528b26b6 Conflicts: - `app/serializers/initial_state_serializer.rb`: Upstream changed stuff, we had extra attributes. Applied upstream changes while keeping our extra attributes. - `app/serializers/rest/instance_serializer.rb`: Upstream actually moved that to `app/serializers/rest/v1/instance_serializer.rb`, so updated that file by keeping our extra attributes, and took upstream's version of `app/serializers/rest/instance_serializer.rb`. - `spec/views/about/show.html.haml_spec.rb`: Took upstream's version.	2022-10-09 19:51:39 +02:00
Eugen Rochko	d2528b26b6	Add server banner to web app, add GET /api/v2/instance to REST API (#19294)	2022-10-05 03:47:56 +02:00