Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
sintonia/airtime_mvc/application/controllers
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
..
plugins increase mem warning limit to 30MB 2012-09-12 15:44:26 -04:00
ApiController.php - saas patch #1 2012-10-23 18:47:15 -04:00
AudiopreviewController.php CC-4568: Show preview broken in Now Playing page 2012-10-16 11:06:01 -04:00
DashboardController.php CC-4094: Dashboard -> Source Info panel: DJ assigned to current show can turn off the Master Resouce but cannot disconnect it. 2012-09-17 15:41:27 -04:00
ErrorController.php CC-4090: Make code style PSR compliant 2012-07-15 21:17:13 -04:00
IndexController.php CC-4090: Make code style PSR compliant 2012-07-15 21:17:13 -04:00
LibraryController.php CC-4455: "Add to current smart block" context menu action should be disabled for dynamic smart blocks 2012-11-06 14:33:34 -05:00
LoginController.php Removed unused variables. 2012-09-13 10:35:24 -04:00
PlaylistController.php CC-4639: 2012-11-06 16:32:00 -05:00
PlayouthistoryController.php change Logging::log to Logging::info 2012-08-21 18:41:56 -04:00
PluploadController.php cc-4301: Fixed bug where owner_id would be null whenever show is recorded. 2012-08-27 17:58:09 -04:00
PreferenceController.php Merge branch '2.2.x' into 2.2.x-saas 2012-11-06 17:23:32 -05:00
ScheduleController.php SAAS-289: Remove all isSaaS checks 2012-11-06 17:10:47 -05:00
ShowbuilderController.php CC-4571: Now Playing delete action does not delete, should be labelled 'Remove from show' 2012-10-16 16:01:05 -04:00
SystemstatusController.php disable rabbitmq status on SaaS 2012-10-25 17:50:43 -04:00
UserController.php Removed empty method 2012-09-19 10:25:29 -04:00
UsersettingsController.php removed benchmarking 2012-09-19 16:36:04 -04:00
WebstreamController.php fix some TODO's in webstream.php 2012-09-18 12:40:44 -04:00