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
..
applications	Redesign forms, verify link ownership with rel="me" (#8703)	2018-09-18 16:45:58 +02:00
deletes	Fix autocomplete option in haml files (#4438)	2017-07-29 14:20:31 +02:00
exports	Group reports by target account (#8674)	2018-09-13 03:44:08 +02:00
flavours	Don't show skins selector when there's only one (#256)	2018-01-08 16:45:32 -08:00
follower_domains	Scrollable tables in settings pages (#4857)	2017-09-09 02:26:58 +02:00
imports	Redesign forms, verify link ownership with rel="me" (#8703)	2018-09-18 16:45:58 +02:00
migrations	Redesign public profiles and toots (#8068)	2018-07-28 19:25:33 +02:00
notifications	Add preference for report notification e-mails, skip for duplicates (#8559)	2018-09-02 00:11:58 +02:00
preferences	Merge branch 'master' into glitch-soc/merge-upstream	2018-09-19 21:46:01 +02:00
profiles	Merge branch 'master' into glitch-soc/merge-upstream	2018-09-19 21:46:01 +02:00
shared	2FA controller cleanup (#2296)	2017-04-22 04:23:17 +02:00
two_factor_authentication	Redesign forms, verify link ownership with rel="me" (#8703)	2018-09-18 16:45:58 +02:00
two_factor_authentications	Redesign forms, verify link ownership with rel="me" (#8703)	2018-09-18 16:45:58 +02:00