Thibaut Girka bf1d3ae3b8 Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
	config/settings.yml

2018-08-01 22:20:25 +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

dashboard

Fix tag usage display on admin dashboard

2018-07-16 19:51:16 +02:00

domain_blocks

…

email_domain_blocks

…

instances

…

invites

…

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 separate setting for sidebar text (site_short_description) (#8107)

2018-07-31 18:59:34 +02:00

statuses

Merge branch 'master' into glitch-soc/master

2018-05-10 00:03:28 +02:00

subscriptions

…