drigato ca9750f415 Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas ...

Conflicts:
	airtime_mvc/application/Bootstrap.php
	airtime_mvc/application/configs/ACL.php
	airtime_mvc/application/controllers/ApiController.php
	airtime_mvc/application/controllers/plugins/Acl_plugin.php
	airtime_mvc/application/forms/GeneralPreferences.php
	airtime_mvc/application/modules/rest/controllers/MediaController.php
	airtime_mvc/application/views/scripts/form/preferences_general.phtml
	airtime_mvc/application/views/scripts/form/support-setting.phtml
	airtime_mvc/build/sql/schema.sql

2015-01-23 11:32:45 -05: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

billing

Updated i18n to use multiple domains

2014-11-04 17:03:52 -05:00

dashboard

Made several reoccurring strings into application constants and altered any static strings containing them to use these constants in string format calls.

2014-11-06 18:39:48 -05:00

error

CC-5354: Remove PHP short open tags for better compatibility

2013-10-04 14:15:23 -04:00

form

Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas

2015-01-23 11:32:45 -05:00

index

CC-5814: 'Down for maintenance' page during upgrades

2014-04-24 16:19:55 -04: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

Made several reoccurring strings into application constants and altered any static strings containing them to use these constants in string format calls.

2014-11-06 18:39:48 -05:00

partialviews

Merged 2.5.x into saas

2014-11-10 09:08:03 -05: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

Merging 2.5.x into saas

2014-10-27 16:27:45 -04:00

preference

Tokens for Stream Settings page.

2014-10-01 20:55:07 +00:00

recorder

CC-1960: Internationalize Airtime / Support translations

2012-11-20 11:33:37 -05:00

schedule

Removed unneccessary upload-image view

2014-09-16 18:16:28 -04:00

showbuilder

CC-5354: Remove PHP short open tags for better compatibility

2013-10-04 14:15:23 -04:00

systemstatus

Made several reoccurring strings into application constants and altered any static strings containing them to use these constants in string format calls.

2014-11-06 18:39:48 -05:00

user

Super Admin edit page points to billing now

2014-06-20 13:36:06 -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