Claire 443ec4f8ba Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/views/admin/tags/index.html.haml`: Removed upstream while it had changes in glitch-soc to accomodate for the theming system. Additional changes to accomodate for the theming system: - `app/views/admin/trends/links/preview_card_providers/index.html.haml` - `app/views/admin/trends/links/index.html.haml` - `app/views/admin/trends/tags/index.html.haml` - `app/views/admin/tags/show.html.haml`		2021-11-25 23:50:35 +01:00
..
admin	Add graphs and retention metrics to admin dashboard (#16829)	2021-10-14 20:44:59 +02:00
keys	Add E2EE API (#13820)	2020-06-02 19:24:53 +02:00
trends	Add trending links (#16917)	2021-11-25 13:07:38 +01:00
account_serializer.rb	Merge branch 'main' into glitch-soc/merge-upstream	2021-05-09 10:41:28 +02:00
announcement_serializer.rb	Add support for links to statuses in announcements to be opened in web UI (#13212)	2020-03-08 16:10:48 +01:00
application_serializer.rb
context_serializer.rb
conversation_serializer.rb
credential_account_serializer.rb
custom_emoji_serializer.rb
encrypted_message_serializer.rb	Fix wrong route helper in encrypted messages controller (#13952)	2020-06-03 20:32:15 +02:00
featured_tag_serializer.rb	Use existing FeaturedTag serializer and delete AccountFeaturedTag serializer (#15415)	2020-12-23 16:43:38 +01:00
filter_serializer.rb
identity_proof_serializer.rb
instance_serializer.rb	Merge branch 'main' into glitch-soc/merge-upstream	2021-07-11 21:41:23 +02:00
list_serializer.rb	Add configuration option to filter replies in lists (#9205)	2020-09-01 13:31:28 +02:00
marker_serializer.rb
media_attachment_serializer.rb	Stop setting a shortcode to newly-created media attachments (#16730)	2021-09-13 18:59:37 +02:00
mute_serializer.rb
muted_account_serializer.rb	Add duration parameter to muting. (#13831)	2020-10-13 01:01:14 +02:00
notification_serializer.rb	Add option to be notified when a followed user posts (#13546)	2020-09-18 17:26:45 +02:00
poll_serializer.rb	Add voters count support (#11917)	2019-09-29 22:58:01 +02:00
preferences_serializer.rb
preview_card_serializer.rb	Add blurhash to preview cards (#13984)	2020-06-05 23:10:41 +02:00
reaction_serializer.rb	Add announcements (#12662)	2020-01-23 22:00:13 +01:00
relationship_serializer.rb	Add option to be notified when a followed user posts (#13546)	2020-09-18 17:26:45 +02:00
report_serializer.rb
rule_serializer.rb	Add server rules (#15769)	2021-02-21 19:50:12 +01:00
scheduled_status_serializer.rb
search_serializer.rb
status_serializer.rb	Merge branch 'master' into glitch-soc/merge-upstream	2020-11-07 18:23:02 +01:00
suggestion_serializer.rb	Add cold-start follow recommendations (#15945)	2021-04-12 12:37:14 +02:00
tag_serializer.rb
web_push_subscription_serializer.rb