Merge branch 'develop' into improve-media

This commit is contained in:
tamaina 2018-09-15 22:15:56 +09:00 committed by GitHub
commit 8f8c67ad6d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
200 changed files with 6781 additions and 2331 deletions

View file

@ -1,5 +1,5 @@
<template>
<div class="qjewsnkgzzxlxtzncydssfbgjibiehcy" v-if="image.isSensitive && hide" @click="hide = false">
<div class="qjewsnkgzzxlxtzncydssfbgjibiehcy" v-if="image.isSensitive && hide && !$store.state.device.alwaysShowNsfw" @click="hide = false">
<div>
<b>%fa:exclamation-triangle% %i18n:@sensitive%</b>
<span>%i18n:@click-to-show%</span>