Merge remote-tracking branch 'origin/activitypub/document/image' into activitypub/document/image

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
pull/53/head
Maxence Lange 2018-11-27 11:53:28 -01:00
commit ea5c2469c2
2 zmienionych plików z 5 dodań i 2 usunięć

Wyświetl plik

@ -17,7 +17,7 @@
<bugs>https://github.com/nextcloud/social/issues</bugs>
<screenshot>https://raw.githubusercontent.com/nextcloud/social/master/screenshots/screenshot.png</screenshot>
<dependencies>
<nextcloud min-version="15" max-version="15"/>
<nextcloud min-version="15" max-version="16"/>
</dependencies>
<navigations>
<navigation>

Wyświetl plik

@ -61,7 +61,7 @@
<input :value="t('social', 'Post')" :disabled="post.length < 1" class="submit primary"
type="submit" title="" data-original-title="Post">
<div>
<button :class="currentVisibilityIconClass" @click="togglePopoverMenu" />
<button :class="currentVisibilityIconClass" @click.prevent="togglePopoverMenu" />
<div :class="{open: menuOpened}" class="popovermenu">
<PopoverMenu :menu="visibilityPopover" />
</div>
@ -308,6 +308,9 @@ export default {
+ '<a href="' + item.original.url + '" target="_blank"><img src="' + item.original.avatar + '" />@' + item.original.value + '</a></span>'
},
values: (text, cb) => {
if (text.length < 1) {
cb([])
}
this.remoteSearch(text).then((result) => {
let users = []
if (result.data.result.exact) {