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

Conflicts:
- app/javascript/packs/public.js
- app/models/user.rb
- config/settings.yml
- db/schema.rb

Moved public.js changes to settings.js.

2018-12-09 16:08:04 +01:00

..

account_moderation_notes

…

accounts

Redesign admin accounts index (#9340)

2018-11-26 15:53:27 +01:00

action_logs

…

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

…

domain_blocks

Merge branch 'master' into glitch-soc/merge-upstream

2018-10-22 17:51:38 +02:00

email_domain_blocks

Add option to block reports from domain (#8830)

2018-10-20 08:02:44 +02:00

instances

Add option to block reports from domain (#8830)

2018-10-20 08:02:44 +02:00

invites

…

relays

Display pending message on admin relays UI (#8494)

2018-08-28 05:39:43 +02:00

report_notes

…

reports

Merge branch 'master' into glitch-soc/merge-upstream

2018-10-22 17:51:38 +02:00

settings

Merge branch 'master' into glitch-soc/merge-upstream

2018-10-22 17:51:38 +02:00

statuses

Allow to show a specific status in the admin interface

2018-09-03 18:19:11 +02:00

subscriptions

…

suspensions

Better singulars of account followers/toots. (#8471)

2018-08-26 21:30:53 +02:00

tags

Add profile directory (#9427)

2018-12-06 17:36:11 +01:00