Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
wxcafé
funkwhale
Commits
452193c6
Verified
Commit
452193c6
authored
Feb 24, 2018
by
Eliot Berriot
Browse files
Merge branch 'release/0.5.1'
parents
ce482314
c415d759
Changes
7
Hide whitespace changes
Inline
Side-by-side
CHANGELOG
View file @
452193c6
...
...
@@ -5,6 +5,14 @@ Changelog
----------------
0.5.1 (2018-02-24)
------------------
- Front: Fixed broken ajax call on radio builder (#69)
- Front: Shuffle now restart next track from beginning (#70)
- Front: volume slider should now have the same style everywhere (#72)
0.5 (2018-02-24)
----------------
...
...
api/funkwhale_api/__init__.py
View file @
452193c6
# -*- coding: utf-8 -*-
__version__
=
'0.5'
__version__
=
'0.5
.1
'
__version_info__
=
tuple
([
int
(
num
)
if
num
.
isdigit
()
else
num
for
num
in
__version__
.
replace
(
'-'
,
'.'
,
1
).
split
(
'.'
)])
deploy/nginx.conf
View file @
452193c6
# Ensure you update at least the server_name variables to match your own
# domain
# transcode cache
proxy_cache_path
/tmp/funkwhale-transcode
levels=1:2
keys_zone=transcode:10m
max_size=1g
inactive=7d
;
# domain
upstream
funkwhale-api
{
# depending on your setup, you may want to udpate this
server
localhost
:
5000
;
...
...
@@ -85,7 +88,7 @@ server {
}
proxy_set_header
X-Forwarded-Host
$host
:
$server_port
;
proxy_set_header
X-Forwarded-Port
$server_port
;
proxy_pass
http://
api:12081
/api/v1/trackfiles/viewable/?
$query
;
proxy_pass
http://
funkwhale-api
/api/v1/trackfiles/viewable/?
$query
;
proxy_pass_request_body
off
;
proxy_set_header
Content-Length
""
;
}
...
...
front/src/components/audio/Player.vue
View file @
452193c6
...
...
@@ -310,6 +310,54 @@ export default {
cursor
:
pointer
;
display
:
none
;
}
input
[
type
=
range
]
{
-webkit-appearance
:
none
;
}
input
[
type
=
range
]
:focus
{
outline
:
none
;
}
input
[
type
=
range
]
::-webkit-slider-runnable-track
{
cursor
:
pointer
;
background
:
white
;
}
input
[
type
=
range
]
::-webkit-slider-thumb
{
background
:
white
;
cursor
:
pointer
;
-webkit-appearance
:
none
;
}
input
[
type
=
range
]
:focus::-webkit-slider-runnable-track
{
background
:
#white
;
}
input
[
type
=
range
]
::-moz-range-track
{
cursor
:
pointer
;
background
:
white
;
}
input
[
type
=
range
]
::-moz-range-thumb
{
background
:
white
;
cursor
:
pointer
;
}
input
[
type
=
range
]
::-ms-track
{
cursor
:
pointer
;
background
:
transparent
;
border-color
:
transparent
;
color
:
transparent
;
}
input
[
type
=
range
]
::-ms-fill-lower
{
background
:
white
;
}
input
[
type
=
range
]
::-ms-fill-upper
{
background
:
white
;
}
input
[
type
=
range
]
::-ms-thumb
{
background
:
white
;
cursor
:
pointer
;
}
input
[
type
=
range
]
:focus::-ms-fill-lower
{
background
:
white
;
}
input
[
type
=
range
]
:focus::-ms-fill-upper
{
background
:
#white
;
}
&
:hover
{
[
type
=
"range"
]
{
display
:
block
;
...
...
front/src/components/library/radios/Filter.vue
View file @
452193c6
...
...
@@ -114,7 +114,7 @@ export default {
settings
.
fields
=
f
.
autocomplete_fields
settings
.
minCharacters
=
1
settings
.
apiSettings
=
{
url
:
config
.
BACKEND_URL
+
f
.
autocomplete
+
'
?
'
+
f
.
autocomplete_qs
,
url
:
f
.
autocomplete
+
'
?
'
+
f
.
autocomplete_qs
,
beforeXHR
:
function
(
xhrObject
)
{
xhrObject
.
setRequestHeader
(
'
Authorization
'
,
self
.
$store
.
getters
[
'
auth/header
'
])
return
xhrObject
...
...
front/src/store/queue.js
View file @
452193c6
...
...
@@ -142,6 +142,7 @@ export default {
},
shuffle
({
dispatch
,
commit
,
state
})
{
let
shuffled
=
_
.
shuffle
(
state
.
tracks
)
commit
(
'
player/currentTime
'
,
0
,
{
root
:
true
})
commit
(
'
tracks
'
,
[])
dispatch
(
'
appendMany
'
,
{
tracks
:
shuffled
})
}
...
...
front/test/unit/specs/store/queue.spec.js
View file @
452193c6
...
...
@@ -322,6 +322,7 @@ describe('store/queue', () => {
action
:
store
.
actions
.
shuffle
,
params
:
{
state
:
{
tracks
:
tracks
}},
expectedMutations
:
[
{
type
:
'
player/currentTime
'
,
payload
:
0
,
options
:
{
root
:
true
}},
{
type
:
'
tracks
'
,
payload
:
[]
}
],
expectedActions
:
[
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment