diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml new file mode 100644 index 0000000..4d95e63 --- /dev/null +++ b/.github/workflows/build-test.yml @@ -0,0 +1,21 @@ +name: build-test + +on: + push: + branches: ["master"] + pull_request: + +jobs: + check: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v2 + - name: Setup node + uses: actions/setup-node@v2 + with: + node-version: 14 + - name: Install dependencies + run: yarn --frozen-lockfile + - name: Run tests + run: yarn test diff --git a/README.md b/README.md index ee73d65..e6c9780 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,11 @@ [![Build Status](https://travis-ci.org/Awesome-Technologies/synapse-admin.svg?branch=master)](https://travis-ci.org/Awesome-Technologies/synapse-admin) +[![build-test](https://github.com/Awesome-Technologies/synapse-admin/actions/workflows/build-test.yml/badge.svg)](https://github.com/Awesome-Technologies/synapse-admin/actions/workflows/build-test.yml) # Synapse admin ui This project is built using [react-admin](https://marmelab.com/react-admin/). -It needs at least Synapse v1.36.0 for all functions to work as expected! +It needs at least Synapse v1.38.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://matrix-org.github.io/synapse/develop/admin_api/version_api.html). @@ -40,7 +41,7 @@ or by editing it in the [.env](.env) file. See also the Steps for 2): -- 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` +- 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. diff --git a/src/components/users.js b/src/components/users.js index a75a27d..9f6ca9f 100644 --- a/src/components/users.js +++ b/src/components/users.js @@ -1,5 +1,6 @@ import React, { cloneElement, Fragment } from "react"; import Avatar from "@material-ui/core/Avatar"; +import AssignmentIndIcon from "@material-ui/icons/AssignmentInd"; import ContactMailIcon from "@material-ui/icons/ContactMail"; import DevicesIcon from "@material-ui/icons/Devices"; import GetAppIcon from "@material-ui/icons/GetApp"; @@ -333,6 +334,23 @@ export const UserEdit = props => { + } + path="sso" + > + + + + + + + + } diff --git a/src/i18n/de.js b/src/i18n/de.js index d24ef89..0165474 100644 --- a/src/i18n/de.js +++ b/src/i18n/de.js @@ -14,6 +14,7 @@ const de = { users: { invalid_user_id: "Muss eine vollständige Matrix Benutzer-ID sein, z.B. @benutzer_id:homeserver", + tabs: { sso: "SSO" }, }, rooms: { details: "Raumdetails", @@ -120,6 +121,7 @@ const de = { address: "Adresse", creation_ts_ms: "Zeitpunkt der Erstellung", consent_version: "Zugestimmte Geschäftsbedingungen", + auth_provider: "Provider", }, helper: { deactivate: diff --git a/src/i18n/en.js b/src/i18n/en.js index 161fdef..49fbf01 100644 --- a/src/i18n/en.js +++ b/src/i18n/en.js @@ -14,6 +14,7 @@ const en = { users: { invalid_user_id: "Must be a fully qualified Matrix user-id, e.g. @user_id:homeserver", + tabs: { sso: "SSO" }, }, rooms: { tabs: { @@ -119,6 +120,7 @@ const en = { address: "Address", creation_ts_ms: "Creation timestamp", consent_version: "Consent version", + auth_provider: "Provider", }, helper: { deactivate: "You must provide a password to re-activate an account.",