Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
sintonia/airtime_mvc/application/controllers
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
..
plugins CC-4785: Zend errors on page not found 2013-01-08 15:14:33 -05:00
ApiController.php Merge branch 'devel' into 2.3.x-saas 2013-01-15 13:44:44 -05:00
AudiopreviewController.php Merge branch 'cc-4384-remove-table-calling-with-cc-config' into devel 2013-01-14 16:19:51 -05:00
DashboardController.php Merge branch 'cc-4384-remove-table-calling-with-cc-config' into devel 2013-01-14 16:19:51 -05:00
ErrorController.php CC-1960: Internationalize Airtime / Support translations 2012-11-20 11:33:37 -05:00
IndexController.php CC-4090: Make code style PSR compliant 2012-07-15 21:17:13 -04:00
LibraryController.php Merge branch 'cc-4384-remove-table-calling-with-cc-config' into devel 2013-01-14 16:19:51 -05:00
ListenerstatController.php Merge branch 'cc-4384-remove-table-calling-with-cc-config' into devel 2013-01-14 16:19:51 -05:00
LocaleController.php CC-4838: I18N: HTML contents of Print preview for Playout History need to be translated 2013-01-14 17:01:50 -05:00
LoginController.php Merge branch 'cc-4384-remove-table-calling-with-cc-config' into devel 2013-01-14 16:19:51 -05:00
PlaylistController.php CC-1960: Internationalize Airtime / Support translations 2012-11-20 11:33:37 -05:00
PlayouthistoryController.php Merge branch 'cc-4384-remove-table-calling-with-cc-config' into devel 2013-01-14 16:19:51 -05:00
PluploadController.php Merge branch 'cc-4384-remove-table-calling-with-cc-config' into devel 2013-01-14 16:19:51 -05:00
PreferenceController.php Merge branch 'devel' into 2.3.x-saas 2013-01-15 13:44:44 -05:00
ScheduleController.php Merge branch 'devel' into 2.3.x-saas 2013-01-15 13:44:44 -05:00
ShowbuilderController.php Merge branch 'cc-4384-remove-table-calling-with-cc-config' into devel 2013-01-14 16:19:51 -05:00
SystemstatusController.php Merge branch 'devel' into 2.3.x-saas 2013-01-15 13:44:44 -05:00
UserController.php Merge branch 'cc-4384-remove-table-calling-with-cc-config' into devel 2013-01-14 16:19:51 -05:00
UsersettingsController.php removed benchmarking 2012-09-19 16:36:04 -04:00
WebstreamController.php CC-1960: Internationalize Airtime / Support translations 2012-11-20 11:33:37 -05:00