Merge branch 'develop' into 'themes-accent'

# Conflicts: # src/components/emoji_reactions/emoji_reactions.vue
2020-02-11 23:09:15 +00:00 · 2020-02-11 23:09:15 +00:00 · 84ebae8ed3
commit 84ebae8ed3
parent 60446c56a5 96dc297bab
28 changed files with 352 additions and 55 deletions
--- a/src/components/settings/settings.vue
+++ b/src/components/settings/settings.vue
@ -92,6 +92,11 @@
                    {{ $t('settings.reply_link_preview') }}
                  </Checkbox>
                </li>
+                <li>
+                  <Checkbox v-model="emojiReactionsOnTimeline">
+                    {{ $t('settings.emoji_reactions_on_timeline') }}
+                  </Checkbox>
+                </li>
              </ul>
            </div>

@ -328,6 +333,11 @@
                      {{ $t('settings.notification_visibility_moves') }}
                    </Checkbox>
                  </li>
+                  <li>
+                    <Checkbox v-model="notificationVisibility.emojiReactions">
+                      {{ $t('settings.notification_visibility_emoji_reactions') }}
+                    </Checkbox>
+                  </li>
                </ul>
              </div>
              <div>