Merge branch 'main' into add-edition
This commit is contained in:
@ -86,6 +86,12 @@ urlpatterns = [
|
||||
r"^settings/dashboard/?$", views.Dashboard.as_view(), name="settings-dashboard"
|
||||
),
|
||||
re_path(r"^settings/site-settings/?$", views.Site.as_view(), name="settings-site"),
|
||||
re_path(r"^settings/themes/?$", views.Themes.as_view(), name="settings-themes"),
|
||||
re_path(
|
||||
r"^settings/themes/(?P<theme_id>\d+)/delete/?$",
|
||||
views.delete_theme,
|
||||
name="settings-themes-delete",
|
||||
),
|
||||
re_path(
|
||||
r"^settings/announcements/?$",
|
||||
views.Announcements.as_view(),
|
||||
@ -119,6 +125,11 @@ urlpatterns = [
|
||||
re_path(
|
||||
r"^settings/users/?$", views.UserAdminList.as_view(), name="settings-users"
|
||||
),
|
||||
re_path(
|
||||
r"^settings/users/(?P<status>(local|federated))\/?$",
|
||||
views.UserAdminList.as_view(),
|
||||
name="settings-users",
|
||||
),
|
||||
re_path(
|
||||
r"^settings/users/(?P<user>\d+)/?$",
|
||||
views.UserAdmin.as_view(),
|
||||
@ -144,6 +155,11 @@ urlpatterns = [
|
||||
views.unblock_server,
|
||||
name="settings-federated-server-unblock",
|
||||
),
|
||||
re_path(
|
||||
r"^settings/federation/(?P<server>\d+)/refresh/?$",
|
||||
views.refresh_server,
|
||||
name="settings-federated-server-refresh",
|
||||
),
|
||||
re_path(
|
||||
r"^settings/federation/add/?$",
|
||||
views.AddFederatedServer.as_view(),
|
||||
@ -217,11 +233,23 @@ urlpatterns = [
|
||||
# auto-moderation rules
|
||||
re_path(r"^settings/automod/?$", views.AutoMod.as_view(), name="settings-automod"),
|
||||
re_path(
|
||||
r"^settings/automod/(?P<rule_id>\d+)/delete?$",
|
||||
r"^settings/automod/(?P<rule_id>\d+)/delete/?$",
|
||||
views.automod_delete,
|
||||
name="settings-automod-delete",
|
||||
),
|
||||
re_path(r"^settings/automod/run?$", views.run_automod, name="settings-automod-run"),
|
||||
re_path(
|
||||
r"^settings/automod/schedule/?$",
|
||||
views.schedule_automod_task,
|
||||
name="settings-automod-schedule",
|
||||
),
|
||||
re_path(
|
||||
r"^settings/automod/unschedule/(?P<task_id>\d+)/?$",
|
||||
views.unschedule_automod_task,
|
||||
name="settings-automod-unschedule",
|
||||
),
|
||||
re_path(
|
||||
r"^settings/automod/run/?$", views.run_automod, name="settings-automod-run"
|
||||
),
|
||||
# moderation
|
||||
re_path(
|
||||
r"^settings/reports/?$", views.ReportsAdmin.as_view(), name="settings-reports"
|
||||
|
Reference in New Issue
Block a user