Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
sintonia/airtime_mvc/application/views/scripts
History
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
..
airtime-recorder 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
api remove \r line endings 2012-10-30 13:23:09 -04:00
audiopreview CC-4570: blockId and blockIndex are visible at top of smart block preview pop-up 2012-10-16 14:51:14 -04:00
dashboard CC-4070: Built-in help text is wrongly worded about adding files 2012-09-04 16:25:05 -04:00
error CC-2992: 404 "Help" link doesnt work 2011-11-15 16:37:41 -05:00
form Merge branch '2.2.x' into 2.2.x-saas 2012-11-06 17:23:32 -05:00
index 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
library CC-4604: Edit Metadata: DJ's cannot edit metadata on their own files 2012-10-31 16:01:17 -04:00
login Fixed typo in password restore message 2012-10-09 14:21:58 +01:00
partialviews CC-3712 : Trial end date overlaps with Airtime Clock 2012-05-22 12:40:08 +02:00
playlist CC-4590: New smart block says 'Empty playlist' 2012-10-29 11:57:20 -04:00
playouthistory CC-3712 : Trial end date overlaps with Airtime Clock 2012-05-22 12:45:42 +02:00
plupload CC-2748: Make Airtime look good in IE 2011-10-03 15:27:10 -04:00
preference CC-3965: Clarify input/output stream settings by addding appropriate labels 2012-06-20 17:39:52 -04:00
recorder 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
schedule SAAS-289: Remove all isSaaS checks 2012-11-06 17:10:47 -05:00
showbuilder CC-4646: Library: Make advanced search options hidden by default 2012-10-30 11:59:52 -04:00
systemstatus CC-2363: Diagnostic screen in Web UI 2011-09-22 10:45:43 -04:00
user Remove unused function 2012-08-30 16:30:49 -04:00
webstream CC-4679: Library: Deleting Webstream leaves the SAVE button 2012-11-06 16:49:36 -05:00
menu.phtml SAAS-289: Remove all isSaaS checks 2012-11-06 17:10:47 -05:00