sintonia/airtime_mvc/application/views/scripts/form
James 9eb21cb327 Merge branch '1.9.1' into devel
Conflicts:
	VERSION
	airtime_mvc/application/configs/constants.php
	airtime_mvc/application/models/Preference.php
	install_minimal/include/airtime-db-install.php
	install_minimal/include/airtime-upgrade.php
	python_apps/api_clients/api_client.py
2011-08-24 10:30:59 -04:00
..
add-show-block.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
add-show-rebroadcast-absolute.phtml fixes to template, javascript to handle error arrays. 2011-04-15 10:51:06 -04:00
add-show-rebroadcast.phtml fixes to template, javascript to handle error arrays. 2011-04-15 10:51:06 -04:00
add-show-style.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
add-show-what.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
preferences.phtml CC-2701: Separate Support Settings from Preference page 2011-08-18 18:58:59 -04:00
preferences_general.phtml Merge branch '1.9.1' into devel 2011-08-19 16:43:16 -04:00
preferences_soundcloud.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
preferences_watched_dirs.phtml CC-2506:'choose folder' should be 'Choose folder' 2011-07-06 13:50:32 -04:00
register-dialog.phtml CC-2718: Changes to the support page 2011-08-23 16:46:29 -04:00
stream-setting-form.phtml CC-2607: Ability to adjust stream bitrate,type,etc from the UI interface 2011-08-19 16:35:23 -04:00
support-setting.phtml CC-2718: Changes to the support page 2011-08-23 16:46:29 -04:00