Thibaut Girka 444796b69b Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/application_controller.rb - app/controllers/auth/confirmations_controller.rb - app/controllers/auth/sessions_controller.rb - app/controllers/settings/deletes_controller.rb - app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb		2019-07-23 10:51:07 +02:00
..
admin	Add moderation API (#9387)	2019-06-20 02:52:34 +02:00
v2	Add GET /api/v2/search which returns rich tag objects, adjust web UI (#7661)	2018-05-29 02:01:24 +02:00
account_serializer.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-07-19 18:26:49 +02:00
application_serializer.rb
context_serializer.rb
conversation_serializer.rb
credential_account_serializer.rb
custom_emoji_serializer.rb	Add categories for custom emojis (#11196)	2019-06-28 15:54:10 +02:00
filter_serializer.rb
identity_proof_serializer.rb	squashed identity proof updates (#10375)	2019-03-28 18:01:09 +01:00
instance_serializer.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-06-24 15:02:59 +02:00
list_serializer.rb
media_attachment_serializer.rb	Add blurhash (#10630)	2019-04-27 03:24:09 +02:00
mute_serializer.rb
notification_serializer.rb
poll_serializer.rb	Add support for custom emojis in poll options (#10322)	2019-03-20 17:29:12 +01:00
preferences_serializer.rb	Add a preferences API so apps can share basic behaviours (#10109)	2019-03-15 02:39:20 +01:00
preview_card_serializer.rb
relationship_serializer.rb	Improve blocked view of profiles (#10491)	2019-04-07 04:59:13 +02:00
report_serializer.rb
scheduled_status_serializer.rb
search_serializer.rb
status_serializer.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-07-19 18:26:49 +02: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