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

Conflicts:
- app/controllers/home_controller.rb
- app/controllers/shares_controller.rb
- app/javascript/packs/public.js
- app/models/status.rb
- app/serializers/initial_state_serializer.rb
- app/views/home/index.html.haml
- app/views/layouts/public.html.haml
- app/views/public_timelines/show.html.haml
- app/views/shares/show.html.haml
- app/views/tags/show.html.haml
- config/initializers/content_security_policy.rb
- config/locales/en.yml
- config/webpack/shared.js
- package.json

2019-08-19 21:49:35 +02:00

..

account_actions

Add moderation warnings (#9519)

2018-12-22 20:02:09 +01:00

account_moderation_notes

Improve admin UI for accounts (#7360)

2018-05-05 23:06:29 +02:00

account_warnings

Add moderation warnings (#9519)

2018-12-22 20:02:09 +01:00

accounts

Add domain block notes (#11515)

2019-08-07 20:20:23 +02:00

action_logs

Use local time in audit log (#10751)

2019-05-11 06:46:01 +02:00

change_emails

Hide misleading “You will be sent a confirmation e-mail” hint from admin view (#9973)

2019-02-05 15:11:35 +01:00

custom_emojis

Redesign forms, verify link ownership with rel="me" (#8703)

2018-09-18 16:45:58 +02:00

dashboard

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

2019-08-08 08:44:33 +02:00

domain_allows

Add whitelist mode (#11291)

2019-07-30 11:10:46 +02:00

domain_blocks

Fix domain block edition in glitch-soc

2019-08-08 09:14:20 +02:00

email_domain_blocks

Add option to block reports from domain (#8830)

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

followers

Fix admin UI view of local followers (#9712)

2019-01-04 11:28:14 +01:00

instances

Add domain block notes (#11515)

2019-08-07 20:20:23 +02:00

invites

Fix maxed-out invites not showing up as expired in UI (#10274)

2019-03-15 05:35:17 +01:00

pending_accounts

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

2019-06-07 17:00:36 +02:00

relays

Display pending message on admin relays UI (#8494)

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

report_notes

Improve report layout (#7188)

2018-04-20 02:28:48 +02:00

reports

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

2019-07-19 18:26:49 +02:00

settings

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

2019-08-19 21:49:35 +02:00

statuses

Add quick links to the admin interface in the WebUI (#8545)

2019-01-04 13:10:43 +01:00

tags

Fix weekly usage not being displayed correctly in hashtag admin UI (#11524)

2019-08-08 23:03:28 +02:00

warning_presets

Add moderation warnings (#9519)

2018-12-22 20:02:09 +01:00