Thibaut Girka 91bef4759f Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: Vagrantfile app/javascript/packs/public.js app/views/admin/settings/edit.html.haml app/views/settings/preferences/show.html.haml app/views/settings/profiles/show.html.haml config/locales/es.yml config/locales/simple_form.en.yml config/webpack/configuration.js config/webpack/loaders/babel.js package.json yarn.lock Split new additions to app/javascript/packs/public.js to app/javascript/core/settings.js		2018-09-19 21:46:01 +02:00
..
account_moderation_notes	Improve admin UI for accounts (#7360)	2018-05-05 23:06:29 +02:00
accounts	Add confirmation step to account suspensions (#8353)	2018-08-22 11:53:41 +02:00
action_logs	Improve report layout (#7188)	2018-04-20 02:28:48 +02:00
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	Fix tag usage display on admin dashboard	2018-07-16 19:51:16 +02:00
domain_blocks	Merge branch 'master' into glitch-soc/merge-upstream	2018-09-19 21:46:01 +02:00
email_domain_blocks	Redesign forms, verify link ownership with rel="me" (#8703)	2018-09-18 16:45:58 +02:00
instances	Add instance search feature (#4925)	2017-09-13 12:30:07 +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	Improve report layout (#7188)	2018-04-20 02:28:48 +02:00
reports	Merge branch 'master' into glitch-soc/merge-upstream	2018-09-19 21:46:01 +02:00
settings	Merge branch 'master' into glitch-soc/merge-upstream	2018-09-19 21:46:01 +02:00
statuses	Allow to show a specific status in the admin interface	2018-09-03 18:19:11 +02:00
subscriptions	Scrollable tables in settings pages (#4857)	2017-09-09 02:26:58 +02:00
suspensions	Better singulars of account followers/toots. (#8471)	2018-08-26 21:30:53 +02:00