David Yip 77a92d3260 Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: Gemfile.lock		2018-05-04 09:42:31 -05:00
..
account_moderation_notes	Add moderator role and add pundit policies for admin actions (#5635)	2017-11-11 20:23:33 +01:00
accounts	Feature: add count of account notes to reports (#7130)	2018-04-17 14:58:11 +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
report_notes	Improve report layout (#7188)	2018-04-20 02:28:48 +02:00
reports	Merge remote-tracking branch 'origin/master' into merge-upstream	2018-05-04 09:42:31 -05:00
settings	Redesign landing page (again) (#6486)	2018-02-22 01:03:48 +01:00
statuses	Finalized theme loading and stuff	2017-11-20 22:13:37 -08:00
subscriptions	Scrollable tables in settings pages (#4857)	2017-09-09 02:26:58 +02:00