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 c790ecb14d Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/api/v1/statuses_controller.rb`: Conflict due to upstream adding a new parameter (with_rate_limit), too close to glitch-soc's own additional parameter (content_type). Added upstream's parameter. - `app/services/post_status_service.rb`: Conflict due to upstream adding a new parameter (rate_limit), too close to glitch-soc's own additional parameter (content_type). Added upstream's parameter. - `app/views/settings/preferences/appearance/show.html.haml`: Conflict due to us not exposing theme settings here (as we have a different flavour/skin menu). Took upstream change, while still not exposing theme settings. - `config/webpack/shared.js`: Coding style fixes for a part we have rewritten. Discarded upstream changes.		5 years ago
..
admin	Add moderation API (#9387)	6 years ago
account_serializer.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
announcement_serializer.rb	Add support for links to statuses in announcements to be opened in web UI (#13212)	5 years ago
application_serializer.rb	Add vapid_key to the application entity in the REST API (#10058)	6 years ago
context_serializer.rb	…
conversation_serializer.rb	…
credential_account_serializer.rb	Change silences to always require approval on follow (#11975)	5 years ago
custom_emoji_serializer.rb	Add categories for custom emojis (#11196)	6 years ago
featured_tag_serializer.rb	Add featured tags API (#11778)	5 years ago
filter_serializer.rb	…
identity_proof_serializer.rb	squashed identity proof updates (#10375)	6 years ago
instance_serializer.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
list_serializer.rb	…
marker_serializer.rb	Add timeline read markers API (#11762)	5 years ago
media_attachment_serializer.rb	Add blurhash (#10630)	6 years ago
mute_serializer.rb	…
notification_serializer.rb	Support pushing and receiving updates to poll tallies (#10209)	6 years ago
poll_serializer.rb	Add voters count support (#11917)	5 years ago
preferences_serializer.rb	Add a preferences API so apps can share basic behaviours (#10109)	6 years ago
preview_card_serializer.rb	…
reaction_serializer.rb	Add announcements (#12662)	5 years ago
relationship_serializer.rb	Improve blocked view of profiles (#10491)	6 years ago
report_serializer.rb	…
scheduled_status_serializer.rb	…
search_serializer.rb	Remove deprecated `GET /api/v1/search` API (#11823)	5 years ago
status_serializer.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
tag_serializer.rb	…
web_push_subscription_serializer.rb	Fix `alerts` booleans not being typecast correctly in push subscription (#11343)	6 years ago