sintonia/airtime_mvc/application/views/scripts
Albert Santoni 1c5e2d6205 Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
Conflicts:
	airtime_mvc/public/index.php

* Reverted some SaaS-only thing Martin did a year ago. Looks benign but
  only one way to find out...
2014-03-27 16:38:03 -04:00
..
airtime-recorder CC-1960: Internationalize Airtime / Support translations 2012-11-20 11:33:37 -05:00
api remove \r line endings 2012-10-30 13:23:09 -04:00
audiopreview CC-5354: Remove PHP short open tags for better compatibility 2013-10-04 14:15:23 -04:00
dashboard CC-5354: Remove PHP short open tags for better compatibility 2013-10-04 14:15:23 -04:00
error CC-5354: Remove PHP short open tags for better compatibility 2013-10-04 14:15:23 -04:00
form Merge branch '2.5.x' into 2.5.x-saas 2013-12-17 17:20:38 -05:00
index CC-1960: Internationalize Airtime / Support translations 2012-11-20 11:33:37 -05:00
library CC-5354: Remove PHP short open tags for better compatibility 2013-10-04 14:15:23 -04:00
listenerstat CC-4863: I18N:System -> Listener status: string is not translated 2013-05-14 11:50:01 -04:00
login CC-5354: Remove PHP short open tags for better compatibility 2013-10-04 14:15:23 -04:00
partialviews CC-5354: Remove PHP short open tags for better compatibility 2013-10-04 14:15:23 -04:00
playlist CC-5354: Remove PHP short open tags for better compatibility 2013-10-04 14:15:23 -04:00
playouthistory using an accordian to display per show logs. 2013-08-28 23:30:15 -04:00
playouthistorytemplate CC-5334 : Localize Ryerson History Feature 2013-09-24 09:56:04 +02:00
plupload CC-5709: Airtime Analyzer 2014-03-21 13:22:00 -04:00
preference CC-5354: Remove PHP short open tags for better compatibility 2013-10-04 14:15:23 -04:00
recorder CC-1960: Internationalize Airtime / Support translations 2012-11-20 11:33:37 -05:00
schedule Merge branch '2.5.x' into 2.5.x-saas 2013-12-17 17:20:38 -05:00
showbuilder CC-5354: Remove PHP short open tags for better compatibility 2013-10-04 14:15:23 -04:00
systemstatus CC-5354: Remove PHP short open tags for better compatibility 2013-10-04 14:15:23 -04:00
user CC-5354: Remove PHP short open tags for better compatibility 2013-10-04 14:15:23 -04:00
webstream CC-5354: Remove PHP short open tags for better compatibility 2013-10-04 14:15:23 -04:00
menu.phtml Merge branch 'ryerson-history' into 2.5.x-saas 2013-09-02 15:52:43 -04:00