Merge branch 'master' into upgrade-ra

This commit is contained in:
dklimpel
2023-10-14 21:45:12 +02:00
12 changed files with 1063 additions and 204 deletions
+1
View File
@@ -79,6 +79,7 @@ export const ReportShow = () => {
<ReferenceField source="sender" reference="users">
<TextField source="id" />
</ReferenceField>
<TextField source="sender" label="Sender (raw user ID)" />
<TextField source="event_id" />
<TextField source="event_json.origin" />
<TextField source="event_json.type" />
+4 -1
View File
@@ -215,7 +215,9 @@ const LoginPage = () => {
_ => {
if (
!formData.base_url ||
!formData.base_url.match(/^(http|https):\/\/[a-zA-Z0-9\-.]+$/)
!formData.base_url.match(
/^(http|https):\/\/[a-zA-Z0-9\-.]+(:\d{1,5})?$/
)
)
return;
const versionUrl = `${formData.base_url}/_synapse/admin/v1/server_version`;
@@ -324,6 +326,7 @@ const LoginPage = () => {
<MenuItem value="de">Deutsch</MenuItem>
<MenuItem value="en">English</MenuItem>
<MenuItem value="fr">Français</MenuItem>
<MenuItem value="it">Italiano</MenuItem>
<MenuItem value="zh">简体中文</MenuItem>
</Select>
<FormDataConsumer>