This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.

Thibaut Girka b9f351d845 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/mastodon/actions/compose.js`: Not a “real” conflict, but change too close to a change we made to fix the vanilla WebUI locally pushing authored local-only toots in the public TL view.		2020-07-22 13:38:17 +02:00
..
admin	Add moderation API (#9387)	2019-06-20 02:52:34 +02:00
keys	Add E2EE API (#13820)	2020-06-02 19:24:53 +02:00
account_serializer.rb	Merge branch 'master' into glitch-soc/merge-upstream	2020-01-27 15:46:50 +01: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	Change silences to always require approval on follow (#11975)	2019-09-27 21:13:51 +02:00
custom_emoji_serializer.rb	Add categories for custom emojis (#11196)	2019-06-28 15:54:10 +02:00
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	Add featured tags API (#11778)	2019-09-09 10:50:33 +02:00
filter_serializer.rb	…
identity_proof_serializer.rb	…
instance_serializer.rb	Merge branch 'master' into glitch-soc/merge-upstream	2020-05-03 21:23:49 +02:00
list_serializer.rb	…
marker_serializer.rb	Add timeline read markers API (#11762)	2019-09-06 13:55:51 +02:00
media_attachment_serializer.rb	Add thumbnail_remote_url in MediaAttachment REST response (#14358)	2020-07-19 19:53:31 +02:00
mute_serializer.rb	…
notification_serializer.rb	…
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	Change design of account notes in web UI (#14208)	2020-07-07 01:24:03 +02:00
report_serializer.rb	…
scheduled_status_serializer.rb	…
search_serializer.rb	Remove deprecated `GET /api/v1/search` API (#11823)	2019-09-13 16:11:13 +02:00
status_serializer.rb	Merge branch 'master' into glitch-soc/merge-upstream	2020-02-06 21:36:38 +01:00
tag_serializer.rb	…
web_push_subscription_serializer.rb	Fix `alerts` booleans not being typecast correctly in push subscription (#11343)	2019-07-21 18:10:07 +02:00