Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
sintonia/airtime_mvc/application/models
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 Refactored file storage code slightly to allow multiple download URLs 2015-03-30 11:31:07 -04:00
formatters Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00
tests Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00
Auth.php Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00
Block.php Merge branch '2.5.x' into saas 2015-01-27 15:39:40 -05:00
Cache.php Fixes for code review https://github.com/sourcefabric/Airtime/pull/84 2015-01-15 16:33:33 -05:00
Dashboard.php Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00
Datatables.php Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00
Email.php Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00
Library.php Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00
LibraryEditable.php Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00
ListenerStat.php Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00
LiveLog.php Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00
Locale.php Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00
LoginAttempts.php Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00
MusicDir.php Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00
Playlist.php Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00
Preference.php Merge branch '2.5.x-installer' into saas-installer-albert 2015-05-22 16:05:29 -04:00
RabbitMq.php Removed station_domain from messages to airtime_analyzer, unused. 2015-05-19 16:20:51 -04:00
Schedule.php SAAS-772: Send metadata to Tunein 2015-05-19 14:39:05 -04:00
Scheduler.php Merge branch 'saas' into saas-speedy 2015-04-15 16:44:43 -04:00
ServiceRegister.php Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00
Show.php Merge branch '2.5.x-installer' into saas-installer-albert 2015-05-22 16:05:29 -04:00
ShowBuilder.php Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00
ShowInstance.php Refactored file storage code slightly to allow multiple download URLs 2015-03-30 11:31:07 -04:00
Soundcloud.php Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00
StoredFile.php Merge branch '2.5.x-installer' into saas-installer-albert 2015-05-22 16:05:29 -04:00
StreamSetting.php Embed player - code review fixes 2015-04-07 17:49:21 -04:00
Subjects.php Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00
Systemstatus.php Merge branch '2.5.x-installer' into saas-installer-albert 2015-05-22 16:05:29 -04:00
User.php Don't fire conversion tracking for the sourcefabric_admin user 2015-03-24 11:18:03 -04:00
Webstream.php CC-5120: Can't add PLS webstreams 2015-05-11 11:08:43 -04:00