Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
sintonia/airtime_mvc/application/views/scripts
History
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
..
airtime-recorder Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00
api Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00
audiopreview Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00
billing Decouple Billing and S3 cloud storage stuff from Zend 2015-01-26 13:10:10 -05:00
dashboard Merge branch '2.5.x-installer' into saas-installer-albert 2015-05-22 16:05:29 -04:00
embed Fixed player displaying nothing (instead of Offline) when no show is scheduled 2015-04-30 14:36:33 -04:00
error Fixed error logging and refactored ErrorController to get invoked 2015-03-20 17:20:34 -04:00
form Fix bad merge that added soundcloud settings back into preferences page 2015-05-19 15:51:04 -04:00
index Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00
library Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00
listenerstat Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00
login Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00
partialviews Reformatted Bootstrap, added Station Suspended notice 2015-04-10 17:14:56 -04:00
player SAAS-720: Player can't be accessed unless a user has a valid session 2015-04-09 12:25:27 -04:00
playlist Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00
playouthistory Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00
playouthistorytemplate Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00
plupload Added missing translation for disk quota error message 2015-05-19 12:18:01 -04:00
preference Moved the Station Logo field to GeneralPreferences, and stopped using 2015-01-15 16:28:18 -05:00
recorder Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00
schedule Merge branch '2.5.x' into saas 2015-05-11 14:57:58 -04:00
showbuilder Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00
systemstatus Removed unused status page stuff for Pro and cleanup for code review 2015-04-17 11:17:35 -04:00
thank-you Trial->Paid conversion tracking with GTM 2015-03-24 10:11:25 -04:00
user Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00
webstream Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00
menu.phtml CSS fixes to make page header more responsive 2015-03-25 17:29:28 -04:00