diff --git a/CHANGELOG b/CHANGELOG index 5572a45ead0c91c605f2a7214a00a0a2f158a50e..c02e7665e1fe5de08762c1cc24ad77dad397b045 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -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) ---------------- diff --git a/api/funkwhale_api/__init__.py b/api/funkwhale_api/__init__.py index 7675f9251bc44f178c27e0c96b7846a0a5410931..d3e404f122db7601939f9f3cea1ce64a6cc60383 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('.')]) diff --git a/deploy/nginx.conf b/deploy/nginx.conf index dfdbac2ae909bf9d5efafb1698f4fd8256e17eba..cf3b34056bc463e56ff9f306c333a908fdca6f60 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 ""; } diff --git a/front/src/components/audio/Player.vue b/front/src/components/audio/Player.vue index 5e9965158c7a50ada134f51774f046344810ddd2..a6cd80523a7ca28a91bb4d0ccf8ba8ea24cc77e9 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; diff --git a/front/src/components/library/radios/Filter.vue b/front/src/components/library/radios/Filter.vue index 722ecbfbe93ce5afee0227ac476d034e21547705..0b71115fd25e943be39d837ad4d3ec12f10866b2 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 diff --git a/front/src/store/queue.js b/front/src/store/queue.js index ac28a1e0e9cbef5b384f08517e537f56032b0c4b..1725699d0ba1d78f166fd1177a5168ae83694b04 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 8a79c07bd982cd8df7b58231a184898b1cea3aca..3b970647fc163f606adc816e7c3c38848b980443 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: [