MirrorMirror
/
funkwhale
mirror of https://dev.funkwhale.audio/funkwhale/funkwhale.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

This commit is contained in:
Eliot Berriot 2019-01-22 11:42:00 +01:00
parent 924f44c661 de7b131468
commit af2b4965cd
No known key found for this signature in database
GPG Key ID: DD6965E2476E5C27
4 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
deploy/env.prod.sample
View File

@ -109,8 +109,8 @@ RAVEN_DSN=https://44332e9fdd3d42879c7d35bf8562c6a4:0062dc16a22b41679cd5765e5342f
# You can safely leave those settings uncommented if you don't plan to use # You can safely leave those settings uncommented if you don't plan to use
# in place imports. # in place imports.
# Typical docker setup: # Typical docker setup:
# MUSIC_DIRECTORY_PATH=/srv/funkwhale/data/music # MUSIC_DIRECTORY_PATH=/music # docker-only
# MUSIC_DIRECTORY_SERVE_PATH=/music # docker-only # MUSIC_DIRECTORY_SERVE_PATH=/srv/funkwhale/data/music
# Typical non-docker setup: # Typical non-docker setup:
# MUSIC_DIRECTORY_PATH=/srv/funkwhale/data/music # MUSIC_DIRECTORY_PATH=/srv/funkwhale/data/music
# # MUSIC_DIRECTORY_SERVE_PATH= # stays commented, not needed # # MUSIC_DIRECTORY_SERVE_PATH= # stays commented, not needed

2
docs/developpers/subsonic.rst
View File

@ -7,7 +7,7 @@ with various apps in the Subsonic ecosystem (See :doc:`../users/apps`).
Supported endpoints Supported endpoints
------------------- -------------------
We seek the best compatibility with existing apps and Will eventually implement We seek the best compatibility with existing apps and will eventually implement
all endpoints that match Funkwhale's feature set. However, the current implementation all endpoints that match Funkwhale's feature set. However, the current implementation
do not include folder-based endpoints, as it does not match our internal model at all do not include folder-based endpoints, as it does not match our internal model at all
and will require substantial effort to emulate. and will require substantial effort to emulate.

1
docs/installation/index.rst
View File

@ -77,6 +77,7 @@ Funkwhale packages are available for the following platforms:
- `YunoHost 3 <https://yunohost.org/>`_: https://github.com/YunoHost-Apps/funkwhale_ynh (kindly maintained by `@Jibec <https://github.com/Jibec>`_) - `YunoHost 3 <https://yunohost.org/>`_: https://github.com/YunoHost-Apps/funkwhale_ynh (kindly maintained by `@Jibec <https://github.com/Jibec>`_)
- 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) - 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)
Running Funkwhale on the develop branch Running Funkwhale on the develop branch
--------------------------------------- ---------------------------------------

18
docs/users/apps.rst
View File

@ -95,9 +95,25 @@ DSub is a full-featured Subsonic client that works great, and has a lot of featu
It's one of the recommended Android client to use with Funkwhale, as we are doing It's one of the recommended Android client to use with Funkwhale, as we are doing
our Android tests on this one. our Android tests on this one.
play:Sub (iOS)
^^^^^^^^^^^^^^
- Price: $4,99
- App Store: https://itunes.apple.com/us/app/play-sub-subsonic-music-streamer/id955329386
- Website: http://michaelsapps.dk/playsubapp/
Although paying, this app is known to work great with Funkwhale as the maintainer, Michael Bech Hansen implements Funkwhale
specific logic and checks.
Substreamer (iOS)
^^^^^^^^^^^^^^^^^
- Price: free
- App Store: https://itunes.apple.com/us/app/substreamer/id1012991665
Clementine (Desktop) Clementine (Desktop)
^^^^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^
- Price: free - Price: free
- Website: https://www.clementine-player.org/fr/ - Website: https://www.clementine-player.org/fr/