Robert Elder 9fb35c448e Resolved merge conflicts for merging cc-5709-airtime-analyzer into saas.

2014-10-10 19:57:22 +00: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

Fix undefined variable

2014-07-25 15:18:17 -04:00

dashboard

Fixed the unit tests and changed ops->zu

2014-06-09 11:34:25 -04:00

error

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

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

form

Resolved merge conflicts for merging cc-5709-airtime-analyzer into saas.

2014-10-10 19:57:22 +00: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

Fixed the unit tests and changed ops->zu

2014-06-09 11:34:25 -04:00

partialviews

Trialbox: Don't open My Account in new window

2014-07-02 14:49:11 -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

Merge branch '2.5.x' into cc-5709-airtime-analyzer

2014-10-08 11:46:08 -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

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

2013-10-04 14:15:23 -04: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