From a14dfd9e9efe455761e8935c96d9c4d21ebd4c9a Mon Sep 17 00:00:00 2001 From: Georg Krause Date: Wed, 29 Dec 2021 21:50:11 +0100 Subject: [PATCH 01/18] Add missing contributors to Changelog --- CHANGELOG | 119 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 119 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index ef7933f48..3aa137796 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -80,6 +80,125 @@ Other: - Create stable branch, master is now deprecated and will be removed in 1.3 (#1476) +Committers: + +Alexandra Parker +Alyssa Ross +appzer0 +Arthur Brugière +Asier Iturralde Sarasola +bittin +Blopware +Brian McMillen +Christoph Pomaska +Ciaran Ainsworth +Ciarán Ainsworth +Classified +Connor Hay +Damian Szetela +David Marzal +Deleted User +Dignified Silence +Dominik Danelski +egon0 +Erik Präntare +Georg Abenthung +Georgios B +Georgios Brellas +Georg Krause +ghose +greengekota +heyarne +ian Vatega +Janek +jovuit +JuniorJPDJ +Konstantinos G +manuelviens +Manuel Viens +Marcos +Marcos Peña +Martin Giger +Matthew J +Micha Gläß-Stöcker +petitminion +Petitminion +Philipp Wolfer +Porrumentzio +Quentin PAGÈS +Raphael Lullis +Riccardo Sacchetto +Romain Failliot +Rubén Cabrera +Ryan Harg +Sergio Varela +SpcCw +Stefano Pigozzi +Thomas +Tony Simoes +Tony Wasserka +vachan-maker +Virgile Robles + +Contributors to our Issues: + +AMoonRabbit +Agate +Antoine POPINEAU +Arthur Brugière +Ciarán Ainsworth +Connor Hay +Creak +David Marzal +Georg Krause +Gerhard Beck +Greg Poole +JuniorJPDJ +Kuba Orlik +Lunar Control +Marcos Peña +Mateusz Korzeniewski +Mathieu Jourdan +Micha Gläß-Stöcker +Philipp Wolfer +Porrumentzio +Thomas +Tony Wasserka +Ville Ranki +arkhi +heyarne +interfect +jovuit +mal +petitminion +vachan-maker + +Contributors to our Merge Requests: + +Agate +Arthur Brugière +Ciarán Ainsworth +Connor Hay +David Marzal +Distopico +Fanyx +Georg Abenthung +Georg Krause +Janek +JuniorJPDJ +Kasper Seweryn +Marcos Peña +Mathieu Jourdan +Matthew J. +Micha Gläß-Stöcker +Philipp Wolfer +Thomas +Tony Wasserka +heyarne +jovuit +petitminion +thanksd + 1.1.4 (2021-08-02) ------------------ From f5446ae4e180ff37003d823ed2f20b149f9bd716 Mon Sep 17 00:00:00 2001 From: Georg Krause Date: Wed, 29 Dec 2021 21:52:30 +0100 Subject: [PATCH 02/18] Add note for wrong artifact download URL to changelog --- CHANGELOG | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 3aa137796..c74d1887a 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -16,6 +16,10 @@ This changelog is viewable on the web at https://docs.funkwhale.audio/changelog. Upgrade instructions are available at https://docs.funkwhale.audio/admin/upgrading.html +Due to a bug in our CI Pipeline frontend artifacts are not available at +https://dev.funkwhale.audio/funkwhale/funkwhale/builds/artifacts/1.2.0/download?job=build_front as they would usually. +Please use this URL to get your frontend build: https://dev.funkwhale.audio/funkwhale/funkwhale/-/jobs/81069/artifacts/download + Features: - Implemented awesome recently added radio (part of #1390) From 83b01c13e8e0e31644284d729e7b26eff4125ddb Mon Sep 17 00:00:00 2001 From: Georg Krause Date: Thu, 30 Dec 2021 06:50:30 +0100 Subject: [PATCH 03/18] Add deprecation warning to AIO docker docs --- docs/installation/docker.rst | 14 +++++++++----- docs/installation/index.rst | 5 +++++ docs/installation/non_amd64_architectures.rst | 5 +++++ 3 files changed, 19 insertions(+), 5 deletions(-) diff --git a/docs/installation/docker.rst b/docs/installation/docker.rst index 5686b4f1a..6f2db858b 100644 --- a/docs/installation/docker.rst +++ b/docs/installation/docker.rst @@ -8,20 +8,24 @@ We support two types of Docker deployments: - :ref:`Mono-container `: all processes live in the same container (database, nginx, redis, etc.). It's easier to deploy and to integrate with container management systems like Portainer. However, it's not possible to scale this type of deployment on multiple servers. - :ref:`Multi-container `: each process lives in a dedicated container. This setup is more involved but also more flexible and scalable. -.. note:: +.. warning:: - We do not distribute Docker images for non-amd64 architectures yet. However, :doc:`you can easily build - those images yourself following our instructions `, and come back to this installation guide once - the build is over. + The All-In-One-Container or Mono-Container installation is deprecated, don't use it for new installations. + For more information, visit our blog: https://blog.funkwhale.audio/deprecation-all-in-one-container.html .. _docker-mono-container: Mono-container installation --------------------------- +.. warning:: + + The All-In-One-Container or Mono-Container installation is deprecated, don't use it for new installations. + For more information, visit our blog: https://blog.funkwhale.audio/deprecation-all-in-one-container.html + .. note:: - This installation method was contributed by @thetarkus, at https://github.com/thetarkus/docker-funkwhale + This installation method was originally contributed by `@thetarkus `_ These are the installation steps: diff --git a/docs/installation/index.rst b/docs/installation/index.rst index b951d6227..b62764538 100644 --- a/docs/installation/index.rst +++ b/docs/installation/index.rst @@ -76,6 +76,11 @@ Available installation methods ------------------------------- Funkwhale can be installed using one of the following method: + +.. warning:: + + The All-In-One-Container or Mono-Container installation is deprecated, don't use it for new installations. + For more information, visit our blog: https://blog.funkwhale.audio/deprecation-all-in-one-container.html - Quick install, the most straight forward way to get Funkwhale; - Mono-container Docker installation; diff --git a/docs/installation/non_amd64_architectures.rst b/docs/installation/non_amd64_architectures.rst index 9fe3ba9f7..6ddd75ca5 100644 --- a/docs/installation/non_amd64_architectures.rst +++ b/docs/installation/non_amd64_architectures.rst @@ -44,6 +44,11 @@ guide. Building the mono-container Docker image (funkwhale/all-in-one) --------------------------------------------------------------- +.. warning:: + + The All-In-One-Container or Mono-Container installation is deprecated, don't use it for new installations. + For more information, visit our blog: https://blog.funkwhale.audio/deprecation-all-in-one-container.html + This image is intended to be used in conjunction with our :ref:`Mono-container installation guide `. guide. From ec9f8e161112ab738c37865c27bcd61ad24b6c8f Mon Sep 17 00:00:00 2001 From: Georg Krause Date: Wed, 29 Dec 2021 20:17:44 +0100 Subject: [PATCH 04/18] Fix remote content page --- changes/changelog.d/1655.bugfix | 1 + front/src/views/content/libraries/Form.vue | 2 +- front/src/views/content/remote/Home.vue | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 changes/changelog.d/1655.bugfix diff --git a/changes/changelog.d/1655.bugfix b/changes/changelog.d/1655.bugfix new file mode 100644 index 000000000..f5607d3c5 --- /dev/null +++ b/changes/changelog.d/1655.bugfix @@ -0,0 +1 @@ +Fix remote content page (#1655) diff --git a/front/src/views/content/libraries/Form.vue b/front/src/views/content/libraries/Form.vue index 3a81d322a..4134783d1 100644 --- a/front/src/views/content/libraries/Form.vue +++ b/front/src/views/content/libraries/Form.vue @@ -119,7 +119,7 @@ import MixinsTranslation from '@/components/mixins/Translations.vue' export default { mixins: [MixinsTranslation], - props: { library: { type: Object, required: true } }, + props: { library: { type: Object, default: Null } }, data () { const d = { isLoading: false, diff --git a/front/src/views/content/remote/Home.vue b/front/src/views/content/remote/Home.vue index eb24bb1b6..7a2b68feb 100644 --- a/front/src/views/content/remote/Home.vue +++ b/front/src/views/content/remote/Home.vue @@ -33,7 +33,7 @@