sintonia/airtime_mvc/application/views/scripts/form
Martin Konecny 272e428fa7 Merge branch '2.2.x' into 2.2.x-saas
Conflicts:
	airtime_mvc/application/controllers/PreferenceController.php
	airtime_mvc/application/controllers/ScheduleController.php
	airtime_mvc/application/forms/EmailServerPreferences.php
	airtime_mvc/application/forms/GeneralPreferences.php
	airtime_mvc/application/forms/LiveStreamingPreferences.php
	airtime_mvc/application/forms/Preferences.php
	airtime_mvc/application/forms/SupportSettings.php
	airtime_mvc/application/models/Schedule.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_livestream.phtml
	airtime_mvc/application/views/scripts/form/support-setting.phtml
	airtime_mvc/application/views/scripts/menu.phtml
	airtime_mvc/application/views/scripts/schedule/add-
show-form.phtml
2012-11-06 17:23:32 -05: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-live-stream.phtml CC-3959: Make default username "source" for master and show inputs 2012-06-11 14:55:26 -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
add-show-when.phtml CC-3611: Show Form: "Repeats" font is wrong, info images in the wrong place 2012-05-17 17:33:50 -04:00
daterange.phtml CC-3845 : General UI cleanup 2012-05-18 16:11:22 +02:00
login.phtml CC-3874: after 3 unsuccessful attempts to login no RE-CAPTCHA is shown and 2012-05-23 17:14:59 -04:00
password-change.phtml CC-3416 : Create password reset form 2012-04-20 16:10:27 +02:00
password-restore.phtml CC-4283: Password Reset: Please let user input username they want to reset 2012-08-24 12:40:30 -04:00
preferences.phtml Merge branch '2.2.x' into 2.2.x-saas 2012-11-06 17:23:32 -05:00
preferences_email_server.phtml SAAS-289: Remove all isSaaS checks 2012-11-06 17:10:47 -05:00
preferences_general.phtml CC-3718: Please enable user to input the mail server settings 2012-06-11 12:53:09 -04:00
preferences_livestream.phtml SAAS-289: Remove all isSaaS checks 2012-11-06 17:10:47 -05:00
preferences_soundcloud.phtml - saas patch #1 2012-10-23 18:47:15 -04:00
preferences_watched_dirs.phtml CC-4306: Watch folder: rescan watch directory and remove watch directory tooltips should be shifted depending on the path length 2012-09-19 12:51:03 -04:00
register-dialog.phtml remove \r line endings 2012-10-30 13:23:09 -04:00
showbuilder.phtml CC-4559: More useful tooltip for Find Shows button in Now Playing page 2012-10-15 12:41:39 +01:00
smart-block-criteria.phtml CC-4536: Smart block criteria use AND logic, but additional modifiers use OR logic, without labels to show the difference 2012-11-06 12:03:49 -05:00
stream-setting-form.phtml CC-4440: System -> Streams: Update and Save 'Stream 1/2/3' will make it invisible 2012-09-14 17:35:14 -04:00
support-setting.phtml SAAS-289: Remove all isSaaS checks 2012-11-06 17:10:47 -05:00