Commit graph

19 commits

Author SHA1 Message Date
drigato
77241bb6fc Merge branch '2.5.x' into saas 2015-05-11 14:57:58 -04:00
drigato
2953576921 CC-5997: Tracks get scheduled outside of the show start and end time 2015-05-11 14:57:20 -04:00
drigato
2cc7557cb7 Remove php short tag for better compatibility 2014-08-29 17:10:55 -04:00
Naomi Aro
49474ab5c4 Merge branch '2.5.x' into 2.5.x-saas
Conflicts:
	airtime_mvc/application/forms/AddShowWhen.php
	airtime_mvc/application/forms/LiveStreamingPreferences.php
	airtime_mvc/application/models/Schedule.php
	airtime_mvc/application/views/scripts/form/preferences.phtml
	airtime_mvc/application/views/scripts/form/preferences_livestream.phtml
	airtime_mvc/application/views/scripts/form/support-setting.phtml
	airtime_mvc/application/views/scripts/schedule/add-show-form.phtml
2013-12-17 17:20:38 -05:00
Albert Santoni
7b1cd5c908 CC-5354: Remove PHP short open tags for better compatibility 2013-10-04 14:15:23 -04:00
Martin Konecny
8cd6bd9aa4 Merge branch 'devel' into 2.3.x-saas
Conflicts:
	airtime_mvc/application/controllers/PreferenceController.php
	airtime_mvc/application/forms/AddShowWhen.php
	airtime_mvc/application/forms/GeneralPreferences.php
	airtime_mvc/application/forms/LiveStreamingPreferences.php
	airtime_mvc/application/forms/SoundcloudPreferences.php
	airtime_mvc/application/forms/SupportSettings.php
	airtime_mvc/application/views/scripts/form/preferences.phtml
	airtime_mvc/application/views/scripts/form/preferences_email_server.phtml
	airtime_mvc/application/views/scripts/form/preferences_general.phtml
	airtime_mvc/application/views/scripts/form/preferences_livestream.phtml
	airtime_mvc/application/views/scripts/form/support-setting.phtml
	airtime_mvc/application/views/scripts/schedule/add-
show-form.phtml
	airtime_mvc/public/js/airtime/preferences/preferences.js
	python_apps/api_clients/api_client.py
	python_apps/pypo/listenerstat.py
2013-01-15 13:44:44 -05:00
James
8acc8fce76 CC-1960: Internationalize Airtime / Support translations
- fixed close button on show add form
2012-11-27 15:55:32 -05:00
denise
e5f67c8b05 CC-1960: Internationalize Airtime / Support translations
-added gettext wrapper functions for all strings in view/scripts, and forms
2012-11-20 11:33:37 -05:00
Rudi Grinberg
15741bdfa9 renamed links 2012-11-20 11:29:56 -05:00
Martin Konecny
fd3305bc4c SAAS-289: Remove all isSaaS checks
-done
2012-11-06 17:10:47 -05:00
Martin Konecny
38d28d3346 SAAS-289: Remove all isSaaS checks 2012-11-06 16:48:34 -05:00
James
10fc5038c8 CC-3965: Clarify input/output stream settings by addding appropriate labels
- fixed
2012-06-20 17:39:52 -04:00
Paul Baranowski
6d75b4fc06 The fix for long connection strings in "Add Show" form caused the tooltips to
be displayed incorrectly (hidden).  Reverted that change.

Fixed display of "Stream URL" in the stream settings.
2012-05-17 18:07:41 -04:00
Paul Baranowski
869eb77ca4 CC-3611: Show Form: "Repeats" font is wrong, info images in the wrong place
Fixed both of these issues.

Fixed issue with connection URLs in "Add Show" and in "Stream Prefs" where
the text was unstyled.

Fixed issue with long connection URLS causing display problems
in "Add Show" and in "Stream Prefs".  Now a scrollbar will appear if the
connection URL is too long.

Fixed bug in Stream Prefs where zooming out caused the page to be formatted
differently.

Fixed bug in Stream Prefs where the labels "Master Source Connection URL" and
"Show Source Connection URL" wrapped on multiple lines.

Fixed help text for Add Show -> Live Stream authication settings, the
instructions were wrong and there were misspelled words.
2012-05-17 17:33:50 -04:00
James
954fa2bceb CC-3444: Ability to edit currently playing show (end time and permissions)
- handling in better way. we created separate action for this.
2012-04-05 16:01:27 -04:00
Martin Konecny
8050a1ce29 CC-3548: Schedule: Separate repeate show template and single instance on 'When' section
-in progress
2012-04-05 14:45:16 -04:00
james
701ed82f40 CC-3224: "On-the-fly" stream rebroadcasting
- interface implementation. subform within the show form.
2012-03-14 14:41:00 -04:00
James
903c3474c7 CC-2654: Remove abilities that don't apply to SaaS
- not displaying manage folder option when saas is true
- not displaying record and rebroadcast section when saas is true
2011-09-02 15:24:35 -04:00
Paul Baranowski
b11cbd8159 CC-2166: Packaging Improvements. Moved the Zend app into airtime_mvc. It is now installed to /var/www/airtime. Storage is now set to /srv/airtime/stor. Utils are now installed to /usr/lib/airtime/utils/. Added install/airtime-dircheck.php as a simple test to see if everything is install/uninstalled correctly. 2011-04-14 18:55:04 -04:00
Renamed from application/views/scripts/schedule/add-show-form.phtml (Browse further)