Merge branch 'master' into production

This commit is contained in:
Paul Makles 2022-08-08 15:30:21 +01:00
commit f76e53649b
3 changed files with 4 additions and 4 deletions

2
external/lang vendored

@ -1 +1 @@
Subproject commit dd597a0fb984e6c681dcf936bdbb1fc07c0521dd Subproject commit 81526bc70e39a90d6e64a60c34d7d4478b95b05a

View file

@ -18,7 +18,6 @@ export function PermissionList({ value, onChange, filter, target }: Props) {
(key) => (key) =>
![ ![
"GrantAllSafe", "GrantAllSafe",
"TimeoutMembers",
"ReadMessageHistory", "ReadMessageHistory",
"Speak", "Speak",
"Video", "Video",

View file

@ -6,10 +6,10 @@ import { DEFAULT_PERMISSION_DIRECT_MESSAGE } from "revolt.js";
import { Text } from "preact-i18n"; import { Text } from "preact-i18n";
import { useState } from "preact/hooks"; import { useState } from "preact/hooks";
import { TextReact } from "../../../lib/i18n";
import { PermissionsLayout, Button, SpaceBetween, H1 } from "@revoltchat/ui"; import { PermissionsLayout, Button, SpaceBetween, H1 } from "@revoltchat/ui";
import { TextReact } from "../../../lib/i18n";
import { PermissionList } from "../../../components/settings/roles/PermissionList"; import { PermissionList } from "../../../components/settings/roles/PermissionList";
import { RoleOrDefault } from "../../../components/settings/roles/RoleSelection"; import { RoleOrDefault } from "../../../components/settings/roles/RoleSelection";
import { useRoles } from "../server/Roles"; import { useRoles } from "../server/Roles";
@ -109,6 +109,7 @@ export default observer(({ channel }: Props) => {
"SendEmbeds", "SendEmbeds",
"UploadFiles", "UploadFiles",
"Masquerade", "Masquerade",
"React",
"ManageChannel", "ManageChannel",
"ManagePermissions", "ManagePermissions",
]} ]}