From f188eeada2cc5a7086db0577fbc7dffc77e70f77 Mon Sep 17 00:00:00 2001 From: Martin Konecny Date: Wed, 13 Jun 2012 11:35:14 -0400 Subject: [PATCH] preparation for 2.1.1 release --- CREDITS | 8 +++++++ VERSION | 2 +- airtime_mvc/application/models/Show.php | 2 +- changelog | 21 +++++++++++++++++++ install_minimal/include/airtime-constants.php | 2 +- install_minimal/include/airtime-upgrade.php | 5 +++++ python_apps/api_clients/api_client.py | 2 +- 7 files changed, 38 insertions(+), 4 deletions(-) diff --git a/CREDITS b/CREDITS index 5bf6bb12f..f48a2d5dc 100644 --- a/CREDITS +++ b/CREDITS @@ -1,3 +1,11 @@ +======= +CREDITS +======= +Version 2.1.1 +------------- +Same as previous version. + + ======= CREDITS ======= diff --git a/VERSION b/VERSION index 1d75366eb..1d69936fb 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ PRODUCT_ID=Airtime -PRODUCT_RELEASE=2.1.0 +PRODUCT_RELEASE=2.1.1 diff --git a/airtime_mvc/application/models/Show.php b/airtime_mvc/application/models/Show.php index 298aafb37..270d065ad 100644 --- a/airtime_mvc/application/models/Show.php +++ b/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); diff --git a/changelog b/changelog index 087af1103..ab1405369 100644 --- a/changelog +++ b/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 diff --git a/install_minimal/include/airtime-constants.php b/install_minimal/include/airtime-constants.php index 43ae807bb..2107ded4f 100644 --- a/install_minimal/include/airtime-constants.php +++ b/install_minimal/include/airtime-constants.php @@ -1,3 +1,3 @@