Permalink
Browse files

Merge branch '2.0.x' into 2.0.x-deb-official

  • Loading branch information...
2 parents f2d0f57 + 5862324 commit 8db4edf430b0c728fa2256a768a25b81551a9d79 Martin Konecny committed Feb 14, 2012
@@ -30,9 +30,11 @@ function generatePartitions(partitions){
var tr = $(row);
lastElement.after(tr);
- var watched_dirs_ul = $('#watched-dir-list-'+i);
- for (var j=0; j<partitions[i].dirs.length; j++){
- watched_dirs_ul.append('<li>'+partitions[i].dirs[j]+'</li>');
+ if (partitions[i].dirs){
+ var watched_dirs_ul = $('#watched-dir-list-'+i);
+ for (var j=0; j<partitions[i].dirs.length; j++){
+ watched_dirs_ul.append('<li>'+partitions[i].dirs[j]+'</li>');
+ }
}
lastElement = tr;
}
View
@@ -1,4 +1,16 @@
-2.0.0 - January 24, 2011
+2.0.1 - February 14, 2012
+ * Changes:
+ * Widgets should have a version string so users can make sure widgets are up to date
+ * Bug Fixes:
+ * Fixed: Media monitor should not change the ownership of watched files if unnecessary
+ * Fixed: Sometimes the Current Playing Item on the top Panel in the UI incorrectly shows "Nothing Scheduled"
+ * Fixed: Stream settings page does not remember the stream metadata format
+ * Fixed: Airtime is missing Australia and Arctic timezones
+ * Fixed: Shows not recorded after upgrade to 2.0.0 from 1.8.2
+ * Fixed: Don't make it necessary users clear their browser cache when Airtime is upgraded
+ * Fixed: Media-Monitor does not handle corrupt audio metadata gracefully
+
+2.0.0 - January 24, 2012
* The cool stuff:
* Stream configuration through the browser
* You can have up to three streams with different bitrates and point them
@@ -41,6 +41,7 @@ fi
echo "* Creating /etc/monit/conf.d/monit-airtime-generic.cfg"
mkdir -p /etc/monit/conf.d/
if [ ! -e /etc/monit/conf.d/monit-airtime-generic.cfg ]; then
+ rm -f /etc/monit/conf.d/*airtime*
cp $AIRTIMEROOT/python_apps/monit/monit-airtime-generic.cfg /etc/monit/conf.d/
fi
@@ -15,8 +15,8 @@ class UpgradeCommon{
const CONF_PYPO_GRP = "pypo";
const CONF_WWW_DATA_GRP = "www-data";
- const CONF_BACKUP_SUFFIX = "201";
- const VERSION_NUMBER = "2.0.1";
+ const CONF_BACKUP_SUFFIX = "200";
+ const VERSION_NUMBER = "2.0.0";
public static function connectToDatabase($p_exitOnError = true)
{
@@ -48,6 +48,7 @@ def remove_file(path):
remove_file("/etc/monit/conf.d/monit-airtime-playout.cfg")
remove_file("/etc/monit/conf.d/monit-airtime-liquidsoap.cfg")
remove_file("/etc/monit/conf.d/monit-airtime-generic.cfg")
+ remove_file("/etc/monit/conf.d/monit-airtime-rabbitmq-server.cfg")
except Exception, e:
print e

0 comments on commit 8db4edf

Please sign in to comment.