From b231b12afd73a257cc7c0decd50fa3c861646141 Mon Sep 17 00:00:00 2001 From: Georg Krause Date: Fri, 2 Jun 2023 08:56:11 +0200 Subject: [PATCH 01/68] docs: Add redirect for outdated postgres upgrade guide link Part-of: --- docs/redirects.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/redirects.txt b/docs/redirects.txt index d227133a7..d3f3d1ce2 100644 --- a/docs/redirects.txt +++ b/docs/redirects.txt @@ -52,3 +52,4 @@ documentation/index.html, ../contributor/documentation.html translators.html, ../contributor/translation.html federation.html, ../developer/federation/index.html upgrading.html, ../administrator/upgrade/index.html +administrator_documentation/upgrade_docs/docker.html, ../../administrator/upgrade/docker.html From b0cd9dc27a0d336cb9e7f0799e7ece926ef19880 Mon Sep 17 00:00:00 2001 From: Georg Krause Date: Fri, 2 Jun 2023 08:56:35 +0200 Subject: [PATCH 02/68] fix(changelog): Update link to postgres upgrade guide in changelog Part-of: --- CHANGELOG | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index 2b743f3b5..d58d93920 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -55,7 +55,7 @@ Update instructions: sudo docker compose up -d After this you can continue to use the **docker compose** syntax for all Docker management tasks. -- Upgrade Postgres to version 15. [Make sure to migrate!](https://docs.funkwhale.audio/administrator_documentation/upgrade_docs/docker.html#upgrade-the-postgres-container) +- Upgrade Postgres to version 15. [Make sure to migrate!](https://docs.funkwhale.audio/administrator/upgrade/docker.html#upgrade-the-postgres-container) - With this update Funkwhale starts using poetry to maintain its dependencies. We therefore recommend removing the old virtualenv by running `rm -rf /srv/funkwhale/virtualenv`. From ea59e99e54f84c1776f63a9d7faab043b6fea9a1 Mon Sep 17 00:00:00 2001 From: Georg Krause Date: Fri, 2 Jun 2023 09:20:13 +0200 Subject: [PATCH 03/68] chore: Bump myst-parser to fix documentation hub Part-of: --- docs/poetry.lock | 22 +++++++++++----------- docs/pyproject.toml | 2 +- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/docs/poetry.lock b/docs/poetry.lock index 4845bb07a..be44bfd0f 100644 --- a/docs/poetry.lock +++ b/docs/poetry.lock @@ -430,30 +430,30 @@ files = [ [[package]] name = "myst-parser" -version = "0.18.1" -description = "An extended commonmark compliant parser, with bridges to docutils & sphinx." +version = "1.0.0" +description = "An extended [CommonMark](https://spec.commonmark.org/) compliant parser," category = "main" optional = false python-versions = ">=3.7" files = [ - {file = "myst-parser-0.18.1.tar.gz", hash = "sha256:79317f4bb2c13053dd6e64f9da1ba1da6cd9c40c8a430c447a7b146a594c246d"}, - {file = "myst_parser-0.18.1-py3-none-any.whl", hash = "sha256:61b275b85d9f58aa327f370913ae1bec26ebad372cc99f3ab85c8ec3ee8d9fb8"}, + {file = "myst-parser-1.0.0.tar.gz", hash = "sha256:502845659313099542bd38a2ae62f01360e7dd4b1310f025dd014dfc0439cdae"}, + {file = "myst_parser-1.0.0-py3-none-any.whl", hash = "sha256:69fb40a586c6fa68995e6521ac0a525793935db7e724ca9bac1d33be51be9a4c"}, ] [package.dependencies] docutils = ">=0.15,<0.20" jinja2 = "*" markdown-it-py = ">=1.0.0,<3.0.0" -mdit-py-plugins = ">=0.3.1,<0.4.0" +mdit-py-plugins = ">=0.3.4,<0.4.0" pyyaml = "*" -sphinx = ">=4,<6" -typing-extensions = "*" +sphinx = ">=5,<7" [package.extras] -code-style = ["pre-commit (>=2.12,<3.0)"] +code-style = ["pre-commit (>=3.0,<4.0)"] linkify = ["linkify-it-py (>=1.0,<2.0)"] -rtd = ["ipython", "sphinx-book-theme", "sphinx-design", "sphinxcontrib.mermaid (>=0.7.1,<0.8.0)", "sphinxext-opengraph (>=0.6.3,<0.7.0)", "sphinxext-rediraffe (>=0.2.7,<0.3.0)"] -testing = ["beautifulsoup4", "coverage[toml]", "pytest (>=6,<7)", "pytest-cov", "pytest-param-files (>=0.3.4,<0.4.0)", "pytest-regressions", "sphinx (<5.2)", "sphinx-pytest"] +rtd = ["ipython", "pydata-sphinx-theme (==v0.13.0rc4)", "sphinx-autodoc2 (>=0.4.2,<0.5.0)", "sphinx-book-theme (==1.0.0rc2)", "sphinx-copybutton", "sphinx-design2", "sphinx-pyscript", "sphinx-tippy (>=0.3.1)", "sphinx-togglebutton", "sphinxext-opengraph (>=0.7.5,<0.8.0)", "sphinxext-rediraffe (>=0.2.7,<0.3.0)"] +testing = ["beautifulsoup4", "coverage[toml]", "pytest (>=7,<8)", "pytest-cov", "pytest-param-files (>=0.3.4,<0.4.0)", "pytest-regressions", "sphinx-pytest"] +testing-docutils = ["pygments", "pytest (>=7,<8)", "pytest-param-files (>=0.3.4,<0.4.0)"] [[package]] name = "packaging" @@ -899,4 +899,4 @@ testing = ["big-O", "flake8 (<5)", "jaraco.functools", "jaraco.itertools", "more [metadata] lock-version = "2.0" python-versions = "^3.8" -content-hash = "87376494d84fe4c6ac6a8acd944e2d8e06074c94e4ddf765f37baf9d3ffdac97" +content-hash = "e2ddbf39eef68edbccfc2e9a365d6f9e26df851b41d6acf43a59319f5232b6ee" diff --git a/docs/pyproject.toml b/docs/pyproject.toml index 24bffa124..b3618246a 100644 --- a/docs/pyproject.toml +++ b/docs/pyproject.toml @@ -13,7 +13,7 @@ sphinx_design = "==0.3.0" sphinx-intl = "2.0.1" sphinx-rtd-theme = "==1.1.1" sphinxcontrib-mermaid = "0.7.1" -myst-parser = "==0.18.1" +myst-parser = "1.0.0" django = "==4.1.5" django-environ = "==0.9.0" From 8cc899325202aaf0e4015a9fdb3a97a4a694b4eb Mon Sep 17 00:00:00 2001 From: Georg Krause Date: Fri, 2 Jun 2023 09:08:28 +0200 Subject: [PATCH 04/68] fix(changelog): Fix rst syntax for changelog Part-of: --- CHANGELOG | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index d58d93920..6ca98c8b9 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -31,12 +31,12 @@ Update instructions: ``` .. note:: - If you need to customize your nginx template, e.g. to work around `problems with - Docker's resolver `_, you can mount your - custom nginx configuration into the container. Uncomment the commented volumes in the `nginx` section of your `docker-compose.yml`. - Additionally you need to update the paths in `nginx/funkwhale.template`. - Replace all occurrences of `/funkwhale` by `/usr/share/nginx/html`. - This loads the templates from your `nginx` folder and overrides the template files in the Docker container. + If you need to customize your nginx template, e.g. to work around `problems with + Docker's resolver `_, you can mount your + custom nginx configuration into the container. Uncomment the commented volumes in the `nginx` section of your `docker-compose.yml`. + Additionally you need to update the paths in `nginx/funkwhale.template`. + Replace all occurrences of `/funkwhale` by `/usr/share/nginx/html`. + This loads the templates from your `nginx` folder and overrides the template files in the Docker container. ``` docker-compose up -d @@ -47,11 +47,13 @@ Update instructions: 2. Stop your containers using the **docker-compose** syntax. .. code-block:: sh + sudo docker-compose down 3. Bring the containers back up using the **docker compose** syntax. .. code-block:: sh + sudo docker compose up -d After this you can continue to use the **docker compose** syntax for all Docker management tasks. From 9e7a5ebebbb43387fb7fab92d1b5a92ef00258ec Mon Sep 17 00:00:00 2001 From: Georg Krause Date: Tue, 6 Jun 2023 09:33:38 +0200 Subject: [PATCH 05/68] style: Remove useless blank line to make linter happy --- front/src/router/guards.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/front/src/router/guards.ts b/front/src/router/guards.ts index 914291a65..f9084416a 100644 --- a/front/src/router/guards.ts +++ b/front/src/router/guards.ts @@ -1,4 +1,3 @@ - import type { NavigationGuardNext, RouteLocationNamedRaw, RouteLocationNormalized } from 'vue-router' import type { Permission } from '~/store/auth' From 8100d83bcfcfe166d28b320f08626d8e53ff565f Mon Sep 17 00:00:00 2001 From: Moon Rabbit Date: Sun, 4 Jun 2023 12:18:32 +0000 Subject: [PATCH 06/68] Fix(front): Set correct PWA color theme. --- changes/changelog.d/2147.misc | 1 + front/index.html | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 changes/changelog.d/2147.misc diff --git a/changes/changelog.d/2147.misc b/changes/changelog.d/2147.misc new file mode 100644 index 000000000..368fcb206 --- /dev/null +++ b/changes/changelog.d/2147.misc @@ -0,0 +1 @@ +Fixed PWA Window theme color. diff --git a/front/index.html b/front/index.html index d1ef2e8c5..186250640 100644 --- a/front/index.html +++ b/front/index.html @@ -16,7 +16,7 @@ - +