preparation for 2.1.1 release

CREDITS

@@ -1,3 +1,11 @@
+=======
+CREDITS
+=======
+Version 2.1.1
+-------------
+Same as previous version.
+
+
 =======
 CREDITS
 =======

VERSION

@@ -1,2 +1,2 @@
 PRODUCT_ID=Airtime
-PRODUCT_RELEASE=2.1.0
+PRODUCT_RELEASE=2.1.1

airtime_mvc/application/models/Show.php

@@ -1303,7 +1303,7 @@ class Application_Model_Show {
         while ($utcStartDateTime->getTimestamp() <= $p_populateUntilDateTime->getTimestamp()
                 && (is_null($utcLastShowDateTime) || $utcStartDateTime->getTimestamp() < $utcLastShowDateTime->getTimestamp())){
 
-            list($utcStartDateTime, $utcEndDateTime) = Application_Model_Show::createUTCStartEndDateTime($start, $duration, $timezone);
+            list($utcStartDateTime, $utcEndDateTime) = self::createUTCStartEndDateTime($start, $duration, $timezone);
 
             if ($show->hasInstanceOnDate($utcStartDateTime)){
                 $ccShowInstance = $show->getInstanceOnDate($utcStartDateTime);

changelog

@@ -1,3 +1,24 @@
+2.1.1 - June 12th, 2012
+  * Changes
+    * Add Media page will now display error message and reject uploaded file if it is corrupt
+    * jQuery schedule widget now show upcoming Sunday instead of previous Sunday
+    * fixed uploading files with upper case file extensions
+    * fixed master/source override URL being reverted to original setting after clicking 'Save' in stream settings.
+    * Add several helpful tips in the Stream Settings page and some UI cleanup
+    * DJ user type cannot delete Playlists that aren't their own or delete tracks
+    * Playlist Builder should remember your position instead of reseting to the first page everytime an operation was performed
+    * If Master or Live input source is disconnected, Airtime will no longer automatically switch off that source. This should allow the source to
+      reconnect and continue playback.
+  
+  * Bug fixes
+    * Fixed playout engine sometimes not receiving new schedule which could result in dead air
+    * Fixed script timeout which caused Apache to become unresponsive
+    * Fixed various Apache warnings
+    * Fixed not being able to delete some tracks that had been played
+    * Fixed calendar highlighting the wrong day due to server timezone being different from client browser timezone
+    * Promote my station opt-out button now works
+    * Fixed recording working sporadically on some system configurations
+
 2.1.0 - June 5th, 2012
   * The cool stuff:
     * Real-time show editing in the Now Playing and Calendar screens

install_minimal/include/airtime-constants.php

@@ -1,3 +1,3 @@
 <?php
 
-define('AIRTIME_VERSION', '2.1.0');
+define('AIRTIME_VERSION', '2.1.1');

install_minimal/include/airtime-upgrade.php

@@ -102,6 +102,11 @@ if (strcmp($version, "2.0.3") < 0){
 }
 if (strcmp($version, "2.1.0") < 0){
     passthru("php --php-ini $SCRIPTPATH/../airtime-php.ini $SCRIPTPATH/../upgrades/airtime-2.1.0/airtime-upgrade.php");
+    pause();
+} 
+if (strcmp($version, "2.1.1") < 0){
+    passthru("php --php-ini $SCRIPTPATH/../airtime-php.ini $SCRIPTPATH/../upgrades/airtime-2.1.1/airtime-upgrade.php");
+    pause();
 } 
 
 echo "******************************* Upgrade Complete *******************************".PHP_EOL;

python_apps/api_clients/api_client.py

@@ -20,7 +20,7 @@ from configobj import ConfigObj
 import string
 import hashlib
 
-AIRTIME_VERSION = "2.1.0"
+AIRTIME_VERSION = "2.1.1"
 
 def api_client_factory(config, logger=None):
     if logger != None: