Merge branch 'master' of dev.sourcefabric.org:campcaster

airtime_mvc/application/models/Schedule.php

@@ -190,7 +190,8 @@ class ScheduleGroup {
         ." LEFT JOIN $CC_CONFIG[showInstances] as si"
         ." ON st.instance_id = si.id"
         ." WHERE st.group_id=$this->groupId"
-        ." AND st.starts < si.ends";
+        ." AND st.starts < si.ends"
+        ." ORDER BY st.starts";
         return $CC_DBC->GetAll($sql);
     }
 

dev_tools/pl.sh

@@ -2,4 +2,4 @@
 echo
 echo "This will tail the pypo-liquidsoap log file."
 echo "Type in password for pypo user (default password is 'pypo'):"
-su -l pypo -c "tail -F /etc/service/pypo-liquidsoap/log/main/current"
+su -l pypo -c "tail -F /var/log/airtime/pypo-liquidsoap/main/current"

dev_tools/pr.sh

@@ -4,4 +4,4 @@ echo
 echo "This will tail the recorder log file."
 echo "Type in password for pypo user (default password is 'pypo'):"
 
-su -l pypo -c "tail -F /etc/service/recorder/log/main/current"
+su -l pypo -c "tail -F /var/log/airtime/recorder/main/current"