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

Merge remote-tracking branch 'upstream/master' into js

Browse source
This commit is contained in:
Zachary Klosko 2021-01-01 15:28:35 -05:00
commit 1924fe4a81
46 changed files with 1436 additions and 2461 deletions
Download patch file Download diff file Expand all files Collapse all files

2
airtime_mvc/application/views/scripts/embed/player.phtml
View file

@ -267,4 +267,4 @@
</div>
</body>
</html>
</html>

5
airtime_mvc/application/views/scripts/plupload/index.phtml
View file

@ -14,6 +14,11 @@
$used = $disk->totalSpace-$disk->totalFreeSpace;
$total = $disk->totalSpace;
$tracktypes = Application_Model_Tracktype::getTracktypes();
array_multisort(array_map(function($element) {
return $element['type_name'];
}, $tracktypes), SORT_ASC, $tracktypes);
if(count($tracktypes) == 0) {
$hasTracktypes = "disabled";
$showTracktypesDropdown = false;