From 185d71e5fc8efd9cc4cccd5d8922a751745d1432 Mon Sep 17 00:00:00 2001
From: Manuel Stahl <manuel.stahl@awesome-technologies.de>
Date: Mon, 6 Apr 2020 11:13:20 +0200
Subject: [PATCH 1/3] Add helper text to deactivate switch of users (#31)

---
 src/components/users.js | 5 ++++-
 src/i18n/de.js          | 4 ++++
 src/i18n/en.js          | 3 +++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/components/users.js b/src/components/users.js
index c027d01..4392dee 100644
--- a/src/components/users.js
+++ b/src/components/users.js
@@ -106,7 +106,10 @@ export const UserEdit = props => (
         <TextInput source="displayname" />
         <PasswordInput source="password" autoComplete="new-password" />
         <BooleanInput source="admin" />
-        <BooleanInput source="deactivated" />
+        <BooleanInput
+          source="deactivated"
+          helperText="resources.users.helper.deactivate"
+        />
         <ArrayInput source="threepids">
           <SimpleFormIterator>
             <SelectInput
diff --git a/src/i18n/de.js b/src/i18n/de.js
index 3a66110..4b9e283 100644
--- a/src/i18n/de.js
+++ b/src/i18n/de.js
@@ -35,6 +35,10 @@ export default {
         threepids: "3PIDs",
         address: "Adresse",
       },
+      helper: {
+        deactivate:
+          "Deaktivierte Nutzer können nicht wieder aktiviert werden.",
+      },
     },
     rooms: {
       name: "Raum |||| Räume",
diff --git a/src/i18n/en.js b/src/i18n/en.js
index cc665b5..296883f 100644
--- a/src/i18n/en.js
+++ b/src/i18n/en.js
@@ -35,6 +35,9 @@ export default {
         threepids: "3PIDs",
         address: "Address",
       },
+      helper: {
+        deactivate: "Deactivated users cannot be reactivated",
+      },
     },
     rooms: {
       name: "Room |||| Rooms",

From 965645874cd8a218131c9150134f77e5610e2941 Mon Sep 17 00:00:00 2001
From: Manuel Stahl <manuel.stahl@awesome-technologies.de>
Date: Mon, 6 Apr 2020 11:32:13 +0200
Subject: [PATCH 2/3] Fix coding style

---
 src/i18n/de.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/i18n/de.js b/src/i18n/de.js
index 4b9e283..86ace87 100644
--- a/src/i18n/de.js
+++ b/src/i18n/de.js
@@ -36,8 +36,7 @@ export default {
         address: "Adresse",
       },
       helper: {
-        deactivate:
-          "Deaktivierte Nutzer können nicht wieder aktiviert werden.",
+        deactivate: "Deaktivierte Nutzer können nicht wieder aktiviert werden.",
       },
     },
     rooms: {

From 445c7fc3273b86df024ebfaac9ce97d9f3fd564a Mon Sep 17 00:00:00 2001
From: dklimpel <5740567+dklimpel@users.noreply.github.com>
Date: Fri, 27 Mar 2020 21:02:37 +0100
Subject: [PATCH 3/3] Add more size options to pagination (#23)

---
 src/components/rooms.js | 8 ++++++--
 src/components/users.js | 6 ++++++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/components/rooms.js b/src/components/rooms.js
index ba3bd8b..8cac414 100644
--- a/src/components/rooms.js
+++ b/src/components/rooms.js
@@ -1,8 +1,12 @@
 import React from "react";
-import { Datagrid, List, TextField } from "react-admin";
+import { Datagrid, List, TextField, Pagination } from "react-admin";
+
+const RoomPagination = props => (
+  <Pagination {...props} rowsPerPageOptions={[10, 25, 50, 100, 500, 1000]} />
+);
 
 export const RoomList = props => (
-  <List {...props}>
+  <List {...props} pagination={<RoomPagination />}>
     <Datagrid>
       <TextField source="room_id" />
       <TextField source="name" />
diff --git a/src/components/users.js b/src/components/users.js
index 4392dee..b690377 100644
--- a/src/components/users.js
+++ b/src/components/users.js
@@ -23,8 +23,13 @@ import {
   ReferenceField,
   SelectInput,
   regex,
+  Pagination,
 } from "react-admin";
 
+const UserPagination = props => (
+  <Pagination {...props} rowsPerPageOptions={[10, 25, 50, 100, 500, 1000]} />
+);
+
 const UserFilter = props => (
   <Filter {...props}>
     <BooleanInput source="guests" alwaysOn />
@@ -42,6 +47,7 @@ export const UserList = props => (
     filters={<UserFilter />}
     filterDefaultValues={{ guests: true, deactivated: false }}
     bulkActionButtons={false}
+    pagination={<UserPagination />}
   >
     <Datagrid rowClick="edit">
       <ReferenceField