Merge develop from Release 2.4 into master to fix history #2099

AlvinSchiller · 2023-11-10T10:24:47Z

With Release 2.3 and 2.4 the develop branch has been merged into master with a squash. This brings the problem that develop and master don't share the same history anymore and any furter merge from develop to master will show more commits then where actually made.

To fix this situation non invasively, the current master should be merged with the corresponding commit from develop to sync the history again.

develop commit: 7f43f48
There are no file changes so its the same source code state. Its just for syncing history.

Any future release must not be merged with a squash.
Should be merged right before #2030

@s-martin

Fixes MiczFlor#1167

Add version number to startup script

As there is a savepos-command in "playerstop" this should also be included in "playerstopafter".

Added spacing

…into develop

missing savepos-command in "playerstopafter"

This reverts commit 6d504e5.

Resolving MiczFlor#469 by simplifying collapse IDs in folder tree. Make use of integers for collapse IDs rather than folder names to avoid problem with any kind of non-allowed characters as ID value. Simplifies corresponding code as no character replacement is required for collapse IDs anymore.

Calendar for 2021 into the readme file

See MiczFlor#1049

* feat: Buttons USB Encoder Closes MiczFlor#1156 * change usb to uppercase USB

@Toqqi

* web app settings for MiczFlor#1122 * web app settings for MiczFlor#1122 * Include @Toqqi's review comments Co-authored-by: s-martin <[email protected]>

* fix reportet duration via mqtt this adjusts the regex to get the duration attribute from the status object. * feat: use for duration the fallback time attribute In some cases mpd does not report the duration of a track in the mpd status response but usually a rounded value in the time attribute. So lets use this as fallback value.

…r-Spotify-API-end-of-life Update README.md

Bumps [actions/setup-python](https://github.com/actions/setup-python) from 3 to 4. - [Release notes](https://github.com/actions/setup-python/releases) - [Commits](actions/setup-python@v3...v4) --- updated-dependencies: - dependency-name: actions/setup-python dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Follow-up for commit "facilitate transition to bullseye". Bug: Since bullseye uses php7.4, php.ini will not be replaced by the sample Solution: Read folder name in /etc/php and use it in variable php_ini, keeping compatibility with buster

* Update dockerimage.yml * Update pythonpackage.yml

* fix flake8 warnings * fix markdownlint

Fixes https://github.com/MiczFlor/RPi-Jukebox-RFID/security/code-scanning/1

…lor#1862) Signed-off-by: AL-KASSAR <[email protected]>

* feat: add repeat mode to mqtt attributes * refactor: removes duplicated function * docs: adds repeat_mode attribute to README * refactor: extract method outside of main function * chore: remove more duplicated code

Bumps [php-mock/php-mock-phpunit](https://github.com/php-mock/php-mock-phpunit) from 2.5.0 to 2.6.1. - [Release notes](https://github.com/php-mock/php-mock-phpunit/releases) - [Commits](php-mock/php-mock-phpunit@2.5.0...2.6.1) --- updated-dependencies: - dependency-name: php-mock/php-mock-phpunit dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Bumps [phpunit/phpunit](https://github.com/sebastianbergmann/phpunit) from 8.5.30 to 9.5.25. - [Release notes](https://github.com/sebastianbergmann/phpunit/releases) - [Changelog](https://github.com/sebastianbergmann/phpunit/blob/main/ChangeLog-8.5.md) - [Commits](sebastianbergmann/phpunit@8.5.30...9.5.25) --- updated-dependencies: - dependency-name: phpunit/phpunit dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* fix flake8 warnings * fix markdownlint * fix markdown lint warnings

Bumps [phpunit/phpunit](https://github.com/sebastianbergmann/phpunit) from 9.5.25 to 9.5.26. - [Release notes](https://github.com/sebastianbergmann/phpunit/releases) - [Changelog](https://github.com/sebastianbergmann/phpunit/blob/main/ChangeLog-9.5.md) - [Commits](sebastianbergmann/phpunit@9.5.25...9.5.26) --- updated-dependencies: - dependency-name: phpunit/phpunit dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* fix flake8 warnings * fix markdownlint * fix markdown lint warnings * merge recent updates in install script buster-install-default-with-autohotspot.sh * fix flake8 warnings * prepare README.md for 2.4 release and little cleanup

…iczFlor#1903) * fix flake8 warnings * fix markdownlint * fix markdown lint warnings * merge recent updates in install script buster-install-default-with-autohotspot.sh * fix flake8 warnings * dont use pytest-pythonpath anymore (obsolete) * revert last commit

Merge commit '7f43f484407d6efa89ca45a9a5941d3f439d598a'

DivineDominion · 2023-11-13T08:59:34Z

Any future release must not be merged with a squash.

Maybe it won't hurt to disable this merge strategy completely in the repo settings?

AlvinSchiller · 2023-11-13T10:15:53Z

Any future release must not be merged with a squash.

Maybe it won't hurt to disable this merge strategy completely in the repo settings?

The problem is it would be not allowed for "master", but desired for "develop". And sadly you cant disable "squash and merge" on branch base

AlvinSchiller · 2023-11-27T14:23:17Z

THIS CHANGE MUST BE MADE WITH A PUSH FROM OUTSIDE OF GITHUB WITHOUT A NEW COMMIT.
MERGING THIS PR DOES NOT RESOLVE THE PROBLEM, AS IT CREATES A NEW COMMIT.

Schneelocke and others added 30 commits December 1, 2020 20:30

Set Own Repo

6d504e5

Fix volume of startup sound (MiczFlor#1169)

7ee558c

Fixes MiczFlor#1167

Merge pull request MiczFlor#1168 from MiczFlor/Version-to-startup

08db5d9

Add version number to startup script

missing savepos-command in "playerstopafter"

9da0b13

As there is a savepos-command in "playerstop" this should also be included in "playerstopafter".

Update buster-install-default.sh (MiczFlor#1181)

68af5b6

Added spacing

Merge branch 'master' of https://github.com/MiczFlor/RPi-Jukebox-RFID …

ec64992

…into develop

Merge branch 'develop' of https://github.com/MiczFlor/RPi-Jukebox-RFID …

d172717

…into develop

Merge pull request MiczFlor#1179 from StefanMinke/patch-1

6dc047a

missing savepos-command in "playerstopafter"

Revert "Set Own Repo"

cdd33bf

This reverts commit 6d504e5.

Add base functionality for Bluetooth headphone integration

54b25f1

Add Discussions link to Readme

066d807

Update Mopidy Iris to 3.54.2 (MiczFlor#1161)

663e808

Integrate bluetooth headphone toggle into Web Interface

213b396

Fix bugs and default configuration after testing

4e307fa

(maint) Minor typos, whitespace issues (MiczFlor#1214)

369c7f9

Add GPIO function call for bluetooth audio toggle

bd35f4a

Create codeql-analysis.yml

11cc776

Update codeql-analysis.yml

42f66de

Change path to gpio_settings.ini

7bfab75

Add mopidy extensions versions to script

7744519

Merge remote-tracking branch 'upstream/develop' into develop

439a7d0

2021 calendar

e6cad66

2021 calendar

e79599b

Merge pull request MiczFlor#1248 from MiczFlor/dev-2021-cal

2225994

Calendar for 2021 into the readme file

Added stop on removal functionality example (MiczFlor#1209)

5d4a1eb

See MiczFlor#1049

feat: GPIO Buttons over USB Encoder (MiczFlor#1249)

ca6a478

* feat: Buttons USB Encoder Closes MiczFlor#1156 * change usb to uppercase USB

added support for pc/sc readers

6393a42

Web App settings for swipe or place rifd (MiczFlor#1130)

657f87f

* web app settings for MiczFlor#1122 * web app settings for MiczFlor#1122 * Include @Toqqi's review comments Co-authored-by: s-martin <[email protected]>

fix: let function_calls.py work with python 3.5 (MiczFlor#1253)

ce8e9ff

c0un7-z3r0 and others added 23 commits May 29, 2022 21:26

Update README.md

a63bc8f

Update README.md

b092849

Merge pull request MiczFlor#1834 from MiczFlor/Readme-File-changes-fo…

ad69f75

…r-Spotify-API-end-of-life Update README.md

Run CI also on PRs (MiczFlor#1845)

40f7019

* Update dockerimage.yml * Update pythonpackage.yml

Linting markdown and Python (MiczFlor#1830)

9e578c3

* fix flake8 warnings * fix markdownlint

Fix code scanning alert (MiczFlor#1802)

23798de

Fixes https://github.com/MiczFlor/RPi-Jukebox-RFID/security/code-scanning/1

Update version to 2.4

7c00de1

Fix Command Injection and XSS vulnerabilities in trackEdit.php (MiczF…

0307407

…lor#1862) Signed-off-by: AL-KASSAR <[email protected]>

feature: add repeat mode attribute to mqtt (MiczFlor#1807)

ff565cb

* feat: add repeat mode to mqtt attributes * refactor: removes duplicated function * docs: adds repeat_mode attribute to README * refactor: extract method outside of main function * chore: remove more duplicated code

Fix missing ps package

eba47fb

Fix badges

dbf8ef8

fix markdown warnings (MiczFlor#1902)

ab998c6

* fix flake8 warnings * fix markdownlint * fix markdown lint warnings

Update README.md for 2.4 (MiczFlor#1904)

afeea5e

* fix flake8 warnings * fix markdownlint * fix markdown lint warnings * merge recent updates in install script buster-install-default-with-autohotspot.sh * fix flake8 warnings * prepare README.md for 2.4 release and little cleanup

Update README.md

0dd0a42

Merge branch 'master' into develop

7f43f48

Merge develop into master to fix history

28e9f1a

Merge commit '7f43f484407d6efa89ca45a9a5941d3f439d598a'

AlvinSchiller marked this pull request as ready for review November 10, 2023 10:25

AlvinSchiller force-pushed the master branch from 3d52de7 to 28e9f1a Compare December 20, 2023 00:31

AlvinSchiller merged commit 68ff54b into MiczFlor:master Dec 21, 2023

AlvinSchiller mentioned this pull request Dec 21, 2023

Release 2.5 #2030

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge develop from Release 2.4 into master to fix history #2099

Merge develop from Release 2.4 into master to fix history #2099

AlvinSchiller commented Nov 10, 2023 •

edited

Loading

DivineDominion commented Nov 13, 2023

AlvinSchiller commented Nov 13, 2023 •

edited

Loading

AlvinSchiller commented Nov 27, 2023 •

edited

Loading

Merge develop from Release 2.4 into master to fix history #2099

Merge develop from Release 2.4 into master to fix history #2099

Conversation

AlvinSchiller commented Nov 10, 2023 • edited Loading

DivineDominion commented Nov 13, 2023

AlvinSchiller commented Nov 13, 2023 • edited Loading

AlvinSchiller commented Nov 27, 2023 • edited Loading

AlvinSchiller commented Nov 10, 2023 •

edited

Loading

AlvinSchiller commented Nov 13, 2023 •

edited

Loading

AlvinSchiller commented Nov 27, 2023 •

edited

Loading