Thibaut Girka ddd875ad99 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/media_attachment.rb Upstream added audio attachment support - app/serializers/initial_state_serializer.rb Upstream added audio attachment support and how mimetypes are returned - app/serializers/rest/instance_serializer.rb Upstream added a few fields - config/application.rb Upstream added a different paperclip transcoder		2019-06-24 15:02:59 +02:00
..
account_actions	Add moderation warnings (#9519)	2018-12-22 20:02:09 +01:00
account_moderation_notes
account_warnings	Add moderation warnings (#9519)	2018-12-22 20:02:09 +01:00
accounts	Add batch actions for approving and rejecting pending accounts (#10469)	2019-04-06 17:53:45 +02:00
action_logs	Use local time in audit log (#10751)	2019-05-11 06:46:01 +02:00
change_emails	Hide misleading “You will be sent a confirmation e-mail” hint from admin view (#9973)	2019-02-05 15:11:35 +01:00
custom_emojis
dashboard	Fix keybase indication on dashboard	2019-04-19 00:57:39 +02:00
domain_blocks	Merge branch 'master' into glitch-soc/merge-upstream	2019-05-15 17:11:40 +02:00
email_domain_blocks
followers	Fix admin UI view of local followers (#9712)	2019-01-04 11:28:14 +01:00
instances	Remove expensive counters from federation page in admin UI (#11139)	2019-06-22 00:39:09 +02:00
invites	Fix maxed-out invites not showing up as expired in UI (#10274)	2019-03-15 05:35:17 +01:00
pending_accounts	Merge branch 'master' into glitch-soc/merge-upstream	2019-06-07 17:00:36 +02:00
relays
report_notes
reports	Merge branch 'master' into glitch-soc/merge-upstream	2018-12-23 11:28:28 +01:00
settings	Add label for admin theme selector (#11121)	2019-06-19 17:30:08 +02:00
statuses	Add quick links to the admin interface in the WebUI (#8545)	2019-01-04 13:10:43 +01:00
subscriptions
tags	Add profile directory (#9427)	2018-12-06 17:36:11 +01:00
warning_presets	Add moderation warnings (#9519)	2018-12-22 20:02:09 +01:00