sintonia/airtime_mvc/application/controllers
Albert Santoni 11c6818e61 Merge branch '2.5.x-installer' into saas-installer-albert
Conflicts:
	.gitignore
	airtime_mvc/application/Bootstrap.php
	airtime_mvc/application/configs/conf.php
	airtime_mvc/application/controllers/SystemstatusController.php
	airtime_mvc/application/controllers/UpgradeController.php
	airtime_mvc/application/upgrade/Upgrades.php
	airtime_mvc/application/views/scripts/systemstatus/index.phtml
	airtime_mvc/build/airtime.conf
	airtime_mvc/build/sql/defaultdata.sql
	airtime_mvc/public/index.php
	airtime_mvc/tests/application/helpers/AirtimeInstall.php
	install_minimal/airtime-install
	install_minimal/include/airtime-constants.php
	install_minimal/include/airtime-copy-files.sh
	install_minimal/include/airtime-db-install.php
	install_minimal/include/airtime-initialize.sh
	install_minimal/include/airtime-install.php
	install_minimal/include/airtime-installed-check.php
	install_minimal/include/airtime-remove-files.sh
	install_minimal/include/airtime-upgrade.php
	python_apps/media-monitor/install/media-monitor-copy-files.py
	python_apps/monit/monit-airtime-generic.cfg
	python_apps/pypo/airtime-playout
	python_apps/pypo/install/pypo-copy-files.py
	python_apps/pypo/liquidsoap/generate_liquidsoap_cfg.py
	python_apps/pypo/liquidsoap/ls_script.liq
	python_apps/pypo/pypo/__main__.py
	python_apps/pypo/pypo/media/update/replaygain.py
	python_apps/pypo/pypo/media/update/replaygainupdater.py
	python_apps/pypo/pypo/media/update/silananalyzer.py
	python_apps/python-virtualenv/airtime_virtual_env.pybundle
	python_apps/python-virtualenv/requirements
	utils/airtime-check-system.php
2015-05-22 16:05:29 -04:00
..
plugins SAAS-720: Player can't be accessed unless a user has a valid session 2015-04-09 12:25:27 -04:00
upgrade_sql Merge branch '2.5.x-installer' into saas-installer-albert 2015-05-22 16:05:29 -04:00
ApiController.php Merge branch '2.5.x-installer' into saas-installer-albert 2015-05-22 16:05:29 -04:00
AudiopreviewController.php Fixed webstream previewing 2015-02-26 11:09:43 -05:00
BillingController.php Decouple Billing and S3 cloud storage stuff from Zend 2015-01-26 13:10:10 -05:00
DashboardController.php Reformatted Bootstrap, added Station Suspended notice 2015-04-10 17:14:56 -04:00
EmbedController.php Fix player's manual mode 2015-04-10 10:52:40 -04:00
ErrorController.php Merge branch '2.5.x-installer' into saas-installer-albert 2015-05-22 16:05:29 -04:00
IndexController.php Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00
LibraryController.php Refactored session_write_close() optimization and dashboard preloading 2015-04-09 13:03:06 -04:00
ListenerstatController.php Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00
LocaleController.php Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00
LoginController.php Open session for writing when we need it (fixes login/logout) 2015-04-10 15:03:25 -04:00
PlayerController.php SAAS-720: Player can't be accessed unless a user has a valid session 2015-04-09 12:25:27 -04:00
PlaylistController.php Some big performance optimizations to Now Playing JavaScript. 2015-04-10 22:53:39 -04:00
PlayouthistoryController.php Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00
PlayouthistorytemplateController.php Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00
PluploadController.php SAAS-606: Enable disk quota on Airtime Pro 2015-03-11 13:50:17 -04:00
PreferenceController.php Merge branch 'saas-dev' into saas-speedy 2015-05-21 15:10:01 -04:00
ProvisioningController.php Only use API authentication (not session) when validating termination requests 2015-05-13 17:58:02 -04:00
ScheduleController.php Merge branch 'saas-dev' into saas-speedy 2015-05-21 15:10:01 -04:00
ShowbuilderController.php Removed unused status page stuff for Pro and cleanup for code review 2015-04-17 11:17:35 -04:00
SystemstatusController.php Removed unused status page stuff for Pro and cleanup for code review 2015-04-17 11:17:35 -04:00
ThankYouController.php Trial->Paid conversion tracking with GTM 2015-03-24 10:11:25 -04:00
UpgradeController.php Merge branch '2.5.x-installer' into saas-installer-albert 2015-05-22 16:05:29 -04:00
UserController.php Fix for SAAS-747 2015-04-28 11:42:18 -04:00
UsersettingsController.php Open session for writing when we need it (fixes login/logout) 2015-04-10 15:03:25 -04:00
WebstreamController.php Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00
WhmcsLoginController.php Bind CURL calls to WHMCS to ipv4 adapter because WHMCS IP whitelist 2014-12-01 16:10:03 -05:00