From 0894306e5e817526420dc6cf6cfb82c46cb31b11 Mon Sep 17 00:00:00 2001 From: Eliot Berriot Date: Thu, 25 Jul 2019 15:43:21 +0200 Subject: [PATCH 1/3] Use Node:11 in CI --- .gitlab-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8bab09fdb..282757b4f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -17,7 +17,7 @@ stages: review_front: stage: review - image: node:9 + image: node:11 when: manual allow_failure: true before_script: @@ -159,7 +159,7 @@ test_api: test_front: stage: test - image: node:9 + image: node:11 before_script: - cd front only: @@ -181,7 +181,7 @@ test_front: build_front: stage: build - image: node:9 + image: node:11 before_script: - curl -L -o /usr/local/bin/jq https://github.com/stedolan/jq/releases/download/jq-1.5/jq-linux64 - chmod +x /usr/local/bin/jq From be0b120cea00d431ee3d9f9bdaf6d118eb3cf33e Mon Sep 17 00:00:00 2001 From: Eliot Berriot Date: Thu, 25 Jul 2019 15:38:44 +0200 Subject: [PATCH 2/3] Ensure we can transcode from video/ogg files too --- api/funkwhale_api/music/utils.py | 1 + 1 file changed, 1 insertion(+) diff --git a/api/funkwhale_api/music/utils.py b/api/funkwhale_api/music/utils.py index 84f55dda7..bf3a0daf6 100644 --- a/api/funkwhale_api/music/utils.py +++ b/api/funkwhale_api/music/utils.py @@ -30,6 +30,7 @@ def compute_status(jobs): AUDIO_EXTENSIONS_AND_MIMETYPE = [ + ("ogg", "video/ogg"), ("ogg", "audio/ogg"), ("opus", "audio/opus"), ("mp3", "audio/mpeg"), From 36c1bf7f90c73537ea28c211485f32460f0479f5 Mon Sep 17 00:00:00 2001 From: Eliot Berriot Date: Thu, 25 Jul 2019 14:34:46 +0200 Subject: [PATCH 3/3] Fixed a typo in audio unlock code --- front/src/components/audio/Player.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/front/src/components/audio/Player.vue b/front/src/components/audio/Player.vue index f074c14e0..0be5182d1 100644 --- a/front/src/components/audio/Player.vue +++ b/front/src/components/audio/Player.vue @@ -385,7 +385,7 @@ export default { self.ended() }, onunlock: function () { - if (this.$store.state.player.playing) { + if (self.$store.state.player.playing) { self.soundId = self.sound.play(self.soundId) } },