Thibaut Girka f26f1145ac Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: Dockerfile app/javascript/packs/common.js config/webpack/loaders/sass.js config/webpack/shared.js db/schema.rb package.json yarn.lock A lot of the conflicts come from updating webpack. Even though upstream deleted app/javascript/packs/common.js, I kept glitch-soc's version as it unifies JS/CSS packs behavior across flavours. Ported glitch changes to webpack 4.x		2018-07-16 14:50:42 +02:00
..
account_moderation_notes	Improve admin UI for accounts (#7360)	2018-05-05 23:06:29 +02:00
accounts	Remove unnecessary underline on accounts table (#7728)	2018-06-04 13:09:36 +02:00
action_logs	Improve report layout (#7188)	2018-04-20 02:28:48 +02:00
change_emails	Feature: Allow staff to change user emails (#7074)	2018-04-10 09:16:06 +02:00
custom_emojis	keep the same filters and page when doing custom emojo stuff (fixes #6112) (#6114)	2017-12-30 02:43:43 +01:00
domain_blocks	Scrollable tables in settings pages (#4857)	2017-09-09 02:26:58 +02:00
email_domain_blocks	Fix style of email domain block table (#5218)	2017-10-04 18:16:30 +02:00
instances	Add instance search feature (#4925)	2017-09-13 12:30:07 +02:00
invites	Add invite filter (#5862)	2017-12-01 16:40:02 +01:00
relays	Add federation relay support (#7998)	2018-07-13 02:16:06 +02:00
report_notes	Improve report layout (#7188)	2018-04-20 02:28:48 +02:00
reports	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-05-21 18:17:23 +00:00
settings	Add admin setting to enable OG previews for sensitive media (#7962)	2018-07-06 02:15:56 +02:00
statuses	Merge branch 'master' into glitch-soc/master	2018-05-10 00:03:28 +02:00
subscriptions	Scrollable tables in settings pages (#4857)	2017-09-09 02:26:58 +02:00