Merge branch 'greentext-strikes-back' into shigusegubu

* greentext-strikes-back:
  eslint
  making dtluna proud or disgusted
  Made it optional
  Fix regex, tag detector condition
  adds greentext, also small fixes
  achieve the perfect speeeeen in media-upload
This commit is contained in:
Henry Jameson 2019-11-14 15:19:13 +02:00
commit 31aabd5fc7
10 changed files with 166 additions and 26 deletions

View file

@ -270,6 +270,17 @@
</li>
</ul>
</div>
<div class="setting-item">
<h2>{{ $t('settings.fun') }}</h2>
<ul class="setting-list">
<li>
<Checkbox v-model="greentext">
{{ $t('settings.greentext') }} {{ $t('settings.instance_default', { value: greentextLocalizedValue }) }}
</Checkbox>
</li>
</ul>
</div>
</div>
<div :label="$t('settings.theme')">