Merge tag '0.8.2' into amp.chat

Change-Id: I791cad80267ddaa61966d3c2da9767e1a6a3c589
Bump version and update packages
2021-07-05 16:00:00 +01:00 · 2021-07-05 14:48:25 +02:00 · 2021-07-05 14:32:51 +02:00 · 2021-07-05 14:32:44 +02:00 · 2021-06-15 11:03:47 +02:00 · 2021-06-15 11:03:31 +02:00
30 changed files with 6734 additions and 4386 deletions
@@ -0,0 +1,5 @@
+# This setting allows to fix the homeserver.
+# If you set this setting, the user will not be able to select
+# the server and have to use synapse-admin with this server.
+
+#REACT_APP_SERVER=https://yourmatrixserver.example.com
@@ -1,5 +1,5 @@
 language: node_js
 node_js:
-  - 13
+  - lts/*

 cache: yarn
@@ -4,7 +4,7 @@

 This project is built using [react-admin](https://marmelab.com/react-admin/).

-It needs at least Synapse v1.23.0 for all functions to work as expected!
+It needs at least Synapse v1.34.0 for all functions to work as expected!

 You get your server version with the request `/_synapse/admin/v1/server_version`.
 See also [Synapse version API](https://github.com/matrix-org/synapse/blob/develop/docs/admin_api/version_api.rst).
@@ -33,9 +33,33 @@ Steps for 1):
 - download dependencies: `yarn install`
 - start web server: `yarn start`

+You can fix the homeserver, so that the user can no longer define it himself.
+Either you define it at startup (e.g. `REACT_APP_SERVER=https://yourmatrixserver.example.com yarn start`)
+or by editing it in the [.env](.env) file. See also the
+[documentation](https://create-react-app.dev/docs/adding-custom-environment-variables/).
+
 Steps for 2):

- run the Docker container: `docker run -p 8080:80 awesometechnologies/synapse-admin`
+- run the Docker container from the public docker registry: `docker run -p 8080:80 awesometechnologies/synapse-admin` or use the (docker-compose.yml)[docker-compose.yml]: `docker-compose up -d`
+
+  > note: if you're building on an architecture other than amd64 (for example a raspberry pi), make sure to define a maximum ram for node. otherwise the build will fail.
+
+  ```yml
+  version: "3"
+
+  services:
+    synapse-admin:
+      container_name: synapse-admin
+      hostname: synapse-admin
+      build:
+        context: https://github.com/Awesome-Technologies/synapse-admin.git
+        # args:
+        #   - NODE_OPTIONS="--max_old_space_size=1024"
+      ports:
+        - "8080:80"
+      restart: unless-stopped
+  ```
+
 - browse to http://localhost:8080

 ## Screenshots
@@ -0,0 +1,21 @@
+version: "3"
+
+services:
+  synapse-admin:
+    container_name: synapse-admin
+    hostname: synapse-admin
+    image: awesometechnologies/synapse-admin:latest
+    # build:
+    # context: .
+
+    # to use the docker-compose as standalone without a local repo clone,
+    # replace the context definition with this:
+    # context: https://github.com/Awesome-Technologies/synapse-admin.git
+
+    # if you're building on an architecture other than amd64, make sure
+    # to define a maximum ram for node. otherwise the build will fail.
+    # args:
+    #   - NODE_OPTIONS="--max_old_space_size=1024"
+    ports:
+      - "8080:80"
+    restart: unless-stopped
@@ -1,6 +1,6 @@
 {
  "name": "synapse-admin",
-  "version": "0.7.0",
+  "version": "AMP/2021.07",
  "description": "Admin GUI for the Matrix.org server Synapse",
  "author": "Awesome Technologies Innovationslabor GmbH",
  "license": "Apache-2.0",
@@ -11,24 +11,28 @@
  },
  "devDependencies": {
    "@testing-library/jest-dom": "^5.1.1",
-    "@testing-library/react": "^10.0.2",
-    "@testing-library/user-event": "^12.0.11",
-    "enzyme": "^3.11.0",
-    "enzyme-adapter-react-16": "^1.15.2",
-    "eslint": "^6.8.0",
-    "eslint-config-prettier": "^6.10.1",
+    "@testing-library/react": "^11.2.6",
+    "@testing-library/user-event": "^13.1.8",
+    "eslint": "^7.25.0",
+    "eslint-config-prettier": "^8.3.0",
    "eslint-plugin-prettier": "^3.1.2",
    "jest-fetch-mock": "^3.0.3",
-    "prettier": "^2.0.0"
+    "prettier": "^2.2.0",
+    "ra-test": "^3.15.0"
  },
  "dependencies": {
+    "@progress/kendo-drawing": "^1.6.0",
+    "@progress/kendo-react-pdf": "^3.10.1",
+    "babel-preset-jest": "^24.9.0",
    "papaparse": "^5.2.0",
    "prop-types": "^15.7.2",
-    "ra-language-german": "^2.1.2",
-    "react": "^16.13.1",
-    "react-admin": "^3.10.0",
-    "react-dom": "^16.14.0",
-    "react-scripts": "^3.4.4"
+    "qrcode.react": "^1.0.0",
+    "ra-language-chinese": "^2.0.10",
+    "ra-language-german": "^3.13.4",
+    "react": "^17.0.0",
+    "react-admin": "^3.15.0",
+    "react-dom": "^17.0.2",
+    "react-scripts": "^4.0.0"
  },
  "scripts": {
    "start": "REACT_APP_VERSION=$(git describe --tags) react-scripts start",
@@ -9,6 +9,32 @@
      name="description"
      content="Synapse-Admin"
    />
+    <style>
+      @font-face {
+        font-family: "DejaVu Sans";
+        src: url("%PUBLIC_URL%/fonts/DejaVu/DejaVuSans.ttf") format("truetype");
+      }
+      @font-face {
+        font-family: "DejaVu Sans";
+        font-weight: bold;
+        src: url("%PUBLIC_URL%/fonts/DejaVu/DejaVuSans-Bold.ttf") format("truetype");
+      }
+      @font-face {
+        font-family: "DejaVu Sans";
+        font-style: italic;
+        src: url("%PUBLIC_URL%/fonts/DejaVu/DejaVuSans-Oblique.ttf") format("truetype");
+      }
+      @font-face {
+        font-family: "DejaVu Sans";
+        font-weight: bold;
+        font-style: italic;
+        src: url("%PUBLIC_URL%/fonts/DejaVu/DejaVuSans-Oblique.ttf") format("truetype");
+      }
+      @font-face {
+        font-family: "DejaVu Sans Mono";
+        src: url("%PUBLIC_URL%/fonts/DejaVu/DejaVuSans-Mono.ttf") format("truetype");
+      }
+    </style>
    <!--
      manifest.json provides metadata used when your web app is installed on a
      user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
@@ -46,4 +72,4 @@
      </a>
    </footer>
  </body>
-</html>
+</html>
@@ -4,23 +4,28 @@ import polyglotI18nProvider from "ra-i18n-polyglot";
 import authProvider from "./synapse/authProvider";
 import dataProvider from "./synapse/dataProvider";
 import { UserList, UserCreate, UserEdit } from "./components/users";
-import { RoomList, RoomShow } from "./components/rooms";
+import { RoomList, RoomCreate, RoomShow, RoomEdit } from "./components/rooms";
 import { ReportList, ReportShow } from "./components/EventReports";
+import ImportFeature from "./components/ImportFeature";
 import LoginPage from "./components/LoginPage";
 import UserIcon from "@material-ui/icons/Group";
 import EqualizerIcon from "@material-ui/icons/Equalizer";
 import { UserMediaStatsList } from "./components/statistics";
 import RoomIcon from "@material-ui/icons/ViewList";
 import ReportIcon from "@material-ui/icons/Warning";
-import { ImportFeature } from "./components/ImportFeature";
+import FolderSharedIcon from "@material-ui/icons/FolderShared";
+import { RoomDirectoryList } from "./components/RoomDirectory";
 import { Route } from "react-router-dom";
 import germanMessages from "./i18n/de";
 import englishMessages from "./i18n/en";
+import chineseMessages from "./i18n/zh";
+import ShowUserPdf from "./components/ShowUserPdf";

 // TODO: Can we use lazy loading together with browser locale?
 const messages = {
  de: germanMessages,
  en: englishMessages,
+  zh: chineseMessages,
 };
 const i18nProvider = polyglotI18nProvider(
  locale => (messages[locale] ? messages[locale] : messages.en),
@@ -29,12 +34,14 @@ const i18nProvider = polyglotI18nProvider(

 const App = () => (
  <Admin
+    disableTelemetry
    loginPage={LoginPage}
    authProvider={authProvider}
    dataProvider={dataProvider}
    i18nProvider={i18nProvider}
    customRoutes={[
-      <Route key="userImport" path="/import_users" component={ImportFeature} />,
+      <Route key="csvImport" path="/importcsv" component={ImportFeature} />,
+      <Route key="showpdf" path="/showpdf" component={ShowUserPdf} />,
    ]}
  >
    <Resource
@@ -44,7 +51,14 @@ const App = () => (
      edit={UserEdit}
      icon={UserIcon}
    />
-    <Resource name="rooms" list={RoomList} show={RoomShow} icon={RoomIcon} />
+    <Resource
+      name="rooms"
+      list={RoomList}
+      create={RoomCreate}
+      show={RoomShow}
+      edit={RoomEdit}
+      icon={RoomIcon}
+    />
    <Resource
      name="user_media_statistics"
      list={UserMediaStatsList}
@@ -56,6 +70,11 @@ const App = () => (
      show={ReportShow}
      icon={ReportIcon}
    />
+    <Resource
+      name="room_directory"
+      list={RoomDirectoryList}
+      icon={FolderSharedIcon}
+    />
    <Resource name="connections" />
    <Resource name="devices" />
    <Resource name="room_members" />
@@ -63,6 +82,8 @@ const App = () => (
    <Resource name="joined_rooms" />
    <Resource name="pushers" />
    <Resource name="servernotices" />
+    <Resource name="forward_extremities" />
+    <Resource name="room_state" />
  </Admin>
 );

@@ -1,14 +1,9 @@
 import React from "react";
-import { TestContext } from "react-admin";
-import { shallow } from "enzyme";
+import { render } from "@testing-library/react";
 import App from "./App";

 describe("App", () => {
  it("renders", () => {
-    shallow(
-      <TestContext>
-        <App />
-      </TestContext>
-    );
+    render(<App />);
  });
 });
@@ -20,6 +20,7 @@ import {
 import { useTranslate } from "ra-core";
 import Container from "@material-ui/core/Container/Container";
 import { generateRandomUser } from "./users";
+import ShowUserPdf from "./ShowUserPdf";

 const LOGGING = true;

@@ -59,6 +60,8 @@ const FilePicker = props => {

  const [progress, setProgress] = useState(null);

+  const [pdfRecords, setPdfRecords] = useState(null);
+
  const [importResults, setImportResults] = useState(null);
  const [skippedRecords, setSkippedRecords] = useState(null);

@@ -66,17 +69,23 @@ const FilePicker = props => {
  const [passwordMode, setPasswordMode] = useState(true);
  const [useridMode, setUseridMode] = useState("ignore");

+  const [showingPdf, setShowingPdf] = useState(false);
+
  const translate = useTranslate();
  const notify = useNotify();

  const dataProvider = useDataProvider();

  const onFileChange = async e => {
-    if (progress !== null) return;
-
+    if (progress !== null) {
+      return;
+    }
+    if (LOGGING) console.log("onFileChange was called");
    setValues(null);
    setError(null);
    setStats(null);
+    setPdfRecords(null);
+
    setImportResults(null);
    const file = e.target.files ? e.target.files[0] : null;
    /* Let's refuse some unreasonably big files instead of freezing
@@ -126,6 +135,11 @@ const FilePicker = props => {
    });

    if (eF.length !== 0) {
+      if (LOGGING) {
+        console.log(meta.fields);
+        console.log(eF);
+        console.log(oF);
+      }
      setError(
        translate("import_users.error.required_field", { field: eF[0] })
      );
@@ -226,6 +240,9 @@ const FilePicker = props => {
      setProgress,
      setError
    );
+
+    setPdfRecords(results.recordsForPdf);
+
    setImportResults(results);
    // offer CSV download of skipped or errored records
    // (so that the user doesn't have to filter out successful
@@ -251,6 +268,8 @@ const FilePicker = props => {
    let skippedRecords = [];
    let erroredRecords = [];
    let succeededRecords = [];
+    let recordsForPdf = [];
+
    let changeStats = {
      toAdmin: 0,
      toGuest: 0,
@@ -365,6 +384,14 @@ const FilePicker = props => {
                await dataProvider.create("users", { data: recordData });
              }
              succeededRecords.push(recordData);
+
+              if (recordData.password !== undefined) {
+                recordsForPdf.push({
+                  id: recordData.id,
+                  password: recordData.password,
+                  displayname: recordData.displayname,
+                });
+              }
            }
          );
        };
@@ -389,6 +416,7 @@ const FilePicker = props => {
      erroredRecords,
      succeededRecords,
      totalRecordCount: entriesCount,
+      recordsForPdf,
      changeStats,
      wasDryRun: dryRun,
    };
@@ -618,6 +646,10 @@ const FilePicker = props => {
              <br />,
            ]
          : ""}
+        {translate(
+          "import_users.cards.results.for_print",
+          importResults.recordsForPdf.length
+        )}
        <br />
        {importResults.wasDryRun && [
          translate("import_users.cards.results.simulated_only"),
@@ -655,20 +687,43 @@ const FilePicker = props => {
      </CardActions>
    );

-  let allCards = [];
-  if (uploadCard) allCards.push(uploadCard);
-  if (errorCards) allCards.push(errorCards);
-  if (conflictCards) allCards.push(conflictCards);
-  if (statsCards) allCards.push(...statsCards);
-  if (startImportCard) allCards.push(startImportCard);
-  if (resultsCard) allCards.push(resultsCard);
+  let pdfDisplay =
+    pdfRecords && showingPdf && pdfRecords.length ? (
+      <ShowUserPdf records={pdfRecords} />
+    ) : null;

-  let cardContainer = <Card>{allCards}</Card>;
+  let pdfActions = pdfRecords ? (
+    <CardActions>
+      <Button
+        size="large"
+        onClick={e => {
+          setShowingPdf(true);
+        }}
+      >
+        {translate("import_users.goToPdf")}
+      </Button>
+    </CardActions>
+  ) : null;

-  return [
-    <Title defaultTitle={translate("import_users.title")} />,
-    cardContainer,
-  ];
+  if (pdfRecords && showingPdf) {
+    return <Card>{pdfDisplay}</Card>;
+  } else {
+    let allCards = [];
+    if (uploadCard) allCards.push(uploadCard);
+    if (errorCards) allCards.push(errorCards);
+    if (conflictCards) allCards.push(conflictCards);
+    if (statsCards) allCards.push(...statsCards);
+    if (startImportCard) allCards.push(startImportCard);
+    if (resultsCard) allCards.push(resultsCard);
+    if (pdfActions) allCards.push(pdfActions);
+
+    let cardContainer = <Card>{allCards}</Card>;
+
+    return [
+      <Title defaultTitle={translate("import_users.title")} />,
+      cardContainer,
+    ];
+  }
 };

 export const ImportFeature = FilePicker;
@@ -82,6 +82,7 @@ const LoginPage = ({ theme }) => {
  const setLocale = useSetLocale();
  const translate = useTranslate();
  const base_url = localStorage.getItem("base_url");
+  const cfg_base_url = process.env.REACT_APP_SERVER;

  const renderInput = ({
    meta: { touched, error } = {},
@@ -111,7 +112,9 @@ const LoginPage = ({ theme }) => {
      if (!values.base_url.match(/^(http|https):\/\//)) {
        errors.base_url = translate("synapseadmin.auth.protocol_error");
      } else if (
-        !values.base_url.match(/^(http|https):\/\/[a-zA-Z0-9\-.]+(:\d{1,5})?$/)
+        !values.base_url.match(
+          /^(http|https):\/\/[a-zA-Z0-9\-.]+(:\d{1,5})?[^?&\s]*$/
+        )
      ) {
        errors.base_url = translate("synapseadmin.auth.url_error");
      }
@@ -147,7 +150,7 @@ const LoginPage = ({ theme }) => {
    const [serverVersion, setServerVersion] = useState("");

    const handleUsernameChange = _ => {
-      if (formData.base_url) return;
+      if (formData.base_url || cfg_base_url) return;
      // check if username is a full qualified userId then set base_url accordially
      const home_server = extractHomeServer(formData.username);
      const wellKnownUrl = `https://${home_server}/.well-known/matrix/client`;
@@ -199,6 +202,7 @@ const LoginPage = ({ theme }) => {
            label={translate("ra.auth.username")}
            disabled={loading}
            onBlur={handleUsernameChange}
+            resettable
            fullWidth
          />
        </div>
@@ -209,6 +213,7 @@ const LoginPage = ({ theme }) => {
            label={translate("ra.auth.password")}
            type="password"
            disabled={loading}
+            resettable
            fullWidth
          />
        </div>
@@ -217,7 +222,8 @@ const LoginPage = ({ theme }) => {
            name="base_url"
            component={renderInput}
            label={translate("synapseadmin.auth.base_url")}
-            disabled={loading}
+            disabled={cfg_base_url || loading}
+            resettable
            fullWidth
          />
        </div>
@@ -228,7 +234,7 @@ const LoginPage = ({ theme }) => {

  return (
    <Form
-      initialValues={{ base_url: base_url }}
+      initialValues={{ base_url: cfg_base_url || base_url }}
      onSubmit={handleSubmit}
      validate={validate}
      render={({ handleSubmit }) => (
@@ -255,6 +261,7 @@ const LoginPage = ({ theme }) => {
                  >
                    <MenuItem value="de">Deutsch</MenuItem>
                    <MenuItem value="en">English</MenuItem>
+                    <MenuItem value="zh">简体中文</MenuItem>
                  </Select>
                </div>
                <FormDataConsumer>
@@ -1,11 +1,11 @@
 import React from "react";
-import { TestContext } from "react-admin";
-import { shallow } from "enzyme";
+import { render } from "@testing-library/react";
+import { TestContext } from "ra-test";
 import LoginPage from "./LoginPage";

 describe("LoginForm", () => {
  it("renders", () => {
-    shallow(
+    render(
      <TestContext>
        <LoginPage />
      </TestContext>
@@ -0,0 +1,256 @@
+import React, { Fragment } from "react";
+import Avatar from "@material-ui/core/Avatar";
+import { Chip } from "@material-ui/core";
+import { connect } from "react-redux";
+import FolderSharedIcon from "@material-ui/icons/FolderShared";
+import { makeStyles } from "@material-ui/core/styles";
+import {
+  BooleanField,
+  BulkDeleteButton,
+  Button,
+  Datagrid,
+  DeleteButton,
+  Filter,
+  List,
+  NumberField,
+  Pagination,
+  TextField,
+  useCreate,
+  useMutation,
+  useNotify,
+  useTranslate,
+  useRefresh,
+  useUnselectAll,
+} from "react-admin";
+
+const useStyles = makeStyles({
+  small: {
+    height: "40px",
+    width: "40px",
+  },
+});
+
+const RoomDirectoryPagination = props => (
+  <Pagination {...props} rowsPerPageOptions={[100, 500, 1000, 2000]} />
+);
+
+export const RoomDirectoryDeleteButton = props => {
+  const translate = useTranslate();
+
+  return (
+    <DeleteButton
+      {...props}
+      label="resources.room_directory.action.erase"
+      redirect={false}
+      mutationMode="pessimistic"
+      confirmTitle={translate("resources.room_directory.action.title", {
+        smart_count: 1,
+      })}
+      confirmContent={translate("resources.room_directory.action.content", {
+        smart_count: 1,
+      })}
+      resource="room_directory"
+      icon={<FolderSharedIcon />}
+    />
+  );
+};
+
+export const RoomDirectoryBulkDeleteButton = props => (
+  <BulkDeleteButton
+    {...props}
+    label="resources.room_directory.action.erase"
+    undoable={false}
+    confirmTitle="resources.room_directory.action.title"
+    confirmContent="resources.room_directory.action.content"
+    resource="room_directory"
+    icon={<FolderSharedIcon />}
+  />
+);
+
+export const RoomDirectoryBulkSaveButton = ({ selectedIds }) => {
+  const notify = useNotify();
+  const refresh = useRefresh();
+  const unselectAll = useUnselectAll();
+  const [createMany, { loading }] = useMutation();
+
+  const handleSend = values => {
+    createMany(
+      {
+        type: "createMany",
+        resource: "room_directory",
+        payload: { ids: selectedIds, data: {} },
+      },
+      {
+        onSuccess: ({ data }) => {
+          notify("resources.room_directory.action.send_success");
+          unselectAll("rooms");
+          refresh();
+        },
+        onFailure: error =>
+          notify("resources.room_directory.action.send_failure", "error"),
+      }
+    );
+  };
+
+  return (
+    <Button
+      label="resources.room_directory.action.create"
+      onClick={handleSend}
+      disabled={loading}
+    >
+      <FolderSharedIcon />
+    </Button>
+  );
+};
+
+export const RoomDirectorySaveButton = ({ record }) => {
+  const notify = useNotify();
+  const refresh = useRefresh();
+  const [create, { loading }] = useCreate("room_directory");
+
+  const handleSend = values => {
+    create(
+      {
+        payload: { data: { id: record.id } },
+      },
+      {
+        onSuccess: ({ data }) => {
+          notify("resources.room_directory.action.send_success");
+          refresh();
+        },
+        onFailure: error =>
+          notify("resources.room_directory.action.send_failure", "error"),
+      }
+    );
+  };
+
+  return (
+    <Button
+      label="resources.room_directory.action.create"
+      onClick={handleSend}
+      disabled={loading}
+    >
+      <FolderSharedIcon />
+    </Button>
+  );
+};
+
+const RoomDirectoryBulkActionButtons = props => (
+  <Fragment>
+    <RoomDirectoryBulkDeleteButton {...props} />
+  </Fragment>
+);
+
+const AvatarField = ({ source, className, record = {} }) => (
+  <Avatar src={record[source]} className={className} />
+);
+
+const RoomDirectoryFilter = ({ ...props }) => {
+  const translate = useTranslate();
+  return (
+    <Filter {...props}>
+      <Chip
+        label={translate("resources.rooms.fields.room_id")}
+        source="room_id"
+        defaultValue={false}
+        style={{ marginBottom: 8 }}
+      />
+      <Chip
+        label={translate("resources.rooms.fields.topic")}
+        source="topic"
+        defaultValue={false}
+        style={{ marginBottom: 8 }}
+      />
+      <Chip
+        label={translate("resources.rooms.fields.canonical_alias")}
+        source="canonical_alias"
+        defaultValue={false}
+        style={{ marginBottom: 8 }}
+      />
+    </Filter>
+  );
+};
+
+export const FilterableRoomDirectoryList = ({
+  roomDirectoryFilters,
+  dispatch,
+  ...props
+}) => {
+  const classes = useStyles();
+  const translate = useTranslate();
+  const filter = roomDirectoryFilters;
+  const roomIdFilter = filter && filter.room_id ? true : false;
+  const topicFilter = filter && filter.topic ? true : false;
+  const canonicalAliasFilter = filter && filter.canonical_alias ? true : false;
+
+  return (
+    <List
+      {...props}
+      pagination={<RoomDirectoryPagination />}
+      bulkActionButtons={<RoomDirectoryBulkActionButtons />}
+      filters={<RoomDirectoryFilter />}
+      perPage={100}
+    >
+      <Datagrid>
+        <AvatarField
+          source="avatar_src"
+          sortable={false}
+          className={classes.small}
+          label={translate("resources.rooms.fields.avatar")}
+        />
+        <TextField
+          source="name"
+          sortable={false}
+          label={translate("resources.rooms.fields.name")}
+        />
+        {roomIdFilter && (
+          <TextField
+            source="room_id"
+            sortable={false}
+            label={translate("resources.rooms.fields.room_id")}
+          />
+        )}
+        {canonicalAliasFilter && (
+          <TextField
+            source="canonical_alias"
+            sortable={false}
+            label={translate("resources.rooms.fields.canonical_alias")}
+          />
+        )}
+        {topicFilter && (
+          <TextField
+            source="topic"
+            sortable={false}
+            label={translate("resources.rooms.fields.topic")}
+          />
+        )}
+        <NumberField
+          source="num_joined_members"
+          sortable={false}
+          label={translate("resources.rooms.fields.joined_members")}
+        />
+        <BooleanField
+          source="world_readable"
+          sortable={false}
+          label={translate("resources.room_directory.fields.world_readable")}
+        />
+        <BooleanField
+          source="guest_can_join"
+          sortable={false}
+          label={translate("resources.room_directory.fields.guest_can_join")}
+        />
+      </Datagrid>
+    </List>
+  );
+};
+
+function mapStateToProps(state) {
+  return {
+    roomDirectoryFilters:
+      state.admin.resources.room_directory.list.params.displayedFilters,
+  };
+}
+
+export const RoomDirectoryList = connect(mapStateToProps)(
+  FilterableRoomDirectoryList
+);
@@ -0,0 +1,35 @@
+import React, { useCallback } from "react";
+import { SaveButton, useCreate, useRedirect, useNotify } from "react-admin";
+
+const SaveQrButton = props => {
+  const [create] = useCreate("users");
+  const redirectTo = useRedirect();
+  const notify = useNotify();
+  const { basePath } = props;
+
+  const handleSave = useCallback(
+    (values, redirect) => {
+      create(
+        {
+          payload: { data: { ...values } },
+        },
+        {
+          onSuccess: ({ data: newRecord }) => {
+            notify("ra.notification.created", "info", {
+              smart_count: 1,
+            });
+            redirectTo(redirect, basePath, newRecord.id, {
+              password: values.password,
+              ...newRecord,
+            });
+          },
+        }
+      );
+    },
+    [create, notify, redirectTo, basePath]
+  );
+
+  return <SaveButton {...props} onSave={handleSave} />;
+};
+
+export default SaveQrButton;
@@ -0,0 +1,263 @@
+import React, { useRef } from "react";
+import { Title, Button } from "react-admin";
+import { makeStyles } from "@material-ui/core/styles";
+import { PDFExport } from "@progress/kendo-react-pdf";
+import QRCode from "qrcode.react";
+import { string, any } from "prop-types";
+
+function xor(a, b) {
+  var res = "";
+  for (var i = 0; i < a.length; i++) {
+    res += String.fromCharCode(a.charCodeAt(i) ^ b.charCodeAt(i % b.length));
+  }
+  return res;
+}
+
+function calculateQrString(serverUrl, username, password) {
+  const magicString = "wo9k5tep252qxsa5yde7366kugy6c01w7oeeya9hrmpf0t7ii7";
+  const origUrlString = "user=" + username + "&password=" + password;
+
+  var urlString = xor(origUrlString, magicString); // xor with magic string
+  if (origUrlString !== xor(urlString, magicString)) {
+    console.error(
+      "xoring this url string with magicString twice gave different results:",
+      origUrlString,
+      urlString,
+      xor(urlString, magicString)
+    );
+  }
+  urlString = btoa(urlString); // to base64
+
+  return serverUrl + "/#" + urlString;
+}
+
+UserPdfPage.propTypes = {
+  classes: any,
+  displayname: string,
+  qrCode: any,
+  serverUrl: string,
+  username: string,
+  password: string,
+};
+
+function UserPdfPage({
+  classes,
+  displayname,
+  qrCode,
+  serverUrl,
+  username,
+  password,
+}) {
+  return (
+    <div className={classes.page}>
+      <div className={classes.header}>
+        <div className={classes.name}>{displayname}</div>
+        <img className={classes.logo} alt="Logo" src="images/logo.png" />
+      </div>
+      <div className={classes.body}>
+        <table>
+          <tbody>
+            <tr>
+              <td width="200px">
+                <div className={classes.code_note}>
+                  Ihr persönlicher Anmeldecode:
+                </div>
+              </td>
+              <td className={classes.table_cell}>
+                <div className={classes.credentials_note}>
+                  Ihre persönlichen Zugangsdaten:
+                </div>
+              </td>
+            </tr>
+            <tr>
+              <td>
+                <div className={classes.qr}>{qrCode}</div>
+              </td>
+              <td className={classes.table_cell}>
+                <div className={classes.credentials_text}>
+                  <br />
+                  <table>
+                    <tbody>
+                      <tr>
+                        <td>Heimserver:</td>
+                        <td>
+                          <span className={classes.credentials}>
+                            {serverUrl}
+                          </span>
+                        </td>
+                      </tr>
+                      <tr>
+                        <td>Benutzername:</td>
+                        <td>
+                          <span className={classes.credentials}>
+                            {username}
+                          </span>
+                        </td>
+                      </tr>
+                      <tr>
+                        <td>Passwort:</td>
+                        <td>
+                          <span className={classes.credentials}>
+                            {password}
+                          </span>
+                        </td>
+                      </tr>
+                    </tbody>
+                  </table>
+                </div>
+              </td>
+            </tr>
+          </tbody>
+        </table>
+        <div className={classes.note}>
+          Hier können Sie Ihre selbst gewählte Schlüsselsicherungs-Passphrase
+          notieren:
+          <br />
+          <br />
+          <br />
+          <hr />
+        </div>
+      </div>
+    </div>
+  );
+}
+
+const useStyles = makeStyles(theme => ({
+  page: {
+    height: 800,
+    width: 566,
+    padding: "none",
+    backgroundColor: "white",
+    boxShadow: "5px 5px 5px black",
+    margin: "auto",
+    overflowX: "hidden",
+    overflowY: "hidden",
+    fontFamily: "DejaVu Sans, Sans-Serif",
+    fontSize: 15,
+  },
+  header: {
+    height: 144,
+    width: 534,
+    marginLeft: 32,
+    marginTop: 15,
+  },
+  name: {
+    width: 240,
+    fontSize: 35,
+    float: "left",
+    marginTop: 100,
+  },
+  logo: {
+    width: 90,
+    marginTop: 50,
+    marginRight: 70,
+    float: "right",
+  },
+  body: {
+    clear: "both",
+  },
+  table_cell: {
+    verticalAlign: "top",
+  },
+  code_note: {
+    marginLeft: 32,
+    marginTop: 86,
+  },
+  qr: {
+    marginTop: 15,
+    marginLeft: 32,
+  },
+  credentials_note: {
+    marginTop: 86,
+    marginLeft: 10,
+  },
+  credentials_text: {
+    marginLeft: 10,
+    fontSize: 12,
+  },
+  credentials: {
+    fontFamily: "DejaVu Sans Mono, monospace",
+  },
+  note: {
+    fontSize: 18,
+    marginTop: 100,
+    marginLeft: 32,
+    marginRight: 32,
+  },
+}));
+
+const ShowUserPdf = props => {
+  const classes = useStyles();
+  const userPdf = useRef(null);
+
+  const exportPDF = () => {
+    userPdf.current.save();
+  };
+
+  let userRecords;
+
+  if (props.records) {
+    userRecords = props.records;
+  }
+
+  if (
+    props.location &&
+    props.location.state &&
+    props.location.state.id &&
+    props.location.state.password
+  ) {
+    userRecords = [
+      {
+        id: props.location.state.id,
+        password: props.location.state.password,
+        displayname: props.location.state.displayname,
+      },
+    ];
+  }
+
+  return (
+    <div>
+      <Title title="PDF" />
+      <Button label="synapseadmin.action.download_pdf" onClick={exportPDF} />
+
+      <PDFExport
+        paperSize={"A4"}
+        fileName="Users.pdf"
+        title=""
+        subject=""
+        keywords=""
+        ref={userPdf}
+        //ref={r => (resume = r)}
+      >
+        {userRecords.map(record => {
+          if (record.id && record.password) {
+            const username = record.id.substring(1, record.id.indexOf(":"));
+            const serverUrl =
+              "https://" + record.id.substring(record.id.indexOf(":") + 1);
+            const qrString = calculateQrString(
+              serverUrl,
+              username,
+              record.password
+            );
+            const qrCode = <QRCode value={qrString} size={128} />;
+            return (
+              <UserPdfPage
+                classes={classes}
+                displayname={record.displayname}
+                qrCode={qrCode}
+                serverUrl={serverUrl}
+                username={username}
+                password={record.password}
+              />
+            );
+          } else {
+            /* Skip empty PDF pages */
+            return null;
+          }
+        })}
+      </PDFExport>
+    </div>
+  );
+};
+
+export default ShowUserPdf;
@@ -0,0 +1,145 @@
+import React, { Fragment, useState } from "react";
+import classnames from "classnames";
+import { fade } from "@material-ui/core/styles/colorManipulator";
+import { makeStyles } from "@material-ui/core/styles";
+import {
+  BooleanInput,
+  Button,
+  DateTimeInput,
+  NumberInput,
+  SaveButton,
+  SimpleForm,
+  Toolbar,
+  useDelete,
+  useNotify,
+  useTranslate,
+} from "react-admin";
+import IconCancel from "@material-ui/icons/Cancel";
+import Dialog from "@material-ui/core/Dialog";
+import DialogContent from "@material-ui/core/DialogContent";
+import DialogContentText from "@material-ui/core/DialogContentText";
+import DialogTitle from "@material-ui/core/DialogTitle";
+import DeleteSweepIcon from "@material-ui/icons/DeleteSweep";
+
+const useStyles = makeStyles(
+  theme => ({
+    deleteButton: {
+      color: theme.palette.error.main,
+      "&:hover": {
+        backgroundColor: fade(theme.palette.error.main, 0.12),
+        // Reset on mouse devices
+        "@media (hover: none)": {
+          backgroundColor: "transparent",
+        },
+      },
+    },
+  }),
+  { name: "RaDeleteDeviceButton" }
+);
+
+const DeleteMediaDialog = ({ open, loading, onClose, onSend }) => {
+  const translate = useTranslate();
+
+  const dateParser = v => {
+    const d = new Date(v);
+    if (isNaN(d)) return 0;
+    return d.getTime();
+  };
+
+  const DeleteMediaToolbar = props => {
+    return (
+      <Toolbar {...props}>
+        <SaveButton
+          label="resources.delete_media.action.send"
+          icon={<DeleteSweepIcon />}
+        />
+        <Button label="ra.action.cancel" onClick={onClose}>
+          <IconCancel />
+        </Button>
+      </Toolbar>
+    );
+  };
+
+  return (
+    <Dialog open={open} onClose={onClose} loading={loading}>
+      <DialogTitle>
+        {translate("resources.delete_media.action.send")}
+      </DialogTitle>
+      <DialogContent>
+        <DialogContentText>
+          {translate("resources.delete_media.helper.send")}
+        </DialogContentText>
+        <SimpleForm
+          toolbar={<DeleteMediaToolbar />}
+          submitOnEnter={false}
+          redirect={false}
+          save={onSend}
+        >
+          <DateTimeInput
+            fullWidth
+            source="before_ts"
+            label="resources.delete_media.fields.before_ts"
+            defaultValue={0}
+            parse={dateParser}
+          />
+          <NumberInput
+            fullWidth
+            source="size_gt"
+            label="resources.delete_media.fields.size_gt"
+            defaultValue={0}
+            min={0}
+            step={1024}
+          />
+          <BooleanInput
+            fullWidth
+            source="keep_profiles"
+            label="resources.delete_media.fields.keep_profiles"
+            defaultValue={true}
+          />
+        </SimpleForm>
+      </DialogContent>
+    </Dialog>
+  );
+};
+
+export const DeleteMediaButton = props => {
+  const classes = useStyles(props);
+  const [open, setOpen] = useState(false);
+  const notify = useNotify();
+  const [deleteOne, { loading }] = useDelete("delete_media");
+
+  const handleDialogOpen = () => setOpen(true);
+  const handleDialogClose = () => setOpen(false);
+
+  const handleSend = values => {
+    deleteOne(
+      { payload: { ...values } },
+      {
+        onSuccess: () => {
+          notify("resources.delete_media.action.send_success");
+          handleDialogClose();
+        },
+        onFailure: () =>
+          notify("resources.delete_media.action.send_failure", "error"),
+      }
+    );
+  };
+
+  return (
+    <Fragment>
+      <Button
+        label="resources.delete_media.action.send"
+        onClick={handleDialogOpen}
+        disabled={loading}
+        className={classnames("ra-delete-button", classes.deleteButton)}
+      >
+        <DeleteSweepIcon />
+      </Button>
+      <DeleteMediaDialog
+        open={open}
+        onClose={handleDialogClose}
+        onSend={handleSend}
+      />
+    </Fragment>
+  );
+};
@@ -1,32 +1,78 @@
 import React, { Fragment } from "react";
 import { connect } from "react-redux";
+import { Route, Link } from "react-router-dom";
 import {
+  AutocompleteArrayInput,
+  AutocompleteInput,
+  BooleanInput,
  BooleanField,
-  BulkDeleteWithConfirmButton,
+  BulkDeleteButton,
+  Button,
+  Create,
+  Edit,
  Datagrid,
+  DateField,
  DeleteButton,
  Filter,
+  FormTab,
  List,
+  NumberField,
  Pagination,
+  ReferenceArrayInput,
  ReferenceField,
+  ReferenceInput,
  ReferenceManyField,
  SearchInput,
  SelectField,
  Show,
+  SimpleForm,
  Tab,
+  TabbedForm,
  TabbedShowLayout,
  TextField,
+  TextInput,
+  Toolbar,
  TopToolbar,
+  useDataProvider,
+  useRecordContext,
+  useRefresh,
  useTranslate,
 } from "react-admin";
 import get from "lodash/get";
-import { Tooltip, Typography, Chip } from "@material-ui/core";
+import PropTypes from "prop-types";
+import { makeStyles } from "@material-ui/core/styles";
+import {
+  Tooltip,
+  Typography,
+  Chip,
+  Drawer,
+  styled,
+  withStyles,
+  Select,
+  MenuItem,
+} from "@material-ui/core";
+import FastForwardIcon from "@material-ui/icons/FastForward";
 import HttpsIcon from "@material-ui/icons/Https";
 import NoEncryptionIcon from "@material-ui/icons/NoEncryption";
 import PageviewIcon from "@material-ui/icons/Pageview";
 import UserIcon from "@material-ui/icons/Group";
 import ViewListIcon from "@material-ui/icons/ViewList";
 import VisibilityIcon from "@material-ui/icons/Visibility";
+import ContentSave from "@material-ui/icons/Save";
+import EventIcon from "@material-ui/icons/Event";
+import {
+  RoomDirectoryBulkDeleteButton,
+  RoomDirectoryBulkSaveButton,
+  RoomDirectoryDeleteButton,
+  RoomDirectorySaveButton,
+} from "./RoomDirectory";
+
+const useStyles = makeStyles(theme => ({
+  helper_forward_extremities: {
+    fontFamily: "Roboto, Helvetica, Arial, sans-serif",
+    margin: "0.5em",
+  },
+}));

 const RoomPagination = props => (
  <Pagination {...props} rowsPerPageOptions={[10, 25, 50, 100, 500, 1000]} />
@@ -58,37 +104,396 @@ const EncryptionField = ({ source, record = {}, emptyText }) => {
  );
 };

-const RoomTitle = ({ record }) => {
-  const translate = useTranslate();
-  var name = "";
-  if (record) {
-    name = record.name !== "" ? record.name : record.id;
+const validateDisplayName = fieldval => {
+  return fieldval == null
+    ? "synapseadmin.rooms.room_name_required"
+    : fieldval.length === 0
+    ? "synapseadmin.rooms.room_name_required"
+    : undefined;
+};
+
+function approximateAliasLength(alias, homeserver) {
+  /* TODO maybe handle punycode in homeserver name */
+
+  var te;
+
+  // Support for TextEncoder is quite widespread, but the polyfill is
+  // pretty large; We will only underestimate the size with the regular
+  // length attribute of String, so we never prevent the user from using
+  // an alias that is short enough for the server, but too long for our
+  // heuristic.
+  try {
+    te = new TextEncoder();
+  } catch (err) {
+    if (err instanceof ReferenceError) {
+      te = undefined;
+    }
  }

+  const aliasLength = te === undefined ? alias.length : te.encode(alias).length;
+
+  return "#".length + aliasLength + ":".length + homeserver.length;
+}
+
+const validateAlias = fieldval => {
+  if (fieldval === undefined) {
+    return undefined;
+  }
+  const homeserver = localStorage.getItem("home_server");
+
+  if (approximateAliasLength(fieldval, homeserver) > 255) {
+    return "synapseadmin.rooms.alias_too_long";
+  }
+};
+
+const removeLeadingWhitespace = fieldVal =>
+  fieldVal === undefined ? undefined : fieldVal.trimStart();
+const replaceAllWhitespace = fieldVal =>
+  fieldVal === undefined ? undefined : fieldVal.replace(/\s/, "_");
+const removeLeadingSigil = fieldVal =>
+  fieldVal === undefined
+    ? undefined
+    : fieldVal.startsWith("#")
+    ? fieldVal.substr(1)
+    : fieldVal;
+
+const validateHasAliasIfPublic = formdata => {
+  let errors = {};
+  if (formdata.public) {
+    if (
+      formdata.canonical_alias === undefined ||
+      formdata.canonical_alias.trim().length === 0
+    ) {
+      errors.canonical_alias = "synapseadmin.rooms.alias_required_if_public";
+    }
+  }
+  return errors;
+};
+
+export const RoomCreate = props => (
+  <Create {...props}>
+    <TabbedForm validate={validateHasAliasIfPublic}>
+      <FormTab label="synapseadmin.rooms.details" icon={<ViewListIcon />}>
+        <TextInput
+          source="name"
+          parse={removeLeadingWhitespace}
+          validate={validateDisplayName}
+        />
+        <TextInput
+          source="canonical_alias"
+          parse={fv => replaceAllWhitespace(removeLeadingSigil(fv))}
+          validate={validateAlias}
+          placeholder="#"
+        />
+        <ReferenceInput
+          reference="users"
+          source="owner"
+          filterToQuery={searchText => ({ user_id: searchText })}
+        >
+          <AutocompleteInput
+            optionText="displayname"
+            suggestionText="displayname"
+          />
+        </ReferenceInput>
+        <BooleanInput source="public" label="synapseadmin.rooms.make_public" />
+        <BooleanInput
+          source="encrypt"
+          initialValue={true}
+          label="synapseadmin.rooms.encrypt"
+        />
+      </FormTab>
+      <FormTab
+        label="resources.rooms.fields.invite_members"
+        icon={<UserIcon />}
+      >
+        <ReferenceArrayInput
+          reference="users"
+          source="invitees"
+          filterToQuery={searchText => ({ user_id: searchText })}
+        >
+          <AutocompleteArrayInput
+            optionText="displayname"
+            suggestionText="displayname"
+          />
+        </ReferenceArrayInput>
+      </FormTab>
+    </TabbedForm>
+  </Create>
+);
+
+const RoomTitle = ({ record }) => {
+  const translate = useTranslate();
  return (
    <span>
-      {translate("resources.rooms.name", 1)} {name}
+      {translate("resources.rooms.name", 1)} {record ? `"${record.name}"` : ""}
    </span>
  );
 };

-const RoomShowActions = ({ basePath, data, resource }) => {
+// Explicitely passing "to" prop
+// Toolbar adds all kinds of unsupported props to its children :(
+const StyledLink = styles => {
+  const Styled = styled(Link)(styles);
+  return ({ to, children }) => <Styled to={to}>{children}</Styled>;
+};
+
+const RoomMemberEditToolbar = ({ backLink, translate, onSave, ...props }) => {
+  const SaveLink = StyledLink({
+    textDecoration: "none",
+  });
+  const CancelLink = StyledLink({
+    textDecoration: "none",
+    marginLeft: "1em",
+  });
+  const SaveIcon = styled(ContentSave)({
+    width: "1rem",
+    marginRight: "0.25em",
+  });
+
+  return (
+    <Toolbar {...props}>
+      <SaveLink to={backLink}>
+        <Button onClick={onSave} variant="contained">
+          <React.Fragment>
+            <SaveIcon />
+            {translate("ra.action.save")}
+          </React.Fragment>
+        </Button>
+      </SaveLink>
+      <CancelLink to={backLink}>
+        <Button>
+          <React.Fragment>{translate("ra.action.cancel")}</React.Fragment>
+        </Button>
+      </CancelLink>
+    </Toolbar>
+  );
+};
+
+const RoomMemberIdField = ({ memberId, data = {} }) => {
+  const value = get(data[memberId], "id");
+
+  return (
+    <Typography component="span" variant="body2">
+      {value}
+    </Typography>
+  );
+};
+
+const RoomMemberRoleInput = ({ memberId, data = {}, translate, onChange }) => {
+  const roleValue = get(data[memberId], "role");
+  const [role, setRole] = React.useState(roleValue);
+
+  React.useEffect(() => {
+    onChange(roleValue);
+  }, [onChange, roleValue]);
+
+  return (
+    <React.Fragment>
+      <Select
+        labelId="demo-simple-select-label"
+        id="demo-simple-select"
+        value={role}
+        onChange={event => {
+          setRole(event.target.value);
+          onChange(event.target.value);
+        }}
+      >
+        <MenuItem value={"user"}>
+          {translate("resources.users.roles.user")}
+        </MenuItem>
+        <MenuItem value={"mod"}>
+          {translate("resources.users.roles.mod")}
+        </MenuItem>
+        <MenuItem value={"admin"}>
+          {translate("resources.users.roles.admin")}
+        </MenuItem>
+      </Select>
+    </React.Fragment>
+  );
+};
+
+const RoomMemberEdit = ({ backLink, memberId, ...props }) => {
  const translate = useTranslate();
+  const refresh = useRefresh();
+  const dataProvider = useDataProvider();
+
+  const [role, setRole] = React.useState();
+
+  const { id } = props;
+
+  return (
+    <Edit title=" " {...props}>
+      <SimpleForm
+        toolbar={
+          <RoomMemberEditToolbar
+            backLink={backLink}
+            translate={translate}
+            onSave={() => {
+              dataProvider
+                .update("rooms", {
+                  data: {
+                    id,
+                    member_roles: [{ member_id: memberId, role }],
+                  },
+                })
+                .then(() => {
+                  refresh();
+                });
+            }}
+          />
+        }
+      >
+        <ReferenceManyField
+          reference="room_members"
+          target="room_id"
+          label="resources.users.fields.id"
+        >
+          <RoomMemberIdField memberId={memberId} />
+        </ReferenceManyField>
+        <ReferenceManyField
+          reference="room_members"
+          target="room_id"
+          label="resources.users.fields.role"
+        >
+          <RoomMemberRoleInput
+            memberId={memberId}
+            translate={translate}
+            onChange={setRole}
+          />
+        </ReferenceManyField>
+      </SimpleForm>
+    </Edit>
+  );
+};
+
+const drawerStyles = {
+  paper: {
+    width: 300,
+  },
+};
+const StyledDrawer = withStyles(drawerStyles)(({ classes, ...props }) => (
+  <Drawer {...props} classes={classes} />
+));
+
+export const RoomEdit = props => {
+  const translate = useTranslate();
+
+  return (
+    <React.Fragment>
+      <Edit {...props} title={<RoomTitle />}>
+        <TabbedForm>
+          <FormTab label="synapseadmin.rooms.tabs.members" icon={<UserIcon />}>
+            <ReferenceArrayInput
+              reference="users"
+              source="invitees"
+              filterToQuery={searchText => ({ user_id: searchText })}
+            >
+              <AutocompleteArrayInput
+                optionText="displayname"
+                suggestionText="displayname"
+              />
+            </ReferenceArrayInput>
+
+            <ReferenceManyField
+              reference="room_members"
+              target="room_id"
+              addLabel={false}
+            >
+              <Datagrid
+                style={{ width: "100%" }}
+                rowClick={(id, basePath, record) =>
+                  `/rooms/${encodeURIComponent(
+                    record.parentId
+                  )}/${encodeURIComponent(id)}`
+                }
+              >
+                <TextField
+                  source="id"
+                  sortable={false}
+                  label="resources.users.fields.id"
+                />
+                <ReferenceField
+                  label="resources.users.fields.displayname"
+                  source="id"
+                  reference="users"
+                  sortable={false}
+                  link=""
+                >
+                  <TextField source="displayname" sortable={false} />
+                </ReferenceField>
+                <SelectField
+                  source="role"
+                  label="resources.users.fields.role"
+                  choices={[
+                    {
+                      id: "user",
+                      name: translate("resources.users.roles.user"),
+                    },
+                    { id: "mod", name: translate("resources.users.roles.mod") },
+                    {
+                      id: "admin",
+                      name: translate("resources.users.roles.admin"),
+                    },
+                  ]}
+                />
+              </Datagrid>
+            </ReferenceManyField>
+          </FormTab>
+        </TabbedForm>
+      </Edit>
+      <Route path="/rooms/:roomId/:memberId">
+        {({ match }) => {
+          const isMatch = !!match && !!match.params;
+
+          return (
+            <StyledDrawer open={isMatch} anchor="right">
+              {isMatch ? (
+                <RoomMemberEdit
+                  {...props}
+                  memberId={
+                    isMatch ? decodeURIComponent(match.params.memberId) : null
+                  }
+                  backLink={`/rooms/${match.params.roomId}`}
+                />
+              ) : (
+                <div />
+              )}
+            </StyledDrawer>
+          );
+        }}
+      </Route>
+    </React.Fragment>
+  );
+};
+
+const RoomShowActions = ({ basePath, data, resource }) => {
+  var roomDirectoryStatus = "";
+  if (data) {
+    roomDirectoryStatus = data.public;
+  }
+
  return (
    <TopToolbar>
+      {roomDirectoryStatus === false && (
+        <RoomDirectorySaveButton record={data} />
+      )}
+      {roomDirectoryStatus === true && (
+        <RoomDirectoryDeleteButton record={data} />
+      )}
      <DeleteButton
        basePath={basePath}
        record={data}
        resource={resource}
-        undoable={false}
-        confirmTitle={translate("synapseadmin.rooms.delete.title")}
-        confirmContent={translate("synapseadmin.rooms.delete.message")}
+        mutationMode="pessimistic"
+        confirmTitle="resources.rooms.action.erase.title"
+        confirmContent="resources.rooms.action.erase.content"
      />
    </TopToolbar>
  );
 };

 export const RoomShow = props => {
+  const classes = useStyles({ props });
  const translate = useTranslate();
  return (
    <Show {...props} actions={<RoomShowActions />} title={<RoomTitle />}>
@@ -97,7 +502,9 @@ export const RoomShow = props => {
          <TextField source="room_id" />
          <TextField source="name" />
          <TextField source="canonical_alias" />
-          <TextField source="creator" />
+          <ReferenceField source="creator" reference="users">
+            <TextField source="id" />
+          </ReferenceField>
        </Tab>

        <Tab
@@ -107,6 +514,7 @@ export const RoomShow = props => {
        >
          <TextField source="joined_members" />
          <TextField source="joined_local_members" />
+          <TextField source="joined_local_devices" />
          <TextField source="state_events" />
          <TextField source="version" />
          <TextField
@@ -197,6 +605,77 @@ export const RoomShow = props => {
            ]}
          />
        </Tab>
+
+        <Tab
+          label={translate("resources.room_state.name", { smart_count: 2 })}
+          icon={<EventIcon />}
+          path="state"
+        >
+          <ReferenceManyField
+            reference="room_state"
+            target="room_id"
+            addLabel={false}
+          >
+            <Datagrid style={{ width: "100%" }}>
+              <TextField source="type" sortable={false} />
+              <DateField
+                source="origin_server_ts"
+                showTime
+                options={{
+                  year: "numeric",
+                  month: "2-digit",
+                  day: "2-digit",
+                  hour: "2-digit",
+                  minute: "2-digit",
+                  second: "2-digit",
+                }}
+                sortable={false}
+              />
+              <TextField source="content" sortable={false} />
+              <ReferenceField
+                source="sender"
+                reference="users"
+                sortable={false}
+              >
+                <TextField source="id" />
+              </ReferenceField>
+            </Datagrid>
+          </ReferenceManyField>
+        </Tab>
+
+        <Tab
+          label="resources.forward_extremities.name"
+          icon={<FastForwardIcon />}
+          path="forward_extremities"
+        >
+          <div className={classes.helper_forward_extremities}>
+            {translate("resources.rooms.helper.forward_extremities")}
+          </div>
+          <ReferenceManyField
+            reference="forward_extremities"
+            target="room_id"
+            addLabel={false}
+          >
+            <Datagrid style={{ width: "100%" }}>
+              <TextField source="id" sortable={false} />
+              <DateField
+                source="received_ts"
+                showTime
+                options={{
+                  year: "numeric",
+                  month: "2-digit",
+                  day: "2-digit",
+                  hour: "2-digit",
+                  minute: "2-digit",
+                  second: "2-digit",
+                }}
+                sortable={false}
+              />
+              <NumberField source="depth" sortable={false} />
+              <TextField source="state_group" sortable={false} />
+            </Datagrid>
+          </ReferenceManyField>
+        </Tab>
      </TabbedShowLayout>
    </Show>
  );
@@ -204,7 +683,14 @@ export const RoomShow = props => {

 const RoomBulkActionButtons = props => (
  <Fragment>
-    <BulkDeleteWithConfirmButton {...props} />
+    <RoomDirectoryBulkSaveButton {...props} />
+    <RoomDirectoryBulkDeleteButton {...props} />
+    <BulkDeleteButton
+      {...props}
+      confirmTitle="resources.rooms.action.erase.title"
+      confirmContent="resources.rooms.action.erase.content"
+      undoable={false}
+    />
  </Fragment>
 );

@@ -241,14 +727,27 @@ const RoomFilter = ({ ...props }) => {
  );
 };

-const FilterableRoomList = ({ ...props }) => {
-  const filter = props.roomFilters;
+const RoomNameField = props => {
+  const { source } = props;
+  const record = useRecordContext(props);
+  return (
+    <span>{record[source] || record["canonical_alias"] || record["id"]}</span>
+  );
+};
+
+RoomNameField.propTypes = {
+  label: PropTypes.string,
+  record: PropTypes.object,
+  source: PropTypes.string.isRequired,
+};
+
+const FilterableRoomList = ({ roomFilters, dispatch, ...props }) => {
+  const filter = roomFilters;
  const localMembersFilter =
    filter && filter.joined_local_members ? true : false;
  const stateEventsFilter = filter && filter.state_events ? true : false;
  const versionFilter = filter && filter.version ? true : false;
  const federateableFilter = filter && filter.federatable ? true : false;
-  const translate = useTranslate();

  return (
    <List
@@ -256,12 +755,7 @@ const FilterableRoomList = ({ ...props }) => {
      pagination={<RoomPagination />}
      sort={{ field: "name", order: "ASC" }}
      filters={<RoomFilter />}
-      bulkActionButtons={
-        <RoomBulkActionButtons
-          confirmTitle={translate("synapseadmin.rooms.delete.title")}
-          confirmContent={translate("synapseadmin.rooms.delete.message")}
-        />
-      }
+      bulkActionButtons={<RoomBulkActionButtons />}
    >
      <Datagrid rowClick="show">
        <EncryptionField
@@ -269,7 +763,7 @@ const FilterableRoomList = ({ ...props }) => {
          sortBy="encryption"
          label={<HttpsIcon />}
        />
-        <TextField source="name" />
+        <RoomNameField source="name" />
        <TextField source="joined_members" />
        {localMembersFilter && <TextField source="joined_local_members" />}
        {stateEventsFilter && <TextField source="state_events" />}
@@ -1,13 +1,51 @@
 import React from "react";
+import { cloneElement } from "react";
 import {
  Datagrid,
+  ExportButton,
  Filter,
  List,
  NumberField,
-  TextField,
-  SearchInput,
  Pagination,
+  sanitizeListRestProps,
+  SearchInput,
+  TextField,
+  TopToolbar,
+  useListContext,
 } from "react-admin";
+import { DeleteMediaButton } from "./media";
+
+const ListActions = props => {
+  const { className, exporter, filters, maxResults, ...rest } = props;
+  const {
+    currentSort,
+    resource,
+    displayedFilters,
+    filterValues,
+    showFilter,
+    total,
+  } = useListContext();
+  return (
+    <TopToolbar className={className} {...sanitizeListRestProps(rest)}>
+      {filters &&
+        cloneElement(filters, {
+          resource,
+          showFilter,
+          displayedFilters,
+          filterValues,
+          context: "button",
+        })}
+      <DeleteMediaButton />
+      <ExportButton
+        disabled={total === 0}
+        resource={resource}
+        sort={currentSort}
+        filterValues={filterValues}
+        maxResults={maxResults}
+      />
+    </TopToolbar>
+  );
+};

 const UserMediaStatsPagination = props => (
  <Pagination {...props} rowsPerPageOptions={[10, 25, 50, 100, 500, 1000]} />
@@ -23,6 +61,7 @@ export const UserMediaStatsList = props => {
  return (
    <List
      {...props}
+      actions={<ListActions />}
      filters={<UserMediaStatsFilter />}
      pagination={<UserMediaStatsPagination />}
      sort={{ field: "media_length", order: "DESC" }}
@@ -12,10 +12,12 @@ import {
  ArrayInput,
  ArrayField,
  Button,
+  CreateButton,
  Datagrid,
  DateField,
  Create,
  Edit,
+  ExportButton,
  List,
  Filter,
  Toolbar,
@@ -28,30 +30,30 @@ import {
  PasswordInput,
  TextField,
  TextInput,
+  SearchInput,
  ReferenceField,
  ReferenceManyField,
-  SearchInput,
+  SelectField,
  SelectInput,
  BulkDeleteButton,
  DeleteButton,
  SaveButton,
  regex,
-  useRedirect,
  useTranslate,
  Pagination,
-  CreateButton,
-  ExportButton,
  TopToolbar,
  sanitizeListRestProps,
  NumberField,
 } from "react-admin";
+import SaveQrButton from "./SaveQrButton";
 import { ServerNoticeButton, ServerNoticeBulkButton } from "./ServerNotices";
 import { DeviceRemoveButton } from "./devices";
 import { makeStyles } from "@material-ui/core/styles";
+import { Link } from "react-router-dom";

-const redirect = (basePath, id, data) => {
+const redirect = () => {
  return {
-    pathname: "/import_users",
+    pathname: "/importcsv",
  };
 };

@@ -85,7 +87,6 @@ const UserListActions = ({
  total,
  ...rest
 }) => {
-  const redirectTo = useRedirect();
  return (
    <TopToolbar className={className} {...sanitizeListRestProps(rest)}>
      {filters &&
@@ -106,12 +107,7 @@ const UserListActions = ({
        maxResults={maxResults}
      />
      {/* Add your custom actions */}
-      <Button
-        onClick={() => {
-          redirectTo(redirect);
-        }}
-        label="CSV Import"
-      >
+      <Button component={Link} to={redirect} label="CSV Import">
        <GetAppIcon style={{ transform: "rotate(180deg)", fontSize: "20" }} />
      </Button>
    </TopToolbar>
@@ -139,19 +135,17 @@ const UserFilter = props => (
  </Filter>
 );

-const UserBulkActionButtons = props => {
-  const translate = useTranslate();
-  return (
-    <Fragment>
-      <ServerNoticeBulkButton {...props} />
-      <BulkDeleteButton
-        {...props}
-        label="resources.users.action.erase"
-        title={translate("resources.users.helper.erase")}
-      />
-    </Fragment>
-  );
-};
+const UserBulkActionButtons = props => (
+  <Fragment>
+    <ServerNoticeBulkButton {...props} />
+    <BulkDeleteButton
+      {...props}
+      label="resources.users.action.erase"
+      confirmTitle="resources.users.helper.erase"
+      undoable={false}
+    />
+  </Fragment>
+);

 const AvatarField = ({ source, className, record = {} }) => (
  <Avatar src={record[source]} className={className} />
@@ -164,6 +158,7 @@ export const UserList = props => {
      {...props}
      filters={<UserFilter />}
      filterDefaultValues={{ guests: true, deactivated: false }}
+      sort={{ field: "name", order: "ASC" }}
      actions={<UserListActions maxResults={10000} />}
      bulkActionButtons={<UserBulkActionButtons />}
      pagination={<UserPagination />}
@@ -171,19 +166,55 @@ export const UserList = props => {
      <Datagrid rowClick="edit">
        <AvatarField
          source="avatar_src"
-          sortable={false}
          className={classes.small}
+          sortBy="avatar_url"
        />
-        <TextField source="id" sortable={false} />
-        <TextField source="displayname" sortable={false} />
-        <BooleanField source="is_guest" sortable={false} />
-        <BooleanField source="admin" sortable={false} />
-        <BooleanField source="deactivated" sortable={false} />
+        <TextField source="id" sortBy="name" />
+        <TextField source="displayname" />
+        <BooleanField source="is_guest" />
+        <BooleanField source="admin" />
+        <SelectField
+          source="user_type"
+          choices={[
+            { id: null, name: "resources.users.type.default" },
+            { id: "free", name: "resources.users.type.free" },
+            { id: "limited", name: "resources.users.type.limited" },
+          ]}
+        />
+        <BooleanField source="deactivated" />
      </Datagrid>
    </List>
  );
 };

+// redirect to the related Author show page
+const redirectToPdf = (basePath, id, data) => {
+  return {
+    pathname: "/showpdf",
+    state: {
+      id: data.id,
+      displayname: data.displayname,
+      password: data.password,
+    },
+  };
+};
+
+const UserCreateToolbar = props => (
+  <Toolbar {...props}>
+    <SaveQrButton
+      label="synapseadmin.action.save_and_show"
+      redirect={redirectToPdf}
+      submitOnEnter={true}
+    />
+    <SaveButton
+      label="synapseadmin.action.save_only"
+      redirect="list"
+      submitOnEnter={false}
+      variant="text"
+    />
+  </Toolbar>
+);
+
 // https://matrix.org/docs/spec/appendices#user-identifiers
 const validateUser = regex(
  /^@[a-z0-9._=\-/]+:.*/,
@@ -235,10 +266,23 @@ const UserEditToolbar = props => {
  const translate = useTranslate();
  return (
    <Toolbar {...props}>
-      <SaveButton submitOnEnter={true} />
+      <SaveQrButton
+        label="synapseadmin.action.save_and_show"
+        redirect={redirect}
+        submitOnEnter={true}
+      />
+      <SaveButton
+        label="synapseadmin.action.save_only"
+        redirect="list"
+        submitOnEnter={false}
+        variant="text"
+      />
      <DeleteButton
        label="resources.users.action.erase"
-        title={translate("resources.users.helper.erase")}
+        confirmTitle={translate("resources.users.helper.erase", {
+          smart_count: 1,
+        })}
+        mutationMode="pessimistic"
      />
      <ServerNoticeButton />
    </Toolbar>
@@ -246,12 +290,20 @@ const UserEditToolbar = props => {
 };

 export const UserCreate = props => (
-  <Create {...props}>
-    <SimpleForm>
+  <Create record={generateRandomUser()} {...props}>
+    <SimpleForm toolbar={<UserCreateToolbar />}>
      <TextInput source="id" autoComplete="off" validate={validateUser} />
      <TextInput source="displayname" />
      <PasswordInput source="password" autoComplete="new-password" />
      <BooleanInput source="admin" />
+      <SelectInput
+        source="user_type"
+        choices={[
+          { id: null, name: "resources.users.type.default" },
+          { id: "free", name: "resources.users.type.free" },
+          { id: "limited", name: "resources.users.type.limited" },
+        ]}
+      />
      <ArrayInput source="threepids">
        <SimpleFormIterator>
          <SelectInput
@@ -279,6 +331,7 @@ const UserTitle = ({ record }) => {
    </span>
  );
 };
+
 export const UserEdit = props => {
  const classes = useStyles();
  const translate = useTranslate();
@@ -297,6 +350,15 @@ export const UserEdit = props => {
          <TextInput source="id" disabled />
          <TextInput source="displayname" />
          <PasswordInput source="password" autoComplete="new-password" />
+          <SelectInput
+            source="user_type"
+            choices={[
+              { id: null, name: "resources.users.type.default" },
+              { id: "free", name: "resources.users.type.free" },
+              { id: "limited", name: "resources.users.type.limited" },
+            ]}
+            emptyText="resources.users.type.default"
+          />
          <BooleanInput source="admin" />
          <BooleanInput
            source="deactivated"
@@ -419,6 +481,7 @@ export const UserEdit = props => {
            addLabel={false}
            pagination={<UserPagination />}
            perPage={50}
+            sort={{ field: "created_ts", order: "DESC" }}
          >
            <Datagrid style={{ width: "100%" }}>
              <DateField
@@ -432,7 +495,6 @@ export const UserEdit = props => {
                  minute: "2-digit",
                  second: "2-digit",
                }}
-                sortable={false}
              />
              <DateField
                source="last_access_ts"
@@ -445,15 +507,14 @@ export const UserEdit = props => {
                  minute: "2-digit",
                  second: "2-digit",
                }}
-                sortable={false}
              />
-              <TextField source="media_id" sortable={false} />
-              <NumberField source="media_length" sortable={false} />
-              <TextField source="media_type" sortable={false} />
-              <TextField source="upload_name" sortable={false} />
-              <TextField source="quarantined_by" sortable={false} />
-              <BooleanField source="safe_from_quarantine" sortable={false} />
-              <DeleteButton undoable={false} redirect={false} />
+              <TextField source="media_id" />
+              <NumberField source="media_length" />
+              <TextField source="media_type" />
+              <TextField source="upload_name" />
+              <TextField source="quarantined_by" />
+              <BooleanField source="safe_from_quarantine" />
+              <DeleteButton mutationMode="pessimistic" redirect={false} />
            </Datagrid>
          </ReferenceManyField>
        </FormTab>
@@ -1,6 +1,6 @@
 import germanMessages from "ra-language-german";

-export default {
+const de = {
  ...germanMessages,
  synapseadmin: {
    auth: {
@@ -11,23 +11,31 @@ export default {
      protocol_error: "Die URL muss mit 'http://' oder 'https://' beginnen",
      url_error: "Keine gültige Matrix Server URL",
    },
+    action: {
+      save_and_show: "Speichern und QR Code erzeugen",
+      save_only: "Nur speichern",
+      download_pdf: "PDF speichern",
+    },
    users: {
      invalid_user_id:
        "Muss eine vollständige Matrix Benutzer-ID sein, z.B. @benutzer_id:homeserver",
    },
    rooms: {
      details: "Raumdetails",
+      room_name: "Raumname",
+      make_public: "Öffentlicher Raum",
+      encrypt: "Verschlüsselter Raum",
+      room_name_required: "Muss angegeben werden",
+      alias_required_if_public: "Muss für öffentliche Räume angegeben werden.",
+      alias: "Alias",
+      alias_too_long:
+        "Darf zusammen mit der Domain des Homeservers 255 bytes nicht überschreiten",
      tabs: {
        basic: "Allgemein",
        members: "Mitglieder",
        detail: "Details",
        permission: "Berechtigungen",
      },
-      delete: {
-        title: "Raum löschen",
-        message:
-          "Sind Sie sicher dass Sie den Raum löschen möchten? Diese Aktion kann nicht rückgängig gemacht werden. Alle Nachrichten und Medien, die der Raum beinhaltet werden vom Server gelöscht!",
-      },
    },
    reports: { tabs: { basic: "Allgemein", detail: "Details" } },
  },
@@ -96,6 +104,8 @@ export default {
        with_error:
          "%{smart_count} Eintrag mit Fehlern ||| %{smart_count} Einträge mit Fehlern",
        simulated_only: "Import-Vorgang war nur simuliert",
+        for_print:
+          "%{smart_count} Eintrag zum Drucken verfügbar |||| %{smart_count} Einträge zum Drucken verfügbar",
      },
    },
  },
@@ -125,6 +135,18 @@ export default {
        address: "Adresse",
        creation_ts_ms: "Zeitpunkt der Erstellung",
        consent_version: "Zugestimmte Geschäftsbedingungen",
+        user_type: "Kontotyp",
+        // Devices:
+        device_id: "Geräte-ID",
+        display_name: "Gerätename",
+        last_seen_ts: "Zeitstempel",
+        last_seen_ip: "IP-Adresse",
+        role: "Rolle",
+      },
+      type: {
+        default: "Standard",
+        free: "Basic",
+        limited: "Eingeschränkt",
      },
      helper: {
        deactivate:
@@ -134,6 +156,11 @@ export default {
      action: {
        erase: "Lösche Benutzerdaten",
      },
+      roles: {
+        user: "Nutzer",
+        mod: "Moderator",
+        admin: "Administrator",
+      },
    },
    rooms: {
      name: "Raum |||| Räume",
@@ -142,17 +169,26 @@ export default {
        name: "Name",
        canonical_alias: "Alias",
        joined_members: "Mitglieder",
+        invite_members: "Mitglieder einladen",
+        invitees: "Einladungen",
        joined_local_members: "Lokale Mitglieder",
-        state_events: "Ereignisse",
+        joined_local_devices: "Lokale Endgeräte",
+        state_events: "Zustandsereignisse / Komplexität",
        version: "Version",
        is_encrypted: "Verschlüsselt",
        encryption: "Verschlüsselungs-Algorithmus",
        federatable: "Föderierbar",
-        public: "Öffentlich",
+        public: "Sichtbar im Raumverzeichnis",
        creator: "Ersteller",
        join_rules: "Beitrittsregeln",
        guest_access: "Gastzugriff",
        history_visibility: "Historie-Sichtbarkeit",
+        topic: "Thema",
+        avatar: "Avatar",
+      },
+      helper: {
+        forward_extremities:
+          "Forward extremities are the leaf events at the end of a Directed acyclic graph (DAG) in a room, aka events that have no children. The more exist in a room, the more state resolution that Synapse needs to perform (hint: it's an expensive operation). While Synapse has code to prevent too many of these existing at one time in a room, bugs can sometimes make them crop up again. If a room has >10 forward extremities, it's worth checking which room is the culprit and potentially removing them using the SQL queries mentioned in #1760.",
      },
      enums: {
        join_rules: {
@@ -173,6 +209,13 @@ export default {
        },
        unencrypted: "Nicht verschlüsselt",
      },
+      action: {
+        erase: {
+          title: "Raum löschen",
+          content:
+            "Sind Sie sicher dass Sie den Raum löschen möchten? Diese Aktion kann nicht rückgängig gemacht werden. Alle Nachrichten und Medien, die der Raum beinhaltet werden vom Server gelöscht!",
+        },
+      },
    },
    reports: {
      name: "Ereignisbericht |||| Ereignisberichte",
@@ -236,6 +279,22 @@ export default {
        last_access_ts: "Letzter Zugriff",
      },
    },
+    delete_media: {
+      name: "Medien",
+      fields: {
+        before_ts: "Letzter Zugriff vor",
+        size_gt: "Größer als (in Bytes)",
+        keep_profiles: "Behalte Profilbilder",
+      },
+      action: {
+        send: "Medien löschen",
+        send_success: "Anfrage erfolgreich versendet.",
+        send_failure: "Beim Versenden ist ein Fehler aufgetreten.",
+      },
+      helper: {
+        send: "Diese API löscht die lokalen Medien von der Festplatte des eigenen Servers. Dies umfasst alle lokalen Miniaturbilder und Kopien von Medien. Diese API wirkt sich nicht auf Medien aus, die sich in externen Medien-Repositories befinden.",
+      },
+    },
    pushers: {
      name: "Pusher |||| Pushers",
      fields: {
@@ -262,8 +321,7 @@ export default {
        send_failure: "Beim Versenden ist ein Fehler aufgetreten.",
      },
      helper: {
-        send:
-          'Sendet eine Serverbenachrichtigung an die ausgewählten Nutzer. Hierfür muss das Feature "Server Notices" auf dem Server aktiviert sein.',
+        send: 'Sendet eine Serverbenachrichtigung an die ausgewählten Nutzer. Hierfür muss das Feature "Server Notices" auf dem Server aktiviert sein.',
      },
    },
    user_media_statistics: {
@@ -273,9 +331,48 @@ export default {
        media_length: "Größe der Dateien",
      },
    },
+    forward_extremities: {
+      name: "Vorderextremitäten",
+      fields: {
+        id: "Event-ID",
+        received_ts: "Zeitstempel",
+        depth: "Tiefe",
+        state_group: "Zustandsgruppe",
+      },
+    },
+    room_state: {
+      name: "Zustandsereignisse",
+      fields: {
+        type: "Typ",
+        content: "Inhalt",
+        origin_server_ts: "Sendezeit",
+        sender: "Absender",
+      },
+    },
+    room_directory: {
+      name: "Raumverzeichnis",
+      fields: {
+        world_readable: "Gastbenutzer dürfen ohne Beitritt lesen",
+        guest_can_join: "Gastbenutzer dürfen beitreten",
+      },
+      action: {
+        title:
+          "Raum aus Verzeichnis löschen |||| %{smart_count} Räume aus Verzeichnis löschen",
+        content:
+          "Möchten Sie den Raum wirklich aus dem Raumverzeichnis löschen? |||| Möchten Sie die %{smart_count} Räume wirklich aus dem Raumverzeichnis löschen?",
+        erase: "Lösche aus Verzeichnis",
+        create: "Eintragen ins Verzeichnis",
+        send_success: "Raum erfolgreich eingetragen.",
+        send_failure: "Beim Entfernen ist ein Fehler aufgetreten.",
+      },
+    },
  },
  ra: {
    ...germanMessages.ra,
+    action: {
+      ...germanMessages.ra.action,
+      unselect: "Abwählen",
+    },
    auth: {
      ...germanMessages.ra.auth,
      auth_check_error: "Anmeldung fehlgeschlagen",
@@ -297,5 +394,10 @@ export default {
      empty: "Keine Einträge vorhanden",
      invite: "",
    },
+    navigation: {
+      ...germanMessages.ra.navigation,
+      skip_nav: "Zum Inhalt springen",
+    },
  },
 };
+export default de;
@@ -1,31 +1,41 @@
 import englishMessages from "ra-language-english";

-export default {
+const en = {
  ...englishMessages,
  synapseadmin: {
    auth: {
      base_url: "Homeserver URL",
      welcome: "Welcome to Synapse-admin",
+      server_version: "Synapse version",
      username_error: "Please enter fully qualified user ID: '@user:domain'",
      protocol_error: "URL has to start with 'http://' or 'https://'",
      url_error: "Not a valid Matrix server URL",
    },
+    action: {
+      save_and_show: "Create QR code",
+      save_only: "Save",
+      download_pdf: "Download PDF",
+    },
    users: {
      invalid_user_id:
        "Must be a fully qualified Matrix user-id, e.g. @user_id:homeserver",
    },
    rooms: {
+      details: "Room Details",
+      room_name: "Room Name",
+      make_public: "Make room public",
+      encrypt: "Encrypt room",
+      room_name_required: "Must be provided",
+      alias_required_if_public: "Must be provided for a public room",
+      alias: "Alias",
+      alias_too_long:
+        "Must not exceed 255 bytes including the domain of the homeserver.",
      tabs: {
        basic: "Basic",
        members: "Members",
        detail: "Details",
        permission: "Permissions",
      },
-      delete: {
-        title: "Delete room",
-        message:
-          "Are you sure you want to delete the room? This cannot be undone. All messages and shared media in the room will be deleted from the server!",
-      },
    },
    reports: { tabs: { basic: "Basic", detail: "Details" } },
  },
@@ -94,6 +104,8 @@ export default {
        with_error:
          "%{smart_count} entry with errors ||| %{smart_count} entries with errors",
        simulated_only: "Run was only simulated",
+        for_print:
+          "%{smart_count} entry available for printing |||| %{smart_count} entries available for printing",
      },
    },
  },
@@ -123,6 +135,17 @@ export default {
        address: "Address",
        creation_ts_ms: "Creation timestamp",
        consent_version: "Consent version",
+        // Devices:
+        device_id: "Device-ID",
+        display_name: "Device name",
+        last_seen_ts: "Timestamp",
+        last_seen_ip: "IP address",
+        role: "Role",
+      },
+      type: {
+        default: "Standard",
+        free: "Basic",
+        limited: "Limited",
      },
      helper: {
        deactivate: "You must provide a password to re-activate an account.",
@@ -131,6 +154,11 @@ export default {
      action: {
        erase: "Erase user data",
      },
+      roles: {
+        user: "User",
+        mod: "Moderator",
+        admin: "Administrator",
+      },
    },
    rooms: {
      name: "Room |||| Rooms",
@@ -139,17 +167,26 @@ export default {
        name: "Name",
        canonical_alias: "Alias",
        joined_members: "Members",
-        joined_local_members: "local members",
-        state_events: "State events",
+        invite_members: "Invite Members",
+        invitees: "Invitations",
+        joined_local_members: "Local members",
+        joined_local_devices: "Local devices",
+        state_events: "State events / Complexity",
        version: "Version",
        is_encrypted: "Encrypted",
        encryption: "Encryption",
        federatable: "Federatable",
-        public: "Public",
+        public: "Visible in room directory",
        creator: "Creator",
        join_rules: "Join rules",
        guest_access: "Guest access",
        history_visibility: "History visibility",
+        topic: "Topic",
+        avatar: "Avatar",
+      },
+      helper: {
+        forward_extremities:
+          "Forward extremities are the leaf events at the end of a Directed acyclic graph (DAG) in a room, aka events that have no children. The more exist in a room, the more state resolution that Synapse needs to perform (hint: it's an expensive operation). While Synapse has code to prevent too many of these existing at one time in a room, bugs can sometimes make them crop up again. If a room has >10 forward extremities, it's worth checking which room is the culprit and potentially removing them using the SQL queries mentioned in #1760.",
      },
      enums: {
        join_rules: {
@@ -170,6 +207,11 @@ export default {
        },
        unencrypted: "Unencrypted",
      },
+      erase: {
+        title: "Delete room",
+        content:
+          "Are you sure you want to delete the room? This cannot be undone. All messages and shared media in the room will be deleted from the server!",
+      },
    },
    reports: {
      name: "Reported event |||| Reported events",
@@ -224,7 +266,7 @@ export default {
      name: "Media",
      fields: {
        media_id: "Media ID",
-        media_length: "Lenght",
+        media_length: "File Size (in Bytes)",
        media_type: "Type",
        upload_name: "File name",
        quarantined_by: "Quarantined by",
@@ -233,6 +275,22 @@ export default {
        last_access_ts: "Last access",
      },
    },
+    delete_media: {
+      name: "Media",
+      fields: {
+        before_ts: "last access before",
+        size_gt: "Larger then (in bytes)",
+        keep_profiles: "Keep profile images",
+      },
+      action: {
+        send: "Delete media",
+        send_success: "Request successfully sent.",
+        send_failure: "An error has occurred.",
+      },
+      helper: {
+        send: "This API deletes the local media from the disk of your own server. This includes any local thumbnails and copies of media downloaded. This API will not affect media that has been uploaded to external media repositories.",
+      },
+    },
    pushers: {
      name: "Pusher |||| Pushers",
      fields: {
@@ -259,8 +317,7 @@ export default {
        send_failure: "An error has occurred.",
      },
      helper: {
-        send:
-          'Sends a server notice to the selected users. The feature "Server Notices" has to be activated at the server.',
+        send: 'Sends a server notice to the selected users. The feature "Server Notices" has to be activated at the server.',
      },
    },
    user_media_statistics: {
@@ -270,5 +327,41 @@ export default {
        media_length: "Media length",
      },
    },
+    forward_extremities: {
+      name: "Forward Extremities",
+      fields: {
+        id: "Event ID",
+        received_ts: "Timestamp",
+        depth: "Depth",
+        state_group: "State group",
+      },
+    },
+    room_state: {
+      name: "State events",
+      fields: {
+        type: "Type",
+        content: "Content",
+        origin_server_ts: "time of send",
+        sender: "Sender",
+      },
+    },
+    room_directory: {
+      name: "Room directory",
+      fields: {
+        world_readable: "guest users may view without joining",
+        guest_can_join: "guest users may join",
+      },
+      action: {
+        title:
+          "Delete room from directory |||| Delete %{smart_count} rooms from directory",
+        content:
+          "Are you sure you want to remove this room from directory? |||| Are you sure you want to remove these %{smart_count} rooms from directory",
+        erase: "Delete from room directory",
+        create: "Publish in room directory",
+        send_success: "Room successfully published.",
+        send_failure: "An error has occurred.",
+      },
+    },
  },
 };
+export default en;
@@ -0,0 +1,289 @@
+import chineseMessages from "ra-language-chinese";
+
+const zh = {
+  ...chineseMessages,
+  synapseadmin: {
+    auth: {
+      base_url: "服务器 URL",
+      welcome: "欢迎来到 Synapse-admin",
+      server_version: "Synapse 版本",
+      username_error: "请输入完整有效的用户 ID: '@user:domain'",
+      protocol_error: "URL 需要以'http://'或'https://'作为起始",
+      url_error: "不是一个有效的 Matrix 服务器地址",
+    },
+    users: {
+      invalid_user_id:
+        "必须要是一个有效的 Matrix 用户 ID ，例如 @user_id:homeserver",
+    },
+    rooms: {
+      tabs: {
+        basic: "基本",
+        members: "成员",
+        detail: "细节",
+        permission: "权限",
+      },
+      delete: {
+        title: "删除房间",
+        message:
+          "您确定要删除这个房间吗？该操作无法被撤销。这个房间里所有的消息和分享的媒体都将被从服务器上删除！",
+      },
+    },
+    reports: { tabs: { basic: "基本", detail: "细节" } },
+  },
+  import_users: {
+    error: {
+      at_entry: "在条目 %{entry}: %{message}",
+      error: "错误",
+      required_field: "需要的值 '%{field}' 未被设置。",
+      invalid_value:
+        "第 %{row} 行出现无效值。 '%{field}' 只可以是 'true' 或 'false'。",
+      unreasonably_big: "拒绝加载过大的文件： %{size} MB",
+      already_in_progress: "一个导入进程已经在运行中",
+      id_exits: "ID %{id} 已经存在",
+    },
+    title: "通过 CSV 导入用户",
+    goToPdf: "转到 PDF",
+    cards: {
+      importstats: {
+        header: "导入用户",
+        users_total:
+          "%{smart_count} 用户在 CSV 文件中 |||| %{smart_count} 用户在 CSV 文件中",
+        guest_count: "%{smart_count} 访客 |||| %{smart_count} 访客",
+        admin_count: "%{smart_count} 管理员 |||| %{smart_count} 管理员",
+      },
+      conflicts: {
+        header: "冲突处理策略",
+        mode: {
+          stop: "在冲突处停止",
+          skip: "显示错误并跳过冲突",
+        },
+      },
+      ids: {
+        header: "IDs",
+        all_ids_present: "每条记录的 ID",
+        count_ids_present:
+          "%{smart_count} 个含 ID 的记录 |||| %{smart_count} 个含 ID 的记录",
+        mode: {
+          ignore: "忽略 CSV 中的 ID 并创建新的",
+          update: "更新已经存在的记录",
+        },
+      },
+      passwords: {
+        header: "密码",
+        all_passwords_present: "每条记录的密码",
+        count_passwords_present:
+          "%{smart_count} 个含密码的记录 |||| %{smart_count} 个含密码的记录",
+        use_passwords: "使用 CSV 中标记的密码",
+      },
+      upload: {
+        header: "导入 CSV 文件",
+        explanation:
+          "在这里，你可以上传一个用逗号分隔的文件，用于创建或更新用户。该文件必须包括 'id' 和 'displayname' 字段。你可以在这里下载并修改一个示例文件：",
+      },
+      startImport: {
+        simulate_only: "模拟模式",
+        run_import: "导入",
+      },
+      results: {
+        header: "导入结果",
+        total: "共计 %{smart_count} 条记录 |||| 共计 %{smart_count} 条记录",
+        successful: "%{smart_count} 条记录导入成功",
+        skipped: "跳过 %{smart_count} 条记录",
+        download_skipped: "下载跳过的记录",
+        with_error:
+          "%{smart_count} 条记录出现错误 ||| %{smart_count} 条记录出现错误",
+        simulated_only: "只是一次模拟运行",
+      },
+    },
+  },
+  resources: {
+    users: {
+      backtolist: "回到列表",
+      name: "用户",
+      email: "邮箱",
+      msisdn: "电话",
+      threepid: "邮箱 / 电话",
+      fields: {
+        avatar: "邮箱",
+        id: "用户 ID",
+        name: "用户名",
+        is_guest: "访客",
+        admin: "服务器管理员",
+        deactivated: "被禁用",
+        guests: "显示访客",
+        show_deactivated: "显示被禁用的账户",
+        user_id: "搜索用户",
+        displayname: "显示名字",
+        password: "密码",
+        avatar_url: "头像 URL",
+        avatar_src: "头像",
+        medium: "Medium",
+        threepids: "3PIDs",
+        address: "地址",
+        creation_ts_ms: "创建时间戳",
+        consent_version: "协议版本",
+      },
+      helper: {
+        deactivate: "您必须提供一串密码来激活账户。",
+        erase: "将用户标记为根据 GDPR 的要求抹除了",
+      },
+      action: {
+        erase: "抹除用户信息",
+      },
+    },
+    rooms: {
+      name: "房间",
+      fields: {
+        room_id: "房间 ID",
+        name: "房间名",
+        canonical_alias: "别名",
+        joined_members: "成员",
+        joined_local_members: "本地成员",
+        state_events: "状态事件",
+        version: "版本",
+        is_encrypted: "已经加密",
+        encryption: "加密",
+        federatable: "可联合的",
+        public: "公开",
+        creator: "创建者",
+        join_rules: "加入规则",
+        guest_access: "访客访问",
+        history_visibility: "历史可见性",
+      },
+      enums: {
+        join_rules: {
+          public: "公开",
+          knock: "申请",
+          invite: "邀请",
+          private: "私有",
+        },
+        guest_access: {
+          can_join: "访客可以加入",
+          forbidden: "访客不可加入",
+        },
+        history_visibility: {
+          invited: "自从被邀请",
+          joined: "自从加入",
+          shared: "自从分享",
+          world_readable: "任何人",
+        },
+        unencrypted: "未加密",
+      },
+    },
+    reports: {
+      name: "报告事件",
+      fields: {
+        id: "ID",
+        received_ts: "报告时间",
+        user_id: "报告者",
+        name: "房间名",
+        score: "分数",
+        reason: "原因",
+        event_id: "事件 ID",
+        event_json: {
+          origin: "原始服务器",
+          origin_server_ts: "发送时间",
+          type: "事件类型",
+          content: {
+            msgtype: "内容类型",
+            body: "内容",
+            format: "格式",
+            formatted_body: "格式化的数据",
+            algorithm: "算法",
+          },
+        },
+      },
+    },
+    connections: {
+      name: "连接",
+      fields: {
+        last_seen: "日期",
+        ip: "IP 地址",
+        user_agent: "用户代理 (UA)",
+      },
+    },
+    devices: {
+      name: "设备",
+      fields: {
+        device_id: "设备 ID",
+        display_name: "设备名",
+        last_seen_ts: "时间戳",
+        last_seen_ip: "IP 地址",
+      },
+      action: {
+        erase: {
+          title: "移除 %{id}",
+          content: '您确定要移除设备 "%{name}"?',
+          success: "设备移除成功。",
+          failure: "出现了一个错误。",
+        },
+      },
+    },
+    users_media: {
+      name: "媒体文件",
+      fields: {
+        media_id: "媒体文件 ID",
+        media_length: "长度",
+        media_type: "类型",
+        upload_name: "文件名",
+        quarantined_by: "被隔离",
+        safe_from_quarantine: "取消隔离",
+        created_ts: "创建",
+        last_access_ts: "上一次访问",
+      },
+    },
+    delete_media: {
+      name: "媒体文件",
+      fields: {
+        before_ts: "最后访问时间",
+        size_gt: "大于 (字节)",
+        keep_profiles: "保留头像",
+      },
+      action: {
+        send: "删除媒体",
+        send_success: "请求发送成功。",
+        send_failure: "出现了一个错误。",
+      },
+      helper: {
+        send: "这个API会删除您硬盘上的本地媒体。包含了任何的本地缓存和下载的媒体备份。这个API不会影响上传到外部媒体存储库上的媒体文件。",
+      },
+    },
+    pushers: {
+      name: "发布者",
+      fields: {
+        app: "App",
+        app_display_name: "App 名称",
+        app_id: "App ID",
+        device_display_name: "设备显示名",
+        kind: "类型",
+        lang: "语言",
+        profile_tag: "数据标签",
+        pushkey: "Pushkey",
+        data: { url: "URL" },
+      },
+    },
+    servernotices: {
+      name: "服务器提示",
+      send: "发送服务器提示",
+      fields: {
+        body: "信息",
+      },
+      action: {
+        send: "发送提示",
+        send_success: "服务器提示发送成功。",
+        send_failure: "出现了一个错误。",
+      },
+      helper: {
+        send: '向选中的用户发送服务器提示。服务器配置中的 "服务器提示(Server Notices)" 选项需要被设置为启用。',
+      },
+    },
+    user_media_statistics: {
+      name: "用户的媒体文件",
+      fields: {
+        media_count: "媒体文件统计",
+        media_length: "媒体文件长度",
+      },
+    },
+  },
+};
+export default zh;
@@ -1,6 +1,3 @@
-import { configure } from "enzyme";
-import Adapter from "enzyme-adapter-react-16";
 import fetchMock from "jest-fetch-mock";

-configure({ adapter: new Adapter() });
 fetchMock.enableMocks();
@@ -3,6 +3,9 @@ import { fetchUtils } from "react-admin";
 const authProvider = {
  // called when the user attempts to log in
  login: ({ base_url, username, password }) => {
+    // force homeserver for protection in case the form is manipulated
+    base_url = process.env.REACT_APP_SERVER || base_url;
+
    console.log("login ");
    const options = {
      method: "POST",
@@ -10,12 +13,15 @@ const authProvider = {
        type: "m.login.password",
        user: username,
        password: password,
+        device_id: localStorage.getItem("device_id"),
+        initial_device_display_name: "Synapse Admin",
      }),
    };

    // use the base_url from login instead of the well_known entry from the
    // server, since the admin might want to access the admin API via some
    // private address
+    base_url = base_url.replace(/\/+$/g, "");
    localStorage.setItem("base_url", base_url);

    const decoded_base_url = window.decodeURIComponent(base_url);
@@ -30,8 +36,25 @@ const authProvider = {
  },
  // called when the user clicks on the logout button
  logout: () => {
-    console.log("logout ");
-    localStorage.removeItem("access_token");
+    console.log("logout");
+
+    const logout_api_url =
+      localStorage.getItem("base_url") + "/_matrix/client/r0/logout";
+    const access_token = localStorage.getItem("access_token");
+
+    const options = {
+      method: "POST",
+      user: {
+        authenticated: true,
+        token: `Bearer ${access_token}`,
+      },
+    };
+
+    if (typeof access_token === "string") {
+      fetchUtils.fetchJson(logout_api_url, options).then(({ json }) => {
+        localStorage.removeItem("access_token");
+      });
+    }
    return Promise.resolve();
  },
  // called when the API returns an error
@@ -46,7 +69,7 @@ const authProvider = {
  checkAuth: () => {
    const access_token = localStorage.getItem("access_token");
    console.log("checkAuth " + access_token);
-    return typeof access_token == "string"
+    return typeof access_token === "string"
      ? Promise.resolve()
      : Promise.reject();
  },
@@ -25,6 +25,13 @@ const mxcUrlToHttp = mxcUrl => {
  return `${homeserver}/_matrix/media/r0/thumbnail/${serverName}/${mediaId}?width=24&height=24&method=scale`;
 };

+const POWER_LEVELS = {
+  admin: 100,
+  mod: 50,
+  user: 0,
+};
+const roleToPowerLevel = role => POWER_LEVELS[role] || 0;
+
 const resourceMap = {
  users: {
    path: "/_synapse/admin/v2/users",
@@ -35,6 +42,7 @@ const resourceMap = {
      is_guest: !!u.is_guest,
      admin: !!u.admin,
      deactivated: !!u.deactivated,
+      displayname: u.display_name || u.displayname,
      // need timestamp in milliseconds
      creation_ts_ms: u.creation_ts * 1000,
    }),
@@ -63,13 +71,44 @@ const resourceMap = {
      public: !!r.public,
    }),
    data: "rooms",
-    total: json => {
-      return json.total_rooms;
+    total: json => json.total_rooms,
+    create: data => ({
+      endpoint: "/_synapse/admin/v1/rooms",
+      body: {
+        owner: data.owner,
+        name: data.name,
+        room_alias_name: data.canonical_alias,
+        visibility: data.public ? "public" : "private",
+        invite:
+          Array.isArray(data.invitees) && data.invitees.length > 0
+            ? data.invitees
+            : undefined,
+        initial_state: data.encrypt
+          ? [
+              {
+                type: "m.room.encryption",
+                state_key: "",
+                content: {
+                  algorithm: "m.megolm.v1.aes-sha2",
+                },
+              },
+            ]
+          : undefined,
+      },
+      method: "POST",
+    }),
+    transformBeforeUpdate: data => {
+      return {
+        ...data,
+        member_roles: (data.member_roles || []).map(member => ({
+          member_id: member.member_id,
+          power_level: roleToPowerLevel(member.role),
+        })),
+      };
    },
    delete: params => ({
-      endpoint: `/_synapse/admin/v1/rooms/${params.id}/delete`,
+      endpoint: `/_synapse/admin/v1/rooms/${params.id}`,
      body: { block: false },
-      method: "POST",
    }),
  },
  reports: {
@@ -117,6 +156,19 @@ const resourceMap = {
      return json.total;
    },
  },
+  room_state: {
+    map: rs => ({
+      ...rs,
+      id: rs.event_id,
+    }),
+    reference: id => ({
+      endpoint: `/_synapse/admin/v1/rooms/${id}/state`,
+    }),
+    data: "state",
+    total: json => {
+      return json.state.length;
+    },
+  },
  pushers: {
    map: p => ({
      ...p,
@@ -160,6 +212,16 @@ const resourceMap = {
      )}/${params.id}`,
    }),
  },
+  delete_media: {
+    delete: params => ({
+      endpoint: `/_synapse/admin/v1/media/${localStorage.getItem(
+        "home_server"
+      )}/delete?before_ts=${params.before_ts}&size_gt=${
+        params.size_gt
+      }&keep_profiles=${params.keep_profiles}`,
+      method: "POST",
+    }),
+  },
  servernotices: {
    map: n => ({ id: n.event_id }),
    create: data => ({
@@ -185,6 +247,46 @@ const resourceMap = {
      return json.total;
    },
  },
+  forward_extremities: {
+    map: fe => ({
+      ...fe,
+      id: fe.event_id,
+    }),
+    reference: id => ({
+      endpoint: `/_synapse/admin/v1/rooms/${id}/forward_extremities`,
+    }),
+    data: "results",
+    total: json => {
+      return json.count;
+    },
+    delete: params => ({
+      endpoint: `/_synapse/admin/v1/rooms/${params.id}/forward_extremities`,
+    }),
+  },
+  room_directory: {
+    path: "/_matrix/client/r0/publicRooms",
+    map: rd => ({
+      ...rd,
+      id: rd.room_id,
+      public: !!rd.public,
+      guest_access: !!rd.guest_access,
+      avatar_src: mxcUrlToHttp(rd.avatar_url),
+    }),
+    data: "chunk",
+    total: json => {
+      return json.total_room_count_estimate;
+    },
+    create: params => ({
+      endpoint: `/_matrix/client/r0/directory/list/room/${params.id}`,
+      body: { visibility: "public" },
+      method: "PUT",
+    }),
+    delete: params => ({
+      endpoint: `/_matrix/client/r0/directory/list/room/${params.id}`,
+      body: { visibility: "private" },
+      method: "PUT",
+    }),
+  },
 };

 function filterNullValues(key, value) {
@@ -236,7 +338,7 @@ const dataProvider = {
  },

  getOne: (resource, params) => {
-    console.log("getOne " + resource);
+    console.log("getOne " + resource, params);
    const homeserver = localStorage.getItem("base_url");
    if (!homeserver || !(resource in resourceMap)) return Promise.reject();

@@ -267,10 +369,13 @@ const dataProvider = {
  getManyReference: (resource, params) => {
    console.log("getManyReference " + resource);
    const { page, perPage } = params.pagination;
+    const { field, order } = params.sort;
    const from = (page - 1) * perPage;
    const query = {
      from: from,
      limit: perPage,
+      order_by: field,
+      dir: getSearchOrder(order),
    };

    const homeserver = localStorage.getItem("base_url");
@@ -294,10 +399,13 @@ const dataProvider = {

    const res = resourceMap[resource];

+    const transform = res.transformBeforeUpdate || (x => x);
+    const data = transform(params.data);
+
    const endpoint_url = homeserver + res.path;
    return jsonClient(`${endpoint_url}/${params.data.id}`, {
      method: "PUT",
-      body: JSON.stringify(params.data, filterNullValues),
+      body: JSON.stringify(data, filterNullValues),
    }).then(({ json }) => ({
      data: res.map(json),
    }));
Author	SHA1	Message	Date
Manuel Stahl	af51cca461	Merge tag '0.8.2' into amp.chat Change-Id: I791cad80267ddaa61966d3c2da9767e1a6a3c589	2021-07-05 16:00:00 +01:00
Michael Albert	ff0201273a	Bump version and update packages Change-Id: If148587c9e5895ab6b8a70ec34c9190f0bb8f2e0	2021-07-05 14:48:25 +02:00
Dirk Klimpel	e50c95b4be	Fix CSV import button (#154 )	2021-07-05 14:32:51 +02:00
Dirk Klimpel	9f16e5c6ba	Change delete room API to `DELETE` (#151 )	2021-07-05 14:32:44 +02:00
dependabot[bot]	509a45cba4	Bump dns-packet from 1.3.1 to 1.3.4 (#145 ) Bumps [dns-packet](https://github.com/mafintosh/dns-packet) from 1.3.1 to 1.3.4. - [Release notes](https://github.com/mafintosh/dns-packet/releases) - [Changelog](https://github.com/mafintosh/dns-packet/blob/master/CHANGELOG.md) - [Commits](https://github.com/mafintosh/dns-packet/compare/v1.3.1...v1.3.4) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2021-06-15 11:03:47 +02:00
dependabot[bot]	5c6e5a9641	Bump ws from 6.2.1 to 6.2.2 (#152 ) Bumps [ws](https://github.com/websockets/ws) from 6.2.1 to 6.2.2. - [Release notes](https://github.com/websockets/ws/releases) - [Commits](https://github.com/websockets/ws/commits) --- updated-dependencies: - dependency-name: ws dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2021-06-15 11:03:31 +02:00
Dirk Klimpel	e3d5d51342	Fix broken RoomDirectoryFilter (#155 )	2021-06-15 11:03:03 +02:00
Manuel Stahl	364234f4f4	Merge tag '0.8.1' into amp.chat Change-Id: Ice2d3474ef9284bcfea81a4e0043d798edcfaa03	2021-05-25 16:00:00 +01:00
Manuel Stahl	1fe0b2f330	Fix linting errors Change-Id: Ie804aa67de43f66ecb5d7890826285b09656c2e5	2021-11-23 07:47:31 +00:00
Timo Paulssen	1aaa137afe	Import users from CSV Change-Id: Id05363ecc39aee4fdc4ac6afbcb039558b2a17ed	2021-08-25 09:39:49 +02:00
Michael Albert	985673b161	Increment version Change-Id: I149896f55be7840b240d92fed5880e3f5624b857	2021-05-25 15:03:15 +02:00
John Francis Sukamto	d72357f64f	Update en.js (#144 ) Suggested a UI name change for media size (assuming length is size in bytes)	2021-05-25 15:01:13 +02:00
Dirk Klimpel	e19c34324b	Allow fixed homeserver (#142 )	2021-05-18 12:39:53 +02:00
Dirk Klimpel	3ea1f51eb5	Add a new tab to rooms with forward extremities (#107 ) Add a new tab to rooms with forward extremities.	2021-05-08 19:10:51 +02:00
Manuel Stahl	229518e456	Show room alias or room id in room list if room has no name Change-Id: Iad769f31347566ccf0b8a978b31f5123553e9dbc	2021-05-05 20:24:15 +02:00
Dirk Klimpel	5a5a7143af	Enable sorting of user list (#133 ) New in Synapse 1.32.0 Fixes: #132, #136	2021-05-05 19:36:47 +02:00
Manuel Stahl	dda8ba5e85	Update nodejs version for travis Change-Id: I7d44f5df7d4479efcb1d44f5ba23467effad147e	2021-05-05 19:31:50 +02:00
Manuel Stahl	5208198b76	Replace enzyme with testing-library/react Enzyme is not compatible with react 17. Change-Id: If9bca2c482bfe10a18d2ee2bc213dab966849b5b	2021-05-05 19:23:01 +02:00
Manuel Stahl	c8082a7198	Remove TestContext from App.test.js The TestContext is only required for components that depend on react-admin, but not for the Admin component itself. Change-Id: I3e07cb6bfa592f1bf59ca282cdf1c2e6c922f619	2021-05-05 19:23:01 +02:00
Michael Albert	10831796e3	Add missing translation Change-Id: Iab3203742498d2c6768b5885c0522ff8365b58f2	2021-05-05 09:41:05 +00:00
Michael Albert	5ee5288edf	Fix some DOM errors Change-Id: I22a108fd5ce6a344e629e4af0345a0221de44052	2021-05-05 09:40:48 +00:00
Manuel Stahl	a5528d9fe7	yarn: Upgrade packages - eslint 7.25 - ra-language-german 3.13 - react-admin 3.15 - react-dom 17.0 - react-scripts 4.0 Change-Id: Iad982cf647470bc16194000519a72c401009c9fa	2021-05-04 18:42:05 +02:00
Manuel Stahl	e2fd934851	Allow base URL with path Ignore and remove trailing slashes. Fixes #134. Change-Id: Iedf266e9a93e6939f7f66707fee59a2b56226216	2021-05-04 18:41:54 +02:00
Manuel Stahl	0bc1ce3226	Reuse device_id for synapse-admin on login Change-Id: I47bbfd1e33ef8bffb618101ae233aeb093cf0ada	2021-05-04 17:10:49 +02:00
Manuel Stahl	41ce58bac8	Enable sorting in tab of users' media (#138 )	2021-05-04 16:18:12 +02:00
Manuel Stahl	7b5c0e2845	Merge tag '0.8.0' into amp.chat Change-Id: I2e362a911083149c82a8c11b6c4594bb4c760a33	2021-05-04 15:07:42 +02:00
Manuel Stahl	57c41cc069	Increment version	2021-05-04 15:06:41 +02:00
Nya Candy	0e3375c5ad	Add zh-cn support (#131 )	2021-05-04 15:06:41 +02:00
Dirk Klimpel	2cdd41b615	Add a new tab to rooms with state events (#108 ) Co-authored-by: Michael Albert <37796947+awesome-michael@users.noreply.github.com>	2021-05-04 14:42:27 +02:00
Manuel Stahl	da8cb12756	Merge tag '0.7.2' into amp.chat Change-Id: Ideb662d56977082af5757fed21573ff25ca52e27	2021-05-04 14:32:28 +02:00
Manuel Stahl	56a359b704	Merge tag '0.7.1' into amp.chat Change-Id: Ib19b2cd22bae62b22057a3782ac978f83097fdd5	2021-05-04 14:32:05 +02:00
Dirk Klimpel	2ab4343970	Add the lists of public rooms on the server (#105 ) * Add room directory and the switches to rooms settings * Fix react admin version	2021-05-04 13:52:43 +02:00
Dirk Klimpel	0268cc0e94	Add `joined_local_devices` to rooms (#96 )	2021-05-04 13:49:20 +02:00
Lukas Wolfsteiner	f8331a459d	Add notes about the docker-compose usage Change-Id: I73c8467ab58caf2082740e682c9175f3eb494a14	2021-04-21 10:51:19 +02:00
Lukas Wolfsteiner	a12cf95457	Add docker-compose.yml	2021-04-21 10:51:17 +02:00
dklimpel	60854bcc60	Add button to delete media by size and date	2021-04-21 10:51:14 +02:00
Manuel Stahl	62b3d094b7	yarn: Upgrade packages - babel: 7.13 - material-ui: 4.11 - prettier: 2.2 - react-admin: 3.14 Change-Id: I26ab6d9d75110f3522282b83cd1131af98b8c43c	2021-04-21 10:50:49 +02:00
dependabot[bot]	81231b5ea6	Bump y18n from 4.0.0 to 4.0.1 Bumps [y18n](https://github.com/yargs/y18n) from 4.0.0 to 4.0.1. - [Release notes](https://github.com/yargs/y18n/releases) - [Changelog](https://github.com/yargs/y18n/blob/master/CHANGELOG.md) - [Commits](https://github.com/yargs/y18n/commits) Signed-off-by: dependabot[bot] <support@github.com>	2021-04-21 09:35:59 +02:00
dependabot[bot]	c114e58278	Bump ssri from 6.0.1 to 6.0.2 Bumps [ssri](https://github.com/npm/ssri) from 6.0.1 to 6.0.2. - [Release notes](https://github.com/npm/ssri/releases) - [Changelog](https://github.com/npm/ssri/blob/v6.0.2/CHANGELOG.md) - [Commits](https://github.com/npm/ssri/compare/v6.0.1...v6.0.2) Signed-off-by: dependabot[bot] <support@github.com>	2021-04-19 18:23:21 +00:00
Dirk Klimpel	c6b6e54617	Fix broken redirect to login page (#116 )	2021-03-16 12:13:32 +01:00
Michael Albert	8ff0ac913c	Add missing translations Change-Id: Ie46554bcd10dde771c03e7d3fd0c3639f904429d	2021-03-16 12:12:54 +01:00
dependabot[bot]	96d2c96740	Bump elliptic from 6.5.3 to 6.5.4 (#122 ) Bumps [elliptic](https://github.com/indutny/elliptic) from 6.5.3 to 6.5.4. - [Release notes](https://github.com/indutny/elliptic/releases) - [Commits](https://github.com/indutny/elliptic/compare/v6.5.3...v6.5.4) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2021-03-11 13:29:43 +01:00
Aaron Raimist	8adab0e927	Name device used by Synapse Admin and hook up logout button (#113 ) * Name device used by Synapse Admin * Actually logout when the logout button is pressed so that old sessions get deleted * Fix lint	2021-03-02 11:45:05 +01:00
Dirk Klimpel	536ffc2fbf	Disable telemetry which was introduced with react-admin v3.11.0 (#109 )	2021-03-01 09:26:58 +01:00
Michael Albert	5906dcc129	Merge tag '0.7.0' into amp.chat Change-Id: I44a26f1fa0946a2b2beeb014d6905cdd2d15aaf6	2021-02-17 23:30:02 +01:00
Elshad Shirinov	270d48607a	Allow server admin to create rooms for other users and change user power levels Change-Id: Ie96e9e0102454835536b6f42d247f9e714e28480	2020-11-12 18:46:33 +01:00
Michael Albert	931fafc21d	Allow to set user_type 'limited' Change-Id: Ic3942a2150b9dfe57c106eb595b49b774fe8a30c	2020-10-20 18:56:04 +02:00
Michael Albert	c604b47adc	Allow to set a usertype Change-Id: Ibfaa383b95dc5acc3b4dcd61f3f506f7c81f7dea	2020-10-20 13:57:23 +02:00
Manuel Stahl	fb8cff3e3e	Merge tag '0.5.0' into amp.chat Change-Id: I410e194bc7b153c69e00f40a4486a46924cd510a	2020-09-03 09:08:01 +02:00
Michael Albert	725e24d944	Add credentials to PDF Fix Umlauts in PDF Reorder elements of PDF Change-Id: I49335584ef282e4b960275013ea7d16053b9f773	2020-08-24 07:57:40 +00:00
Manuel Stahl	dd00a76603	Merge tag '0.4.2' into amp.chat Change-Id: Id12309f0a4d3ff9983325e69131d5eebe5bd0bde	2020-07-30 12:56:20 +02:00
Manuel Stahl	2915fd3e5b	Merge tag '0.4.1' into amp.chat Change-Id: I44c9f00e5aa7abe413f8a819e1143bebc4f08ce2	2020-07-28 15:09:48 +02:00
Michael Albert	a4662c2557	Translate room info Change-Id: I7f3121da3c910592ecfcb4bca9dee34f2757f567	2020-06-10 07:18:58 +00:00
Michael Albert	f6ca169fbc	Fix data provider Change-Id: Id1c929f593833ed35327e70d1d0dc8182a4b7306	2020-05-25 21:20:49 +02:00
Michael Albert	07862591fd	Possibility to encrypt new rooms Change-Id: Ie415a0f8ecec646510ac8f2f0adca58064e30da5	2020-05-25 13:25:46 +02:00
Manuel Stahl	ab649fbf70	Merge branch 'master' into amp.chat Change-Id: I6141964157bcb7218e2e6368a3ca8d20eb4855e9	2020-05-05 13:44:06 +02:00
Timo Paulssen	880223e5de	Offer invitations in room creation Turns the "Create Room" form into a tabbed form with tabs that mimic the room display. In the "Members" tab an AutocompleteArrayInput allows selecting multiple users by their displayname. The displayname is also what is displayed ìn the invitations list. Creating the room immediately sends out the invitations as well. Change-Id: I3915144114ffe4c629848363c9cb7917634d04d8	2020-04-28 19:36:15 +02:00
Manuel Stahl	76fdc80e3e	Merge branch 'master' into amp.chat Change-Id: I08a7a34e041993c29bb12fff52d07534374cda4e	2020-04-28 16:35:40 +02:00
Manuel Stahl	375649756f	Add page to show room details Change-Id: Iec4f402c4322d775cc14c567069a3295ad383b44	2020-04-28 16:30:47 +02:00
Manuel Stahl	662735a91f	Adapt for changes in v2/users API Change-Id: I927b81882fa20e5b3de3d9fc216e2136f7036bba	2020-04-28 16:30:47 +02:00
Manuel Stahl	0823976edd	Cleanup room creation Change-Id: Ieb5189513d21606f8d0bea5692112350a68f2e14	2020-04-23 16:31:26 +02:00
Michael Albert	d3cd2e9e33	Fix localStorage entry of homeserver url Change-Id: I206e3b4428df1f51d4281ad4db26bd64bdffb85d	2020-04-21 17:42:43 +02:00
Timo Paulssen	24abcd4e4a	Normalize alias a little, display initial sigil turns all whitespace into underscores, shows leading sigil if the alias is non-empty, so the user doesn't get confused about whether they have to input a # or not. Change-Id: Ic81e69cc3f0074d63a67b976c9bda32f8de025de	2020-04-20 19:31:33 +02:00
Timo Paulssen	c1c32e3268	Offer "alias" field in room create form Tries its best to not allow aliases that are too long (full alias including leading #, : in the middle, and homeserver domain name must not exceed 255 bytes. Change-Id: I1e784a94cb599eca7e30736d666b20e37aad5444	2020-04-20 19:31:33 +02:00
Timo Paulssen	ca15435625	Offer room creation form A choice of public or private is offered, which maps to matrix' visibility parameter. A name can also be provided. Change-Id: I34d99acbc4624a9ed54ca6f6609573d5fc1049da	2020-04-20 19:31:33 +02:00
Michael Albert	e9c3901b68	Merge branch 'master' into amp.chat Change-Id: Iac4e56401aab3f7f39b623b617990ec1952f8cd0	2020-04-20 16:57:23 +02:00
Michael Albert	7aec6f9369	Allow searching for users Change-Id: Icf4a3b05b24c66971f55b22e7540a1dc904a3a92	2020-04-20 11:22:06 +00:00
Michael Albert	d2a3f07a59	Fix QR code creation Change-Id: Ib6bbd1be6d4dca1f617043c3c2338924b2321ea3	2020-04-20 12:15:52 +02:00
Manuel Stahl	bf7867f106	Merge branch 'master' into amp.chat Change-Id: I45b7a6db27456aaa2eca66b406cdaa49e492e61e	2020-02-11 18:56:53 +01:00
Michael Albert	f0e32abc4f	Fix QR code creation Change-Id: If05856a6fdafa43a93c6b57963820710db188d42	2020-02-11 17:35:19 +00:00
Michael Albert	61b1580735	Fix redirect after create/edit user Change-Id: Icdb797bf6b1a47cbeff901b1952672584b2e8e8f	2020-02-11 17:34:32 +00:00
Manuel Stahl	0f7e4c1909	Create PDF with QR code on user create/edit Change-Id: Ib89b68e956d96002ddbf6ac5ddcaea73b5b3e3fb	2020-02-10 13:10:08 +01:00
Michael Albert	c9bce409d2	Prefill user_id and password on user creation Change-Id: I3f604f38c1842f155f3b39da20ba45992ba522be	2020-02-10 13:10:08 +01:00