Thibaut Girka 571d219bb9 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts manually resolved: - app/services/post_status_service.rb - config/locales/simple_form.pl.yml - config/routes.rb - config/webpack/loaders/sass.js - config/webpack/shared.js - package.json - yarn.lock		2019-01-02 15:36:53 +01:00
..
account_actions	Add moderation warnings (#9519)	2018-12-22 20:02:09 +01:00
account_moderation_notes	Improve admin UI for accounts (#7360)	2018-05-05 23:06:29 +02:00
account_warnings	Add moderation warnings (#9519)	2018-12-22 20:02:09 +01:00
accounts	Improve admin UI for account view (#9643)	2018-12-28 03:38:41 +01:00
action_logs
change_emails	Redesign forms, verify link ownership with rel="me" (#8703)	2018-09-18 16:45:58 +02:00
custom_emojis	Redesign forms, verify link ownership with rel="me" (#8703)	2018-09-18 16:45:58 +02:00
dashboard	Add instance-wide setting to disable profile directory (#9497)	2018-12-11 19:18:29 +01:00
domain_blocks	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-22 17:51:38 +02:00
email_domain_blocks	Add option to block reports from domain (#8830)	2018-10-20 08:02:44 +02:00
followers	Improve admin UI for account view (#9643)	2018-12-28 03:38:41 +01:00
instances	Add option to block reports from domain (#8830)	2018-10-20 08:02:44 +02:00
invites	Add admin function to deactivate all invites (#8279)	2018-08-19 00:58:53 +02:00
relays	Display pending message on admin relays UI (#8494)	2018-08-28 05:39:43 +02:00
report_notes
reports	Merge branch 'master' into glitch-soc/merge-upstream	2018-12-23 11:28:28 +01:00
settings	Add admin setting to disable followers count	2018-12-20 14:51:12 +01:00
statuses	Merge branch 'master' into glitch-soc/merge-upstream	2019-01-02 15:36:53 +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