Naomi Aro 49474ab5c4 Merge branch '2.5.x' into 2.5.x-saas ... Conflicts: airtime_mvc/application/forms/AddShowWhen.php airtime_mvc/application/forms/LiveStreamingPreferences.php airtime_mvc/application/models/Schedule.php airtime_mvc/application/views/scripts/form/preferences.phtml airtime_mvc/application/views/scripts/form/preferences_livestream.phtml airtime_mvc/application/views/scripts/form/support-setting.phtml airtime_mvc/application/views/scripts/schedule/add-show-form.phtml		2013-12-17 17:20:38 -05:00
..
audiopreview	Audio preview wasn't working in Firefox when airtime is not in document root	2013-02-11 15:56:21 -05:00
buttons	CC-4466: Buttons on Now Playing page are clickable even though they are disabled	2012-09-18 10:53:19 -04:00
common	CC-5335 : I18N: Calendar picker strings are not translated.	2013-09-24 11:47:20 +02:00
dashboard	Fixed CC-5045 and Now Playing time remaining style improvements	2013-09-25 16:40:20 -04:00
library	CC-5430 : sorting settings not saved on library datatable	2013-10-16 18:14:07 -04:00
listenerstat	CC-4895: Remove all json die() statements from code	2013-02-07 15:41:47 -05:00
login	CC-4865: Password reset -> Cancel -> url is missing base directory	2013-02-06 13:44:10 -05:00
nowplaying	CC-2184: Hardcoded CSS path should be relative path instead	2013-01-14 16:00:38 -05:00
playlist	CC-4963: Add cue in and cue out to smart block criteria list	2013-02-19 16:38:58 -05:00
playouthistory	CC-5335 : I18N: Calendar picker strings are not translated.	2013-09-24 11:47:20 +02:00
preferences	Merge branch '2.5.x' into 2.5.x-saas	2013-12-17 17:20:38 -05:00
schedule	CC-5641: Can Create Zero or Negative Length Shows	2013-12-14 22:38:33 -05:00
showbuilder	CC-5331: Now Playing keeps refreshing sometimes	2013-10-01 16:49:08 -04:00
status	CC-4943: Raspberry Pi optimization: don't create new background AJAX request until the previous one has returned	2013-02-14 12:58:31 -05:00
user	CC-4895: Remove all json die() statements from code	2013-02-07 15:41:47 -05:00
utilities	CC-5594 : Remove all date_default_timezone_get()	2013-12-06 18:17:30 -05:00
airtime_bootstrap.js	CC-4605: Some AJAX calls are cached	2012-10-19 11:22:44 -04:00