From 54e32f7ad6cee6122d73538ac51bf4fb4715c40d Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@FreeBSD.org>
Date: Tue, 31 Mar 2020 11:59:48 -0500
Subject: [PATCH 1/6] Leave emoji packs disabled in master branch for now.

This ensures a build doesn't get accidentally produced with it enabled.
---
 config/prod.env.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/prod.env.js b/config/prod.env.js
index 7acb93a2..e4c40c43 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -2,6 +2,6 @@ module.exports = {
   NODE_ENV: '"production"',
   ENV_CONFIG: '"prod"',
   BASE_API: '"https://api-prod"',
-  DISABLED_FEATURES: '[""]',
+  DISABLED_FEATURES: '["emoji-packs"]',
   ASSETS_PUBLIC_PATH: '/pleroma/admin/'
 }

From 95729814860200fdf4f0e792a4ba9f02a4800402 Mon Sep 17 00:00:00 2001
From: Angelina Filippova <linakirsanova@gmail.com>
Date: Wed, 18 Mar 2020 21:13:39 +0000
Subject: [PATCH 2/6] Merge branch 'fix/emails-with-symbols' into 'develop'

Fix parsing emails with symbols

See merge request pleroma/admin-fe!105

(cherry picked from commit d021c77a3e08909b016d2e8d1fa08726d0ea1ec6)

88b5abc6 Fix parsing emails with symbols
---
 src/api/invites.js | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/api/invites.js b/src/api/invites.js
index 1d8371db..a303ac17 100644
--- a/src/api/invites.js
+++ b/src/api/invites.js
@@ -13,14 +13,13 @@ export async function generateInviteToken(max_use, expires_at, authHost, token)
 }
 
 export async function inviteViaEmail(email, name, authHost, token) {
-  const url = name.length > 0
-    ? `/api/pleroma/admin/users/email_invite?email=${email}&name=${name}`
-    : `/api/pleroma/admin/users/email_invite?email=${email}`
+  const data = name.length > 0 ? { email, name } : { email }
   return await request({
     baseURL: baseName(authHost),
-    url,
+    url: '/api/pleroma/admin/users/email_invite',
     method: 'post',
-    headers: authHeaders(token)
+    headers: authHeaders(token),
+    data
   })
 }
 

From 46658b8fd0b24ad79a83737261f7a2ac6bdb6241 Mon Sep 17 00:00:00 2001
From: Angelina Filippova <linakirsanova@gmail.com>
Date: Tue, 24 Mar 2020 20:59:12 +0000
Subject: [PATCH 3/6] Merge branch 'user-edit' into 'develop'

Add the ability to set user password and email

Closes #69

See merge request pleroma/admin-fe!92

(cherry picked from commit 747dc65e9bf81895266696579584a614ae6bf4d0)

9395cc78 Add the Security Settings modal for setting the user's email and password
---
 src/api/users.js                              |  19 +++
 src/lang/en.js                                |  17 +-
 src/store/modules/userProfile.js              |  14 +-
 .../components/SecuritySettingsModal.vue      | 155 ++++++++++++++++++
 src/views/users/show.vue                      |  21 ++-
 5 files changed, 222 insertions(+), 4 deletions(-)
 create mode 100644 src/views/users/components/SecuritySettingsModal.vue

diff --git a/src/api/users.js b/src/api/users.js
index 8298eeca..642dd1a7 100644
--- a/src/api/users.js
+++ b/src/api/users.js
@@ -71,6 +71,25 @@ export async function fetchUser(id, authHost, token) {
   })
 }
 
+export async function fetchUserCredentials(nickname, authHost, token) {
+  return await request({
+    baseURL: baseName(authHost),
+    url: `/api/pleroma/admin/users/${nickname}/credentials`,
+    method: 'get',
+    headers: authHeaders(token)
+  })
+}
+
+export async function updateUserCredentials(nickname, credentials, authHost, token) {
+  return await request({
+    baseURL: baseName(authHost),
+    url: `/api/pleroma/admin/users/${nickname}/credentials`,
+    method: 'patch',
+    headers: authHeaders(token),
+    data: credentials
+  })
+}
+
 export async function fetchUsers(filters, authHost, token, page = 1) {
   return await request({
     baseURL: baseName(authHost),
diff --git a/src/lang/en.js b/src/lang/en.js
index 8b8e9ff7..5e98a3cb 100644
--- a/src/lang/en.js
+++ b/src/lang/en.js
@@ -261,7 +261,22 @@ export default {
     activeUppercase: 'Active',
     active: 'active',
     deactivated: 'deactivated',
-    noStatuses: 'No statuses to show'
+    noStatuses: 'No statuses to show',
+    securitySettings: {
+      email: 'Email',
+      password: 'Password',
+      securitySettings: 'Security settings',
+      passwordChangeWarning1: 'Setting a new password will cause the user to be signed out from any client they have used before.',
+      passwordChangeWarning2: 'When the user signs in with this password, they will be asked to set a new one.',
+      passwordLengthNotice: 'Make sure it\'s at least {minLength} characters long.',
+      inputNewEmail: 'Input new email',
+      inputNewPassword: 'Input new password',
+      passwordUpdated: 'The password has been updated',
+      emailUpdated: 'The email has been updated',
+      success: 'Success',
+      submit: 'Submit',
+      close: 'Close'
+    }
   },
   usersFilter: {
     inputPlaceholder: 'Select filter',
diff --git a/src/store/modules/userProfile.js b/src/store/modules/userProfile.js
index 5a7e4394..af54072c 100644
--- a/src/store/modules/userProfile.js
+++ b/src/store/modules/userProfile.js
@@ -1,10 +1,11 @@
-import { fetchUser, fetchUserStatuses } from '@/api/users'
+import { fetchUser, fetchUserStatuses, fetchUserCredentials, updateUserCredentials } from '@/api/users'
 
 const userProfile = {
   state: {
     statuses: [],
     statusesLoading: true,
     user: {},
+    userCredentials: {},
     userProfileLoading: true
   },
   mutations: {
@@ -19,6 +20,9 @@ const userProfile = {
     },
     SET_USER_PROFILE_LOADING: (state, status) => {
       state.userProfileLoading = status
+    },
+    SET_USER_CREDENTIALS: (state, userCredentials) => {
+      state.userCredentials = userCredentials
     }
   },
   actions: {
@@ -38,6 +42,14 @@ const userProfile = {
 
       commit('SET_STATUSES', statuses.data)
       commit('SET_STATUSES_LOADING', false)
+    },
+    async FetchUserCredentials({ commit, getters }, { nickname }) {
+      const userResponse = await fetchUserCredentials(nickname, getters.authHost, getters.token)
+      commit('SET_USER_CREDENTIALS', userResponse.data)
+    },
+    async UpdateUserCredentials({ dispatch, getters }, { nickname, credentials }) {
+      await updateUserCredentials(nickname, credentials, getters.authHost, getters.token)
+      dispatch('FetchUserCredentials', { nickname })
     }
   }
 }
diff --git a/src/views/users/components/SecuritySettingsModal.vue b/src/views/users/components/SecuritySettingsModal.vue
new file mode 100644
index 00000000..58c757b1
--- /dev/null
+++ b/src/views/users/components/SecuritySettingsModal.vue
@@ -0,0 +1,155 @@
+<template>
+  <el-dialog
+    :before-close="close"
+    :title="$t('userProfile.securitySettings.securitySettings')"
+    :visible="visible"
+    class="security-settings-modal">
+    <el-row>
+      <p>
+        <label>
+          {{ $t('userProfile.securitySettings.email') }}
+        </label>
+      </p>
+    </el-row>
+    <el-row>
+      <el-input
+        :placeholder="$t('userProfile.securitySettings.inputNewEmail')"
+        v-model="emailForm.newEmail" />
+    </el-row>
+    <br>
+    <el-row type="flex" justify="end">
+      <el-button
+        :loading="emailForm.isLoading"
+        :disabled="!emailForm.newEmail || emailForm.newEmail === userCredentials.email"
+        type="primary"
+        @click="updateEmail()">
+        {{ $t('userProfile.securitySettings.submit') }}
+      </el-button>
+    </el-row>
+    <el-row>
+      <p>
+        <label>
+          {{ $t('userProfile.securitySettings.password') }}
+        </label>
+      </p>
+    </el-row>
+    <el-row>
+      <el-input
+        :placeholder="$t('userProfile.securitySettings.inputNewPassword')"
+        v-model="passwordForm.newPassword"
+        show-password />
+      <small class="form-text">
+        {{ $t('userProfile.securitySettings.passwordLengthNotice', { minLength: 8 }) }}
+      </small>
+      <br>
+      <el-alert
+        :closable="false"
+        type="warning"
+        show-icon>
+        <p>{{ $t('userProfile.securitySettings.passwordChangeWarning1') }}</p>
+        <p>{{ $t('userProfile.securitySettings.passwordChangeWarning2') }}</p>
+      </el-alert>
+    </el-row>
+    <br>
+    <el-row type="flex" justify="end">
+      <el-button
+        :loading="passwordForm.isLoading"
+        :disabled="passwordForm.newPassword.length < 8"
+        type="primary"
+        @click="updatePassword()">
+        {{ $t('userProfile.securitySettings.submit') }}
+      </el-button>
+    </el-row>
+  </el-dialog>
+</template>
+
+<script>
+
+export default {
+  name: 'SecuritySettingsModal',
+  props: {
+    visible: {
+      type: Boolean,
+      default: false
+    },
+    user: {
+      type: Object,
+      default: function() {
+        return {}
+      }
+    }
+  },
+  data() {
+    return {
+      emailForm: {
+        newEmail: '',
+        isLoading: false
+      },
+      passwordForm: {
+        newPassword: '',
+        isLoading: false
+      }
+    }
+  },
+  computed: {
+    userCredentials() {
+      return this.$store.state.userProfile.userCredentials
+    }
+  },
+  mounted: async function() {
+    await this.$store.dispatch('FetchUserCredentials', { nickname: this.user.nickname })
+    this.emailForm.newEmail = this.userCredentials.email
+  },
+  methods: {
+    async updateEmail() {
+      const credentials = { email: this.emailForm.newEmail }
+      this.emailForm.isLoading = true
+      await this.$store.dispatch('UpdateUserCredentials', { nickname: this.user.nickname, credentials })
+      this.emailForm.isLoading = false
+      this.$notify.success({
+        title: this.$t('userProfile.securitySettings.success'),
+        message: this.$t('userProfile.securitySettings.emailUpdated'),
+        duration: 2000
+      })
+    },
+    async updatePassword() {
+      const credentials = { password: this.passwordForm.newPassword }
+      this.passwordForm.isLoading = true
+      await this.$store.dispatch('UpdateUserCredentials', { nickname: this.user.nickname, credentials })
+      this.passwordForm.isLoading = false
+      this.passwordForm.newPassword = ''
+      this.$notify.success({
+        title: this.$t('userProfile.securitySettings.success'),
+        message: this.$t('userProfile.securitySettings.passwordUpdated'),
+        duration: 2000
+      })
+    },
+    close() {
+      this.$emit('close', true)
+    }
+  }
+}
+</script>
+
+<style rel='stylesheet/scss' lang='scss'>
+@media all and (max-width: 800px) {
+  .security-settings-modal {
+    .el-dialog {
+      width: 90%;
+    }
+  }
+}
+
+.security-settings-modal {
+  .el-alert .el-alert__description {
+    word-break: break-word;
+    font-size: 1em;
+  }
+
+  .form-text {
+    display: block;
+    margin-top: .25rem;
+    color: #909399;
+  }
+}
+</style>
diff --git a/src/views/users/show.vue b/src/views/users/show.vue
index fd24486d..84cfef32 100644
--- a/src/views/users/show.vue
+++ b/src/views/users/show.vue
@@ -73,6 +73,18 @@
                   <el-tag v-if="user.deactivated" type="danger">{{ $t('userProfile.deactivated') }}</el-tag>
                 </td>
               </tr>
+              <tr class="el-table__row">
+                <td>
+                  <el-button icon="el-icon-lock" @click="securitySettingsModalVisible = true">
+                    {{ $t('userProfile.securitySettings.securitySettings') }}
+                  </el-button>
+                  <SecuritySettingsModal
+                    :user="user"
+                    :visible="securitySettingsModalVisible"
+                    @close="securitySettingsModalVisible = false" />
+                </td>
+                <td />
+              </tr>
             </tbody>
           </table>
         </div>
@@ -96,14 +108,16 @@
 <script>
 import Status from '@/components/Status'
 import ModerationDropdown from './components/ModerationDropdown'
+import SecuritySettingsModal from './components/SecuritySettingsModal'
 
 export default {
   name: 'UsersShow',
-  components: { ModerationDropdown, Status },
+  components: { ModerationDropdown, Status, SecuritySettingsModal },
   data() {
     return {
       showPrivate: false,
-      resetPasswordDialogOpen: false
+      resetPasswordDialogOpen: false,
+      securitySettingsModalVisible: false
     }
   },
   computed: {
@@ -127,6 +141,9 @@ export default {
     },
     userProfileLoading() {
       return this.$store.state.userProfile.userProfileLoading
+    },
+    userCredentials() {
+      return this.$store.state.userProfile.userCredentials
     }
   },
   mounted: function() {

From e34b173b54db5f0ec0269a613d8a23dc8f42cd20 Mon Sep 17 00:00:00 2001
From: Angelina Filippova <linakirsanova@gmail.com>
Date: Wed, 18 Mar 2020 18:51:35 +0000
Subject: [PATCH 4/6] Merge branch 'feature/display-status-counts-by-scope'
 into 'develop'

Display status counts by scope

Closes #54

See merge request pleroma/admin-fe!104

(cherry picked from commit ce3d3387cf009a64417fda325f41b6adfdcaaa39)

4f61344c Add api function and action that fetches statuses count by scope
1d21dc51 Update header margin
85664ffb Display status count by visibility scope
---
 src/api/status.js                   |  9 +++++++++
 src/lang/en.js                      |  8 ++++++--
 src/store/modules/status.js         | 14 ++++++++++++--
 src/views/emojiPacks/index.vue      |  2 +-
 src/views/invites/index.vue         |  2 +-
 src/views/moderation_log/index.vue  |  2 +-
 src/views/reports/index.vue         |  2 +-
 src/views/settings/styles/main.scss |  2 +-
 src/views/statuses/index.vue        | 16 +++++++++++++---
 src/views/users/index.vue           |  2 +-
 10 files changed, 46 insertions(+), 13 deletions(-)

diff --git a/src/api/status.js b/src/api/status.js
index 37f7e0c2..fcc820e0 100644
--- a/src/api/status.js
+++ b/src/api/status.js
@@ -30,6 +30,15 @@ export async function fetchStatuses({ godmode, localOnly, authHost, token, pageS
   })
 }
 
+export async function fetchStatusesCount(authHost, token) {
+  return await request({
+    baseURL: baseName(authHost),
+    url: `/api/pleroma/admin/stats`,
+    method: 'get',
+    headers: authHeaders(token)
+  })
+}
+
 export async function fetchStatusesByInstance({ instance, authHost, token, pageSize, page }) {
   return await request({
     baseURL: baseName(authHost),
diff --git a/src/lang/en.js b/src/lang/en.js
index 8b8e9ff7..7311c097 100644
--- a/src/lang/en.js
+++ b/src/lang/en.js
@@ -241,12 +241,16 @@ export default {
     resendConfirmation: 'Resend confirmation email'
   },
   statuses: {
-    statuses: 'Statuses by instance',
+    statuses: 'Statuses',
     instanceFilter: 'Instance filter',
     loadMore: 'Load more',
     noInstances: 'No other instances found',
     onlyLocalStatuses: 'Show only local statuses',
-    showPrivateStatuses: 'Show private statuses'
+    showPrivateStatuses: 'Show private statuses',
+    direct: 'Direct',
+    private: 'Private',
+    public: 'Public',
+    unlisted: 'Unlisted'
   },
   userProfile: {
     tags: 'Tags',
diff --git a/src/store/modules/status.js b/src/store/modules/status.js
index e0cc5d97..8847e8bf 100644
--- a/src/store/modules/status.js
+++ b/src/store/modules/status.js
@@ -1,4 +1,4 @@
-import { changeStatusScope, deleteStatus, fetchStatuses, fetchStatusesByInstance } from '@/api/status'
+import { changeStatusScope, deleteStatus, fetchStatuses, fetchStatusesCount, fetchStatusesByInstance } from '@/api/status'
 
 const status = {
   state: {
@@ -12,7 +12,8 @@ const status = {
       pageSize: 20,
       buttonLoading: false,
       allLoaded: false
-    }
+    },
+    statusVisibility: {}
   },
   mutations: {
     CHANGE_GODMODE_CHECKBOX_VALUE: (state, value) => {
@@ -41,6 +42,9 @@ const status = {
     },
     SET_LOADING: (state, status) => {
       state.loading = status
+    },
+    SET_STATUS_VISIBILITY: (state, visibility) => {
+      state.statusVisibility = visibility
     }
   },
   actions: {
@@ -64,6 +68,12 @@ const status = {
         dispatch('FetchStatusesByInstance')
       }
     },
+    async FetchStatusesCount({ commit, getters }) {
+      commit('SET_LOADING', true)
+      const { data } = await fetchStatusesCount(getters.authHost, getters.token)
+      commit('SET_STATUS_VISIBILITY', data.status_visibility)
+      commit('SET_LOADING', false)
+    },
     async FetchStatusesByInstance({ commit, getters, state, rootState }) {
       commit('SET_LOADING', true)
       if (state.statusesByInstance.selectedInstance === '') {
diff --git a/src/views/emojiPacks/index.vue b/src/views/emojiPacks/index.vue
index e13df39a..2757e3a4 100644
--- a/src/views/emojiPacks/index.vue
+++ b/src/views/emojiPacks/index.vue
@@ -155,7 +155,7 @@ export default {
   margin: 0 30px;
 }
 .emoji-packs-header {
-  margin: 22px 0 20px 15px;
+  margin: 10px 0 20px 15px;
 }
 .import-pack-button {
   margin-left: 10px;
diff --git a/src/views/invites/index.vue b/src/views/invites/index.vue
index 2497bfc0..60111430 100644
--- a/src/views/invites/index.vue
+++ b/src/views/invites/index.vue
@@ -246,7 +246,7 @@ export default {
     padding: 5px 20px 0 20px
   }
   h1 {
-    margin: 22px 0 0 15px;
+    margin: 10px 0 0 15px;
   }
   .icon {
     margin-right: 5px;
diff --git a/src/views/moderation_log/index.vue b/src/views/moderation_log/index.vue
index 2e249b80..9dcee370 100644
--- a/src/views/moderation_log/index.vue
+++ b/src/views/moderation_log/index.vue
@@ -130,7 +130,7 @@ export default {
   margin: 0 15px;
 }
 h1 {
-  margin: 22px 0 20px 0;
+  margin: 10px 0 20px 0;
 }
 .el-timeline {
   margin: 25px 45px 0 0;
diff --git a/src/views/reports/index.vue b/src/views/reports/index.vue
index 64993da3..729cbe64 100644
--- a/src/views/reports/index.vue
+++ b/src/views/reports/index.vue
@@ -50,7 +50,7 @@ export default {
     padding-bottom: 0
   }
   h1 {
-    margin: 22px 0 0 15px;
+    margin: 10px 0 0 15px;
   }
   .no-reports-message {
     color: gray;
diff --git a/src/views/settings/styles/main.scss b/src/views/settings/styles/main.scss
index 562308b5..8e6cb4cf 100644
--- a/src/views/settings/styles/main.scss
+++ b/src/views/settings/styles/main.scss
@@ -444,7 +444,7 @@
       margin: 0;
     }
     .settings-header-container {
-      margin: 15px;
+      margin: 10px 15px 15px 15px;
     }
     .nav-container {
       display: flex;
diff --git a/src/views/statuses/index.vue b/src/views/statuses/index.vue
index 74e3f55b..88bfab6c 100644
--- a/src/views/statuses/index.vue
+++ b/src/views/statuses/index.vue
@@ -3,6 +3,12 @@
     <h1>
       {{ $t('statuses.statuses') }}
     </h1>
+    <el-button-group>
+      <el-button plain>{{ $t('statuses.direct') }}: {{ statusVisibility.direct }}</el-button>
+      <el-button plain>{{ $t('statuses.private') }}: {{ statusVisibility.private }}</el-button>
+      <el-button plain>{{ $t('statuses.public') }}: {{ statusVisibility.public }}</el-button>
+      <el-button plain>{{ $t('statuses.unlisted') }}: {{ statusVisibility.unlisted }}</el-button>
+    </el-button-group>
     <div class="filter-container">
       <el-select
         v-model="selectedInstance"
@@ -111,10 +117,14 @@ export default {
     },
     statuses() {
       return this.$store.state.status.fetchedStatuses
+    },
+    statusVisibility() {
+      return this.$store.state.status.statusVisibility
     }
   },
   mounted() {
     this.$store.dispatch('FetchPeers')
+    this.$store.dispatch('FetchStatusesCount')
   },
   methods: {
     handleFilterChange() {
@@ -142,6 +152,9 @@ export default {
 <style rel='stylesheet/scss' lang='scss'>
 .statuses-container {
   padding: 0 15px;
+  h1 {
+    margin: 10px 0 15px 0;
+  }
   .status-container {
     margin: 0 0 10px;
   }
@@ -163,9 +176,6 @@ export default {
   padding: 15px 0;
   text-align: center;
 }
-h1 {
-  margin: 22px 0 0 0;
-}
 
 @media only screen and (max-width:480px) {
   .checkbox-container {
diff --git a/src/views/users/index.vue b/src/views/users/index.vue
index 780f9b39..d6b12e68 100644
--- a/src/views/users/index.vue
+++ b/src/views/users/index.vue
@@ -245,7 +245,7 @@ export default {
 }
 .users-container {
   h1 {
-    margin: 22px 0 0 15px;
+    margin: 10px 0 0 15px;
   }
 
   .pagination {

From 65af72bd04d9d3d2559486bedd454fd6fe5e4474 Mon Sep 17 00:00:00 2001
From: Angelina Filippova <linakirsanova@gmail.com>
Date: Tue, 24 Mar 2020 16:22:54 +0000
Subject: [PATCH 5/6] Merge branch 'fix/settings-submit-button' into 'master'

Fix settings submit button position on wide screens

See merge request pleroma/admin-fe!106
---
 CHANGELOG.md                               |  1 +
 src/views/settings/components/Instance.vue |  5 ++++-
 src/views/settings/index.vue               |  7 +++++--
 src/views/settings/styles/main.scss        | 18 +++++++++++++++---
 4 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ac4e0a92..c8bf658b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ### Fixed
 
 - Fix parsing tuples in Pleroma.Upload.Filter.Mogrify and Pleroma.Emails.Mailer settings
+- Fix settings submit button position on wide screens when sidebar menu is open
 
 ## [2.0] - 2020-02-27
 
diff --git a/src/views/settings/components/Instance.vue b/src/views/settings/components/Instance.vue
index a8698350..4acc13e7 100644
--- a/src/views/settings/components/Instance.vue
+++ b/src/views/settings/components/Instance.vue
@@ -1,5 +1,5 @@
 <template>
-  <div v-if="!loading" class="form-container">
+  <div v-if="!loading" :class="isSidebarOpen" class="form-container">
     <el-form ref="instanceData" :model="instanceData" :label-width="labelWidth">
       <setting :setting-group="instance" :data="instanceData"/>
     </el-form>
@@ -82,6 +82,9 @@ export default {
     isMobile() {
       return this.$store.state.app.device === 'mobile'
     },
+    isSidebarOpen() {
+      return this.$store.state.app.sidebar.opened ? 'sidebar-opened' : 'sidebar-closed'
+    },
     isTablet() {
       return this.$store.state.app.device === 'tablet'
     },
diff --git a/src/views/settings/index.vue b/src/views/settings/index.vue
index 3d0bbcdb..87bcc9e6 100644
--- a/src/views/settings/index.vue
+++ b/src/views/settings/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="settings-container">
     <div v-if="isDesktop">
-      <div class="settings-header-container">
+      <div :class="isSidebarOpen" class="settings-header-container">
         <h1 class="settings-header">{{ $t('settings.settings') }}</h1>
         <div>
           <el-tooltip v-if="needReboot" :content="$t('settings.restartApp')" placement="bottom-end">
@@ -89,7 +89,7 @@
       </el-tabs>
     </div>
     <div v-if="isMobile || isTablet">
-      <div class="settings-header-container">
+      <div :class="isSidebarOpen" class="settings-header-container">
         <h1 class="settings-header">{{ $t('settings.settings') }}</h1>
         <el-button v-if="needReboot" class="settings-reboot-button" @click="restartApp">
           <span>
@@ -235,6 +235,9 @@ export default {
     isMobile() {
       return this.$store.state.app.device === 'mobile'
     },
+    isSidebarOpen() {
+      return this.$store.state.app.sidebar.opened ? 'header-sidebar-opened' : 'header-sidebar-closed'
+    },
     isTablet() {
       return this.$store.state.app.device === 'tablet'
     },
diff --git a/src/views/settings/styles/main.scss b/src/views/settings/styles/main.scss
index 562308b5..7f04820f 100644
--- a/src/views/settings/styles/main.scss
+++ b/src/views/settings/styles/main.scss
@@ -264,6 +264,12 @@
   .settings-header {
     margin: 0;
   }
+  .header-sidebar-opened {
+    max-width: 1585px;
+  }
+  .header-sidebar-closed {
+    max-width: 1728px;
+  }
   .settings-header-container {
     display: flex;
     height: 36px;
@@ -326,8 +332,15 @@
   }
 
   @media only screen and (min-width: 1824px) {
+    .sidebar-closed {
+      max-width: 1586px;
+    }
+    .sidebar-opened {
+      max-width: 1442px;
+    }
     .submit-button-container {
-      max-width: 1637px;
+      width: 100%;
+      max-width: inherit;
       margin-left: auto;
       margin-right: auto;
       right: auto;
@@ -530,8 +543,7 @@
       margin-right: 8px
     }
   }
-
-  @media only screen and (max-width:801px) and (min-width: 481px) {
+  @media only screen and (max-width:818px) and (min-width: 481px) {
     .delete-setting-button {
       margin: 4px 0 0 10px;
       height: 28px;

From e4dcbed6eaf0aade4f29799cd07411ed6132c430 Mon Sep 17 00:00:00 2001
From: Angelina Filippova <linakirsanova@gmail.com>
Date: Sat, 4 Apr 2020 21:39:04 +0300
Subject: [PATCH 6/6] Update Changelog for 2.0.2 release

---
 CHANGELOG.md | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c8bf658b..eeffd2c2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,17 +4,26 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
-## Unreleased
+## [2.0.2] - 2020-04-01
 
 ### Added
 
 - Ability to see local statuses in Statuses by instance section
 - Ability to configure Oban.Cron settings and settings for notifications streamer
+- Settings search
+- Ability to set user's password and email on user's page
+- Display status count by scope on Statuses page
+
+### Changed
+
+- Link to Pleroma docs when a non-admin user tries to log in 
 
 ### Fixed
 
 - Fix parsing tuples in Pleroma.Upload.Filter.Mogrify and Pleroma.Emails.Mailer settings
 - Fix settings submit button position on wide screens when sidebar menu is open
+- Updates links for downloading remote emoji packs
+- Fix parsing emails that have symbols in it
 
 ## [2.0] - 2020-02-27