Albert Santoni 359727fc66 Merge branch 'saas' of github.com:sourcefabric/Airtime into saas ... Conflicts: airtime_mvc/application/modules/rest/controllers/MediaController.php		2014-10-29 18:01:31 -04: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	…
common	CC-5818: Fix Live Chat on Airtime Pro (2.5.3)	2014-04-28 11:23:59 -04:00
dashboard	Fixed CC-5045 and Now Playing time remaining style improvements	2013-09-25 16:40:20 -04:00
library	Merge pull request #75 - Saas relder csrf delete file	2014-10-29 17:55:42 -04:00
listenerstat	CC-5727 : History search range using incorrect timezone offset (also Nowplaying & Listener Stats)	2014-03-11 13:24:22 -04:00
login	CC-4865: Password reset -> Cancel -> url is missing base directory	2013-02-06 13:44:10 -05:00
nowplaying	…
playlist	CC-4963: Add cue in and cue out to smart block criteria list	2013-02-19 16:38:58 -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' into 2.5.x-saas	2013-12-17 17:20:38 -05:00
schedule	Resolved differences merging 2.5.x into saas	2014-10-27 16:25:42 -04:00
showbuilder	CC-5727 : History search range using incorrect timezone offset (also Nowplaying)	2014-03-10 18:33:07 -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	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	…