Jason Robinson cee4010f94 Merge branch 'develop' into jaywink/admin-forward-extremities ...

# Conflicts:
#	synapse/rest/admin/__init__.py

2021-01-26 10:15:32 +02:00

..

__init__.py

Merge branch 'develop' into jaywink/admin-forward-extremities

2021-01-26 10:15:32 +02:00

_base.py

Remove deprecated /_matrix/client/*/admin endpoints (#8785)

2020-11-25 16:26:11 -05:00

devices.py

Add field total to device list in admin API (#8644)

2020-10-26 14:07:51 +00:00

event_reports.py

Split admin API for reported events into a detail and a list view (#8539)

2020-10-26 18:16:37 +00:00

groups.py

Remove deprecated /_matrix/client/*/admin endpoints (#8785)

2020-11-25 16:26:11 -05:00

media.py

Add an admin API endpoint to protect media. (#9086)

2021-01-15 11:18:09 -05:00

purge_room_servlet.py

Use admin_patterns for all admin APIs. (#8331)

2020-09-17 07:04:15 -04:00

rooms.py

Address pr feedback

2021-01-11 23:43:58 +02:00

server_notice_servlet.py

Use admin_patterns for all admin APIs. (#8331)

2020-09-17 07:04:15 -04:00

statistics.py

Add an admin API for users' media statistics (#8700)

2020-11-05 18:59:12 +00:00

users.py

Add an admin API for shadow-banning users. (#9209)

2021-01-25 14:49:39 -05:00