Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'stable'

This commit is contained in:
jo 2023-10-03 22:24:35 +02:00
parent 18b0001df3 2263c1f860
commit 363f499882
No known key found for this signature in database
GPG Key ID: B2FEC9B22722B984
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.pre-commit-config.yaml
View File

@ -59,7 +59,7 @@ repos:
- id: black - id: black
- repo: https://github.com/codespell-project/codespell - repo: https://github.com/codespell-project/codespell
rev: v2.2.5 rev: v2.2.6
hooks: hooks:
- id: codespell - id: codespell
args: [--ignore-words=.codespellignore] args: [--ignore-words=.codespellignore]

2
legacy/application/forms/LiveStreamingPreferences.php
View File

@ -10,7 +10,7 @@ class Application_Form_LiveStreamingPreferences extends Zend_Form_SubForm
['ViewScript', ['viewScript' => 'form/preferences_livestream.phtml']], ['ViewScript', ['viewScript' => 'form/preferences_livestream.phtml']],
]); ]);
// automatic trasition on source disconnection // automatic transition on source disconnection
$auto_transition = new Zend_Form_Element_Checkbox('auto_transition'); $auto_transition = new Zend_Form_Element_Checkbox('auto_transition');
$auto_transition->setLabel(_('Auto Switch Off:')) $auto_transition->setLabel(_('Auto Switch Off:'))
->setValue(Application_Model_Preference::GetAutoTransition()); ->setValue(Application_Model_Preference::GetAutoTransition());

2
legacy/tools/composer.json
View File

@ -1,6 +1,6 @@
{ {
"require": { "require": {
"php": "^7.4", "php": "^7.4",
"friendsofphp/php-cs-fixer": "<3.27.1" "friendsofphp/php-cs-fixer": "<3.34.1"
} }
} }

2
playout/libretime_playout/liquidsoap/1.4/ls_lib.liq
View File

@ -63,7 +63,7 @@ def transition(a,b) =
end end
# we need this function for special transition case(from default to queue) we don't want # we need this function for special transition case(from default to queue) we don't want
# the trasition fade to have effect on the first song that would be played switching out # the transition fade to have effect on the first song that would be played switching out
# of the default(silent) source # of the default(silent) source
def transition_default(a,b) = def transition_default(a,b) =
log("transition called...") log("transition called...")