From c6b965c8e215e9a1eb78b59cd839c06f63650e2a Mon Sep 17 00:00:00 2001 From: Eliot Berriot Date: Sat, 24 Feb 2018 16:57:01 +0100 Subject: [PATCH 1/5] Updated sample nginx conf --- deploy/nginx.conf | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/deploy/nginx.conf b/deploy/nginx.conf index dfdbac2ae..cf3b34056 100644 --- a/deploy/nginx.conf +++ b/deploy/nginx.conf @@ -1,6 +1,9 @@ # 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 ""; } From d1df33544e4bd31d63c60a3c3144717773c17a6d Mon Sep 17 00:00:00 2001 From: Eliot Berriot Date: Sat, 24 Feb 2018 17:22:40 +0100 Subject: [PATCH 2/5] Front: Fixed broken ajax call on radio builder (#69) --- CHANGELOG | 1 + front/src/components/library/radios/Filter.vue | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index 5572a45ea..0a6e27daf 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -4,6 +4,7 @@ Changelog 0.6 (Unreleased) ---------------- +- Front: Fixed broken ajax call on radio builder (#69) 0.5 (2018-02-24) ---------------- diff --git a/front/src/components/library/radios/Filter.vue b/front/src/components/library/radios/Filter.vue index 722ecbfbe..0b71115fd 100644 --- a/front/src/components/library/radios/Filter.vue +++ b/front/src/components/library/radios/Filter.vue @@ -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 From 92b6afa87a692917e8c4fc292e0d2581a24f7072 Mon Sep 17 00:00:00 2001 From: Eliot Berriot Date: Sat, 24 Feb 2018 17:55:05 +0100 Subject: [PATCH 3/5] Fix #72: volume slider should now have the same style everywhere --- CHANGELOG | 1 + front/src/components/audio/Player.vue | 48 +++++++++++++++++++++++++++ 2 files changed, 49 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 0a6e27daf..a35f15932 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -5,6 +5,7 @@ Changelog ---------------- - Front: Fixed broken ajax call on radio builder (#69) +- Front: volume slider should now have the same style everywhere (#72) 0.5 (2018-02-24) ---------------- diff --git a/front/src/components/audio/Player.vue b/front/src/components/audio/Player.vue index 5e9965158..a6cd80523 100644 --- a/front/src/components/audio/Player.vue +++ b/front/src/components/audio/Player.vue @@ -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; From 541ac2904731a2bbd0d28f4b82217f163103ba76 Mon Sep 17 00:00:00 2001 From: Eliot Berriot Date: Sat, 24 Feb 2018 17:34:06 +0100 Subject: [PATCH 4/5] Front: Shuffle now restart next track from beginning (#70) --- CHANGELOG | 2 ++ front/src/components/audio/Player.vue | 6 ------ front/src/store/queue.js | 1 + front/test/unit/specs/store/queue.spec.js | 1 + 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 0a6e27daf..0f09eda42 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -5,6 +5,8 @@ Changelog ---------------- - Front: Fixed broken ajax call on radio builder (#69) +- Front: Shuffle now restart next track from beginning (#70) + 0.5 (2018-02-24) ---------------- diff --git a/front/src/components/audio/Player.vue b/front/src/components/audio/Player.vue index 5e9965158..0fe36fac4 100644 --- a/front/src/components/audio/Player.vue +++ b/front/src/components/audio/Player.vue @@ -308,12 +308,6 @@ export default { bottom: 5px; left: 10%; cursor: pointer; - display: none; - } - &:hover { - [type="range"] { - display: block; - } } } diff --git a/front/src/store/queue.js b/front/src/store/queue.js index ac28a1e0e..1725699d0 100644 --- a/front/src/store/queue.js +++ b/front/src/store/queue.js @@ -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}) } diff --git a/front/test/unit/specs/store/queue.spec.js b/front/test/unit/specs/store/queue.spec.js index 8a79c07bd..3b970647f 100644 --- a/front/test/unit/specs/store/queue.spec.js +++ b/front/test/unit/specs/store/queue.spec.js @@ -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: [ From c415d759e4cfc493b1d18456efc90544a6600ba6 Mon Sep 17 00:00:00 2001 From: Eliot Berriot Date: Sat, 24 Feb 2018 18:07:51 +0100 Subject: [PATCH 5/5] Version bump and changelog --- CHANGELOG | 5 +++++ api/funkwhale_api/__init__.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index 72e98a449..c02e7665e 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -4,10 +4,15 @@ Changelog 0.6 (Unreleased) ---------------- + +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) ---------------- diff --git a/api/funkwhale_api/__init__.py b/api/funkwhale_api/__init__.py index 7675f9251..d3e404f12 100644 --- a/api/funkwhale_api/__init__.py +++ b/api/funkwhale_api/__init__.py @@ -1,3 +1,3 @@ # -*- 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('.')])