Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
sintonia/airtime_mvc/application/views/scripts/schedule
History
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
..
add-show-form.phtml Merge branch 'devel' into 2.3.x-saas 2013-01-15 13:44:44 -05:00
add-show.phtml CC-1960: Internationalize Airtime / Support translations 2012-11-20 11:33:37 -05:00
cancel-current-show.phtml CC-1960: Internationalize Airtime / Support translations 2012-11-20 11:33:37 -05:00
cancel-show.phtml CC-1960: Internationalize Airtime / Support translations 2012-11-20 11:33:37 -05:00
clear-show.phtml CC-1960: Internationalize Airtime / Support translations 2012-11-20 11:33:37 -05:00
delete-show.phtml CC-1960: Internationalize Airtime / Support translations 2012-11-20 11:33:37 -05:00
edit-show.phtml 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
event-feed.phtml CC-1960: Internationalize Airtime / Support translations 2012-11-20 11:33:37 -05:00
get-current-playlist.phtml 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
get-form.phtml 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
get-show-data.phtml 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
index.phtml CC-3590: Calendar GUI->DJ user should not be able to invoke "Add Show" window 2012-04-09 12:19:22 -04:00
make-context-menu.phtml CC-1960: Internationalize Airtime / Support translations 2012-11-20 11:33:37 -05:00
move-show.phtml CC-1960: Internationalize Airtime / Support translations 2012-11-20 11:33:37 -05:00
remove-group.phtml CC-1960: Internationalize Airtime / Support translations 2012-11-20 11:33:37 -05:00
resize-show.phtml CC-1960: Internationalize Airtime / Support translations 2012-11-20 11:33:37 -05:00
schedule-show.phtml 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
show-content-dialog.phtml renamed links 2012-11-20 11:29:56 -05:00
show-list.phtml remove \r line endings 2012-10-30 13:23:09 -04:00