Congegni
/
libretime
mirror of https://github.com/libretime/libretime.git
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
libretime/airtime_mvc/public/js
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 Merge branch 'saas-dev' into saas-speedy 2015-05-21 15:10:01 -04:00
blockui Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00
bootstrap Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00
bootstrap-datetime Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00
colorpicker/js Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00
contextmenu Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00
cookie Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00
datatables Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00
flot Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00
fullcalendar Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00
i18n Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00
jplayer Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00
libs Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00
plupload Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00
qtip Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00
serverbrowse Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00
setup Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00
sprintf Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00
timepicker Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00
tipsy Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00
waveformplaylist Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00