Merge branch 'develop' into 'fix-move-type-notification'

# Conflicts: # static/fontello.json
2020-01-03 09:05:48 +00:00 · 2020-01-03 09:05:48 +00:00 · 215662afde
commit 215662afde
parent c3e7806acb 1a82a00a2b
54 changed files with 1548 additions and 982 deletions
--- a/src/components/settings/settings.vue
+++ b/src/components/settings/settings.vue
@ -73,6 +73,15 @@
                    </li>
                  </ul>
                </li>
+                <li>
+                  <Checkbox v-model="useStreamingApi">
+                    {{ $t('settings.useStreamingApi') }}
+                    <br/>
+                    <small>
+                    {{ $t('settings.useStreamingApiWarning') }}
+                    </small>
+                  </Checkbox>
+                </li>
                <li>
                  <Checkbox v-model="autoLoad">
                    {{ $t('settings.autoload') }}