Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Sync master to buster/dev #2118

Closed
wants to merge 105 commits into from
Closed

Sync master to buster/dev #2118

wants to merge 105 commits into from

Conversation

ashthespy
Copy link
Collaborator

@ashthespy ashthespy commented May 24, 2021 •
edited

Can then be merged into buster/master to be picked up by builds

ptrochimiuk and others added 30 commits January 26, 2021 17:24
@ptrochimiuk
polish translation updated
b53b34d
@balbuze @weblate
Translated using Weblate (French)
9671a78 
Currently translated at 99.7% (490 of 491 strings)

Translation: Volumio/Volumio2
Translate-URL: https://translation.volumio.org/projects/volumio/volumio2/fr/
@weblate
Translated using Weblate (German)
67210f8 
Currently translated at 99.7% (488 of 489 strings)

Translation: Volumio/Volumio2
Translate-URL: https://translation.volumio.org/projects/volumio/volumio2/de/
@weblate
Translated using Weblate (English)
dbb08b7 
Currently translated at 99.7% (488 of 489 strings)

Translation: Volumio/Volumio2
Translate-URL: https://translation.volumio.org/projects/volumio/volumio2/en/
@weblate
Translated using Weblate (German)
10fd3b5 
Currently translated at 99.7% (488 of 489 strings)

Translation: Volumio/Volumio2
Translate-URL: https://translation.volumio.org/projects/volumio/volumio2/de/
@weblate
Translated using Weblate (French)
c17c181 
Currently translated at 99.3% (486 of 489 strings)

Translation: Volumio/Volumio2
Translate-URL: https://translation.volumio.org/projects/volumio/volumio2/fr/
@ptrochimiuk
Merge branch 'master' into master
68ed7e4
@weblate
Translated using Weblate (Spanish)
10ad0ef 
Currently translated at 96.1% (470 of 489 strings)

Translation: Volumio/Volumio2
Translate-URL: https://translation.volumio.org/projects/volumio/volumio2/es/
@weblate
Translated using Weblate (Spanish)
a08deb6 
Currently translated at 96.1% (470 of 489 strings)

Translation: Volumio/Volumio2
Translate-URL: https://translation.volumio.org/projects/volumio/volumio2/es/
@weblate
Translated using Weblate (Catalan)
6edf295 
Currently translated at 95.7% (468 of 489 strings)

Translation: Volumio/Volumio2
Translate-URL: https://translation.volumio.org/projects/volumio/volumio2/ca/
@weblate
Translated using Weblate (Spanish)
8205c9e 
Currently translated at 96.1% (470 of 489 strings)

Translation: Volumio/Volumio2
Translate-URL: https://translation.volumio.org/projects/volumio/volumio2/es/
@weblate
Translated using Weblate (Spanish)
f10a24e 
Currently translated at 96.3% (471 of 489 strings)

Translation: Volumio/Volumio2
Translate-URL: https://translation.volumio.org/projects/volumio/volumio2/es/
@weblate
Translated using Weblate (Catalan)
a4d0fae 
Currently translated at 95.9% (469 of 489 strings)

Translation: Volumio/Volumio2
Translate-URL: https://translation.volumio.org/projects/volumio/volumio2/ca/
@weblate
Translated using Weblate (Spanish)
89e348c 
Currently translated at 96.5% (472 of 489 strings)

Translation: Volumio/Volumio2
Translate-URL: https://translation.volumio.org/projects/volumio/volumio2/es/
@weblate
Translated using Weblate (Catalan)
0ccf21d 
Currently translated at 98.3% (481 of 489 strings)

Translation: Volumio/Volumio2
Translate-URL: https://translation.volumio.org/projects/volumio/volumio2/ca/
@weblate
Translated using Weblate (Spanish)
e1d2c97 
Currently translated at 98.3% (481 of 489 strings)

Translation: Volumio/Volumio2
Translate-URL: https://translation.volumio.org/projects/volumio/volumio2/es/
@timothyjward
System player name configuration
594042c 
Set the system player name correctly when it is changed, rather than always regardless of what config value is being set
@volumio
Proper call home
80b353d
@weblate
Translated using Weblate (Catalan)
d4c32a6 
Currently translated at 100.0% (489 of 489 strings)

Translation: Volumio/Volumio2
Translate-URL: https://translation.volumio.org/projects/volumio/volumio2/ca/
@weblate
Translated using Weblate (Spanish)
ce8b8e4 
Currently translated at 100.0% (489 of 489 strings)

Translation: Volumio/Volumio2
Translate-URL: https://translation.volumio.org/projects/volumio/volumio2/es/
@balbuze @weblate
Translated using Weblate (French)
6e85d4e 
Currently translated at 100.0% (489 of 489 strings)

Translation: Volumio/Volumio2
Translate-URL: https://translation.volumio.org/projects/volumio/volumio2/fr/
@weblate
Translated using Weblate (Hungarian)
4c35e51 
Currently translated at 100.0% (489 of 489 strings)

Translation: Volumio/Volumio2
Translate-URL: https://translation.volumio.org/projects/volumio/volumio2/hu/
@fanciulli
Adding telemetry to mpd command issuing
e3bac84
@volumio
Further diagnostics on log report
277ce4c
@volumio
Remote endpoints check
33eb0b9
@volumio
Merge pull request #2079 from volumio/fix/telemetry
f410613 
Adding telemetry to mpd command issuing
@volumio
Merge pull request #2055 from ptrochimiuk/master
25875b1 
polish translation updated
@opiokane @weblate
Translated using Weblate (Korean)
db4235d 
Currently translated at 100.0% (489 of 489 strings)

Translation: Volumio/Volumio2
Translate-URL: https://translation.volumio.org/projects/volumio/volumio2/ko/
@opiokane @weblate
Translated using Weblate (Korean)
8cc8ea6 
Currently translated at 100.0% (489 of 489 strings)

Translation: Volumio/Volumio2
Translate-URL: https://translation.volumio.org/projects/volumio/volumio2/ko/
@weblate
Translated using Weblate (German)
5dba14a 
Currently translated at 99.7% (488 of 489 strings)

Translation: Volumio/Volumio2
Translate-URL: https://translation.volumio.org/projects/volumio/volumio2/de/
Christopher Rieke and others added 26 commits March 14, 2021 00:26
@weblate
Translated using Weblate (Croatian)
a9e9ac8 
Currently translated at 80.7% (395 of 489 strings)

Translation: Volumio/Volumio2
Translate-URL: https://translation.volumio.org/projects/volumio/volumio2/hr/
@weblate
Translated using Weblate (German)
56c89e2 
Currently translated at 99.7% (488 of 489 strings)

Translation: Volumio/Volumio2
Translate-URL: https://translation.volumio.org/projects/volumio/volumio2/de/
@weblate
Translated using Weblate (Dutch)
098cc37 
Currently translated at 81.7% (400 of 489 strings)

Translation: Volumio/Volumio2
Translate-URL: https://translation.volumio.org/projects/volumio/volumio2/nl/
@weblate
Translated using Weblate (Dutch)
dbd5bdb 
Currently translated at 95.9% (469 of 489 strings)

Translation: Volumio/Volumio2
Translate-URL: https://translation.volumio.org/projects/volumio/volumio2/nl/
@balbuze @weblate
Translated using Weblate (French)
6aad78c 
Currently translated at 100.0% (489 of 489 strings)

Translation: Volumio/Volumio2
Translate-URL: https://translation.volumio.org/projects/volumio/volumio2/fr/
@gh201 @weblate
Added translation using Weblate (Lithuanian)
651a40b
@gh201 @weblate
Translated using Weblate (Lithuanian)
9448c39 
Currently translated at 37.0% (181 of 489 strings)

Translation: Volumio/Volumio2
Translate-URL: https://translation.volumio.org/projects/volumio/volumio2/lt/
@opiokane @weblate
Translated using Weblate (Korean)
9bb0a9a 
Currently translated at 100.0% (489 of 489 strings)

Translation: Volumio/Volumio2
Translate-URL: https://translation.volumio.org/projects/volumio/volumio2/ko/
@volumio
Fix logging indentation for endpoint test
f8e7293
@volumio
Merge branch 'master' into feature/log_network
740cc63
@volumio
Merge branch 'feature/log_network'
ed9f637
@crieke
added codec and bitrate to radio stations in browse (#2094)
067290a 
* WIP: Added bitrate info to stations in browse

bitrate display is currently utilzing the artist field.
As a dirty fix, album info also contains a single space, to move the bitrate info further to the right side.

* added codec info and reformat

* clean up
@volumio
Fix error handling
7e4645d
@volumio
Add BOSS2 DAC
a12fa17
@mikelangeloz
Revert "Add BOSS2 DAC"
0a6008d 
This reverts commit a12fa17.
@weblate
Translated using Weblate (Spanish)
a02b843 
Currently translated at 100.0% (489 of 489 strings)

Translation: Volumio/Volumio2
Translate-URL: https://translation.volumio.org/projects/volumio/volumio2/es/
@weblate
Translated using Weblate (Catalan)
e5b0ceb 
Currently translated at 100.0% (489 of 489 strings)

Translation: Volumio/Volumio2
Translate-URL: https://translation.volumio.org/projects/volumio/volumio2/ca/
@thniels @weblate
Translated using Weblate (Danish)
809469b 
Currently translated at 24.3% (119 of 489 strings)

Translation: Volumio/Volumio2
Translate-URL: https://translation.volumio.org/projects/volumio/volumio2/da/
@ArturNadolski @weblate
Translated using Weblate (Polish)
d024f01 
Currently translated at 99.5% (487 of 489 strings)

Translation: Volumio/Volumio2
Translate-URL: https://translation.volumio.org/projects/volumio/volumio2/pl/
@ArturNadolski @weblate
Translated using Weblate (Polish)
40a5d4b 
Currently translated at 99.5% (487 of 489 strings)

Translation: Volumio/Volumio2
Translate-URL: https://translation.volumio.org/projects/volumio/volumio2/pl/
@volumio
Fix setting of local multiroom volume
dafb9c5
@weblate
Translated using Weblate (German)
c903c0e 
Currently translated at 100.0% (489 of 489 strings)

Translation: Volumio/Volumio2
Translate-URL: https://translation.volumio.org/projects/volumio/volumio2/de/
@Ruksolari @weblate
Translated using Weblate (Spanish)
bd69fd6 
Currently translated at 100.0% (489 of 489 strings)

Translation: Volumio/Volumio2
Translate-URL: https://translation.volumio.org/projects/volumio/volumio2/es/
@volumio
Fix volumio hw detection on plugins and increase timeout
47bf12f
@Joni-Salminen
Fix issue where moving first item of the queue is not possible (#2116)
cb91745 
Fix issue where moving first item of the queue is not possible
@EdwinAbalain @weblate
Translated using Weblate (Dutch)
7483527 
Currently translated at 99.5% (487 of 489 strings)

Translation: Volumio/Volumio2
Translate-URL: https://translation.volumio.org/projects/volumio/volumio2/nl/
@ashthespy
Copy link
Collaborator Author

ashthespy commented Jul 28, 2021 •
edited

What is the git workflow being followed?
I assumed it is:

/buster/feature/xx -> /buster/dev 
/buster/fix/yy -> /buster/dev 
# Translations and other fixes to master
/master -> /buster/dev
# Test build with /buster/dev
/buster/dev -> /buster/master

But comparing buster/dev...buster/master -- there seems a lot that skipped /buster/dev and went to /buster/master.
So now /buster/dev is outdated?

@ashthespy
Copy link
Collaborator Author

Closed -- creating buster/dev fresh from buster/master
#2129

@ashthespy ashthespy closed this Jul 28, 2021
@ashthespy ashthespy mentioned this pull request Jul 28, 2021
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet