Skip to content

Commit dfd39d8

Browse files
committed
Merge remote-tracking branch 'upstream/2.5'
2 parents 6e682bf + 5b18060 commit dfd39d8

25 files changed

Lines changed: 392 additions & 57 deletions

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
runs-on: ubuntu-24.04
1616
if: github.event_name == 'push' || github.event_name == 'repository_dispatch'
1717
steps:
18-
- uses: actions/checkout@v4
18+
- uses: actions/checkout@v5
1919
with:
2020
ref: main
2121
fetch-depth: 0
@@ -43,7 +43,7 @@ jobs:
4343
name: PDF
4444
runs-on: ubuntu-latest
4545
steps:
46-
- uses: actions/checkout@v4
46+
- uses: actions/checkout@v5
4747
- name: Setup PDF Build Dependencies
4848
run: >
4949
sudo apt-get update && sudo apt-get install -y

.github/workflows/changelog.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
- name: Event Information
2222
run: echo "Event '${{ github.event.action }}' received from '${{ github.event.client_payload.repository }}'"
2323
- name: Check out repository
24-
uses: actions/checkout@v4
24+
uses: actions/checkout@v5
2525
with:
2626
ref: ${{ github.event.client_payload.branch }}
2727
- name: Set up Python

.github/workflows/pre-commit.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
pre-commit:
99
runs-on: ubuntu-latest
1010
steps:
11-
- uses: actions/checkout@v4
11+
- uses: actions/checkout@v5
1212
- uses: actions/setup-python@v5
1313
- uses: pre-commit/action@v3.0.1
1414
env:

.github/workflows/sphinx.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
runs-on: ubuntu-latest
1111
steps:
1212
- name: Clone repository
13-
uses: actions/checkout@v4
13+
uses: actions/checkout@v5
1414
- name: Set up Python
1515
uses: actions/setup-python@v5
1616
with:
@@ -27,7 +27,7 @@ jobs:
2727
runs-on: ubuntu-latest
2828
steps:
2929
- name: Clone repository
30-
uses: actions/checkout@v4
30+
uses: actions/checkout@v5
3131
- name: Set up Graphviz
3232
run: sudo apt update && sudo apt install -y graphviz
3333
- name: Set up Python

source/_static/controllers/icon_p1nano.svg

Lines changed: 2 additions & 0 deletions
Loading
Lines changed: 2 additions & 0 deletions
Loading
Lines changed: 2 additions & 0 deletions
Loading

source/chapters/appendix/additional_resources.rst

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,11 @@ There are a variety of other resources where you can find out more:
3737
`<https://github.com/mixxxdj/mixxx/issues>`_
3838

3939
* **Mixxx Translations**: To translate Mixxx and promote your mother tongue, go
40-
to: `<https://www.transifex.com/mixxx-dj-software/public/>`_. Please
40+
to: `<https://explore.transifex.com/mixxx-dj-software/mixxxdj/>`_. Please
4141
read the `Translation FAQ <https://github.com/mixxxdj/mixxx/wiki/internationalization>`_
4242
first.
4343

4444
* **Social Media**: Follow us on `Mastodon <https://floss.social/@mixxx>`_,
45-
`Twitter <https://twitter.com/mixxxdj>`_, and
46-
`Facebook <https://www.facebook.com/pages/Mixxx-DJ-Software/21723485212>`_.
45+
`Bluesky <https://bsky.app/profile/mixxx.bsky.social>`_,
46+
`Facebook <https://www.facebook.com/pages/Mixxx-DJ-Software/21723485212>`_ and
47+
`YouTube <https://www.youtube.com/@mixxxdj/posts>`_

source/chapters/appendix/changelog.rst

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -383,7 +383,8 @@ Library
383383
^^^^^^^
384384

385385

386-
* Fix playlist export when name contains a dot `#14737 <https://github.com/mixxxdj/mixxx/pull/14737>`__
386+
* Fix playlist export when name contains a dot
387+
`#14737 <https://github.com/mixxxdj/mixxx/pull/14737>`__
387388
* Fix loading the wrong track via drag and drop when using symlinks
388389
`#13708 <https://github.com/mixxxdj/mixxx/pull/13708>`__
389390
`#13706 <https://github.com/mixxxdj/mixxx/issues/13706>`__
@@ -396,10 +397,12 @@ Library
396397
* Fix keyboard mappings with non-ASCII characters on Linux
397398
`#14843 <https://github.com/mixxxdj/mixxx/pull/14843>`__
398399
`#14734 <https://github.com/mixxxdj/mixxx/issues/14734>`__
399-
* Computer feature: enable initial sorting during population `#14688 <https://github.com/mixxxdj/mixxx/pull/14688>`__
400+
* Computer feature: enable initial sorting during population
401+
`#14688 <https://github.com/mixxxdj/mixxx/pull/14688>`__
400402
* Computer feature: avoid false-positve 'has children' for non-directory links
401403
`#14907 <https://github.com/mixxxdj/mixxx/pull/14907>`__
402-
* Fix column header mapping when using external library `#13782 <https://github.com/mixxxdj/mixxx/pull/13782>`__
404+
* Fix column header mapping when using external library
405+
`#13782 <https://github.com/mixxxdj/mixxx/pull/13782>`__
403406
* Fixed Single track cover reload on reload metadata from file
404407
`#14494 <https://github.com/mixxxdj/mixxx/pull/14494>`__
405408
`#14409 <https://github.com/mixxxdj/mixxx/issues/14409>`__

0 commit comments

Comments
 (0)