Martin Konecny c19b7f7c6e Merge branch '1.9.1' into devel ...

Conflicts:
	VERSION
	airtime_mvc/application/configs/constants.php
	airtime_mvc/application/models/MusicDir.php
	install_full/ubuntu/airtime-full-install
	install_minimal/include/airtime-upgrade.php
	python_apps/api_clients/api_client.py
	python_apps/media-monitor/airtimefilemonitor/mediamonitorcommon.py

2011-11-14 21:19:56 -05:00

..

airtime-constants.php

CC-2807: Remove AIRTIME_VERSION from constants.php and use the value in the database instead

2011-09-23 16:26:19 -04:00

airtime-copy-files.sh

CC-3015: Upgrade: upgrade fails

2011-11-03 15:04:23 -04:00

airtime-db-install.php

CC-2758: Make airtime-install script Debian/Ubuntu compatible

2011-11-01 15:21:09 -04:00

airtime-initialize.sh

-re-enable rabbitmq monit monitoring

2011-11-01 14:35:54 -04:00

airtime-install.ini

CC-2518: Auto install script for manual install

2011-07-19 17:30:23 -04:00

airtime-install.php

CC-2935: Upgrade: delete virtualenv dir and reinstall virtualenv

2011-11-01 11:15:35 -04:00

airtime-remove-files.sh

CC-3009: Install script installs virtualenv twice.

2011-11-01 14:02:05 -04:00

airtime-uninitialize.sh

CC-3009: Install script installs virtualenv twice.

2011-11-01 14:02:05 -04:00

airtime-uninstall.php

CC-2758: Make airtime-install script Debian/Ubuntu compatible

2011-10-28 12:35:58 -04:00

airtime-upgrade.php

Merge branch '1.9.1' into devel

2011-11-14 21:19:56 -05:00

AirtimeIni.php

CC-2888: Create a monit file for each airtime component

2011-09-26 14:40:26 -04:00

AirtimeInstall.php

CC-2758: Make airtime-install script Debian/Ubuntu compatible

2011-11-01 15:21:09 -04:00