Merge branch 'master' into develop

This commit is contained in:
Agate 2020-06-05 06:33:33 +02:00
commit 15dfca1c55
No known key found for this signature in database
GPG Key ID: 6B501DFD73514E14
4 changed files with 4 additions and 1 deletions

View File

@ -0,0 +1 @@
Ensure firefox password manager dont autofill username in search bar (#1090)

View File

@ -61,6 +61,7 @@ Funkwhale packages are available for the following platforms:
- ArchLinux (as an AUR package): if you'd rather use a package, check out this alternative installation method on ArchLinux: https://wiki.archlinux.org/index.php/Funkwhale (package and wiki kindly maintained by getzee)
- `NixOS <https://github.com/mmai/funkwhale-nixos>`_ (kindly maintained by @mmai)
- `Helm chart <https://gitlab.com/ananace/charts/>`_ to install Funkwhale on Kubernetes (kindly maintained by `@ananace <https://gitlab.com/ananace>`_)
- `HomelabOS <https://homelabos.com/docs/software/funkwhale/>`_
Project architecture
--------------------

View File

@ -436,6 +436,7 @@ export default {
param = "token"
value = this.$store.state.auth.scopedTokens.listen
}
console.log('HELLO', param, value, this.$store.state.auth.scopedTokens)
sources.forEach(e => {
e.url = url.updateQueryString(e.url, param, value)
})

View File

@ -1,7 +1,7 @@
<template>
<div class="ui fluid category search">
<slot></slot><div class="ui icon input">
<input ref="search" class="prompt" name="search" :placeholder="labels.placeholder" type="text" @keydown.esc="$event.target.blur()">
<input ref="search" type="search" class="prompt" name="search" :placeholder="labels.placeholder" @keydown.esc="$event.target.blur()">
<i class="search icon"></i>
</div>
<div class="results"></div>