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.

Thibaut Girka a2a64ecd3e Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - .eslintrc.yml Removed, as upstream removed it. - app/controllers/admin/statuses_controller.rb Minor code cleanup when porting one of our features. - app/models/account.rb Note length validation has changed upstream. We now use upstream's validation (dropped legacy glitch-soc account metadata stuff) but with configurable limit. - app/services/post_status_service.rb Upstream has added support for scheduled toots, refactoring the code a bit. Adapted our changes to this refactoring. - app/views/stream_entries/_detailed_status.html.haml Not a real conflict, changes too close. - app/views/stream_entries/_simple_status.html.haml Not a real conflict, changes too close.		6 years ago
..
v2	…
account_serializer.rb	Add a per-user setting to hide followers count	6 years ago
application_serializer.rb	…
context_serializer.rb	…
conversation_serializer.rb	Add unread indicator to conversations (#9009)	6 years ago
credential_account_serializer.rb	…
custom_emoji_serializer.rb	…
filter_serializer.rb	Fix filter ID not being a string in REST API (#9303)	6 years ago
instance_serializer.rb	…
list_serializer.rb	Add backend support to read and update list-specific show_replies settings	6 years ago
media_attachment_serializer.rb	…
mute_serializer.rb	…
notification_serializer.rb	…
preview_card_serializer.rb	…
relationship_serializer.rb	…
report_serializer.rb	…
scheduled_status_serializer.rb	Fix wrong param name in scheduled statuses and return params in API (#9725)	6 years ago
search_serializer.rb	…
status_serializer.rb	Add field to serialized local-only statuses	6 years ago
tag_serializer.rb	…
web_push_subscription_serializer.rb	…