Albert Santoni 3c064b13a9 Merge branch '2.5.x' into saas ... Conflicts: airtime_mvc/locale/hy/LC_MESSAGES/airtime.po airtime_mvc/locale/ja_JP/LC_MESSAGES/airtime.po		2015-02-18 16:03:14 -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	Show the plan and station URL in Live Chat	2014-12-11 17:40:34 -05:00
dashboard	Fixed CC-5045 and Now Playing time remaining style improvements	2013-09-25 16:40:20 -04:00
library	Merge branch '2.5.x' into saas	2015-02-18 16:03:14 -05:00
listenerstat	CC-5727 : History search range using incorrect timezone offset (also Nowplaying & Listener Stats)	2014-03-11 13:24:22 -04:00
login	Removed unnecessary call to set locale data on the Login page	2014-11-05 17:27:08 -05:00
nowplaying	Replaced reoccurring strings with string formatting to aid dynamic translations	2014-11-06 18:40:19 -05:00
playlist	Replaced reoccurring strings with string formatting to aid dynamic translations	2014-11-06 18:40:19 -05:00
playouthistory	CC-5727 : History search range using incorrect timezone offset	2014-03-10 18:48:40 -04:00
preferences	Merge branch '2.5.x-albertenhancements' into saas	2015-01-15 16:32:29 -05:00
schedule	SAAS-580 - Fixed routing issue causing show art to not upload; changed ShowController to be more RESTful	2015-02-04 15:09:27 -05:00
showbuilder	Hide Now Playing toolbar for Guest users	2015-01-21 15:15:22 -05: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	Super Admin edit page points to billing now	2014-06-20 13:36:06 -04:00
utilities	CC-5727 : History search range using incorrect timezone offset (also Nowplaying & Listener Stats)	2014-03-11 13:26:05 -04:00
airtime_bootstrap.js	CC-4605: Some AJAX calls are cached	2012-10-19 11:22:44 -04:00