Merge tag '0.5.0' into amp.chat

Change-Id: I410e194bc7b153c69e00f40a4486a46924cd510a

src/components/rooms.js

@@ -11,6 +11,8 @@ import {
   List,
   Pagination,
   ReferenceArrayInput,
+  ReferenceField,
+  ReferenceManyField,
   SelectField,
   Show,
   Tab,
@@ -201,6 +203,34 @@ export const RoomShow = props => {
           />
         </Tab>
 
+        <Tab label="synapseadmin.rooms.tabs.members" icon={<UserIcon />}>
+          <ReferenceManyField
+            reference="room_members"
+            target="room_id"
+            addLabel={false}
+          >
+            <Datagrid
+              style={{ width: "100%" }}
+              rowClick={(id, basePath, record) => "/users/" + 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>
+            </Datagrid>
+          </ReferenceManyField>
+        </Tab>
+
         <Tab
           label="synapseadmin.rooms.tabs.permission"
           icon={<VisibilityIcon />}

src/components/users.js

@@ -295,7 +295,10 @@ export const UserEdit = props => {
   return (
     <Edit {...props} title={<UserTitle />}>
       <TabbedForm toolbar={<UserEditToolbar />}>
-        <FormTab label="resources.users.name" icon={<PersonPinIcon />}>
+        <FormTab
+          label={translate("resources.users.name", { smart_count: 1 })}
+          icon={<PersonPinIcon />}
+        >
           <AvatarField
             source="avatar_src"
             sortable={false}