Merge tag '0.7.1' into amp.chat

Change-Id: Ib19b2cd22bae62b22057a3782ac978f83097fdd5

src/App.js

@@ -29,6 +29,7 @@ const i18nProvider = polyglotI18nProvider(
 
 const App = () => (
   <Admin
+    disableTelemetry
     loginPage={LoginPage}
     authProvider={authProvider}
     dataProvider={dataProvider}

src/i18n/de.js

@@ -308,6 +308,10 @@ export default {
   },
   ra: {
     ...germanMessages.ra,
+    action: {
+      ...germanMessages.ra.action,
+      unselect: "Abwählen",
+    },
     auth: {
       ...germanMessages.ra.auth,
       auth_check_error: "Anmeldung fehlgeschlagen",

src/i18n/en.js

@@ -172,7 +172,7 @@ export default {
         joined_members: "Members",
         invite_members: "Invite Members",
         invitees: "Invitations",
-        joined_local_members: "local members",
+        joined_local_members: "Local members",
         state_events: "State events",
         version: "Version",
         is_encrypted: "Encrypted",

src/synapse/authProvider.js

@@ -10,6 +10,7 @@ const authProvider = {
         type: "m.login.password",
         user: username,
         password: password,
+        initial_device_display_name: "Synapse Admin",
       }),
     };
 
@@ -30,9 +31,24 @@ const authProvider = {
   },
   // called when the user clicks on the logout button
   logout: () => {
-    console.log("logout ");
-    localStorage.removeItem("access_token");
-    return Promise.resolve();
+    console.log("logout");
+
+    const logout_api_url =
+      localStorage.getItem("base_url") + "/_matrix/client/r0/logout";
+    const token = localStorage.getItem("access_token");
+
+    const options = {
+      method: "POST",
+      user: {
+        authenticated: true,
+        token: `Bearer ${token}`,
+      },
+    };
+
+    return fetchUtils.fetchJson(logout_api_url, options).then(({ json }) => {
+      localStorage.removeItem("access_token");
+      localStorage.removeItem("device_id");
+    });
   },
   // called when the API returns an error
   checkError: ({ status }) => {