libretime/airtime_mvc/application
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
..
cloud_storage Refactored file storage code slightly to allow multiple download URLs 2015-03-30 11:31:07 -04:00
common Merge branch 'saas-dev' into saas-tunein 2015-05-19 15:50:16 -04:00
configs Merge branch '2.5.x-installer' into saas-installer-albert 2015-05-22 16:05:29 -04:00
controllers Merge branch '2.5.x-installer' into saas-installer-albert 2015-05-22 16:05:29 -04:00
forms Changed Preferences and Stream Settings pages to use new-style csrf token generation 2015-05-21 10:17:05 -04:00
layouts/scripts Merge branch 'saas-dev' into saas-speedy 2015-05-04 13:09:51 -04:00
logging Fixed a bug in FTP upload hook, other minor improvements 2015-03-24 14:56:03 -04:00
models Merge branch '2.5.x-installer' into saas-installer-albert 2015-05-22 16:05:29 -04:00
modules/rest Fixed a bug in FTP upload hook, other minor improvements 2015-03-24 14:56:03 -04:00
services Merge branch 'saas' into saas-speedy 2015-05-21 15:09:57 -04:00
upgrade Merge branch '2.5.x-installer' into saas-installer-albert 2015-05-22 16:05:29 -04:00
validate Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00
views Merge branch '2.5.x-installer' into saas-installer-albert 2015-05-22 16:05:29 -04:00
Bootstrap.php Merge branch '2.5.x-installer' into saas-installer-albert 2015-05-22 16:05:29 -04:00
airtime-boot.php Merge branch '2.5.x-installer' into saas-installer-albert 2015-05-22 16:05:29 -04:00