Merge branch 'develop'

This commit is contained in:
syuilo
2019-04-24 15:23:48 +09:00
146 changed files with 1813 additions and 899 deletions

View File

@@ -123,10 +123,10 @@ export default Vue.extend({
this.$root.dialog({
title: this.$t('list-name'),
input: true
}).then(async ({ canceled, result: title }) => {
}).then(async ({ canceled, result: name }) => {
if (canceled) return;
const list = await this.$root.api('users/lists/create', {
title
name
});
this.list = list;

View File

@@ -44,7 +44,8 @@
<div v-if="announcements && announcements.length > 0">
<div v-for="announcement in announcements">
<h1 v-html="announcement.title"></h1>
<div v-html="announcement.text"></div>
<mfm :text="announcement.text"/>
<img v-if="announcement.image" :src="announcement.image" alt="" style="display: block; max-height: 130px; max-width: 100%;"/>
</div>
</div>
</div>