martin 1540e593e4 Merge branch '1.8.2' into devel ...

Conflicts:
	airtime_mvc/application/models/Dashboard.php
	python_apps/media-monitor/airtime-media-monitor-start
	python_apps/pypo/airtime-pypo-start
	python_apps/show-recorder/airtime-show-recorder-start

2011-06-03 17:29:55 -04:00

..

apache

-removed unnecessary line from apache vhost file.

2011-05-30 11:31:17 -04:00

DoctrineMigrations

testing if the column has wrong type, if so replacing it.

2011-04-07 15:28:29 -04:00

include

cc-2055: switch to init.d

2011-06-03 11:30:08 -04:00

upgrades

cc-2055: switch to init.d

2011-06-02 18:07:48 -04:00

airtime-db-install.php

CC-2281 Install script should check for pre-installed versions and prompt user to upgrade/full installation

2011-05-19 15:33:48 -04:00

airtime-dircheck.php

CC-2166: Packaging Improvements. Moved the Zend app into airtime_mvc. It is now installed to /var/www/airtime. Storage is now set to /srv/airtime/stor. Utils are now installed to /usr/lib/airtime/utils/. Added install/airtime-dircheck.php as a simple test to see if everything is install/uninstalled correctly.

2011-04-14 18:55:04 -04:00

airtime-install

cc-2055: switch to init.d

2011-06-03 11:30:08 -04:00

airtime-install.php

cc-2055: switch to init.d

2011-06-02 18:07:48 -04:00

airtime-uninstall

cc-2055: switch to init.d

2011-06-03 11:30:08 -04:00

airtime-uninstall.php

cc-2055: switch to init.d

2011-06-02 18:07:48 -04:00

airtime-upgrade.php

cc-2055: switch to init.d

2011-06-02 18:07:48 -04:00

airtime-user.php

CC-2149: Adjustments for DEB packaging

2011-04-13 12:07:00 -04:00

index.php

CC-1971

2011-02-22 18:22:31 +01:00

install_twitter_plugin.php

CC-1971

2011-02-22 18:22:31 +01:00

pg_hba.conf

Minor fixes for the name change Campcaster -> Airtime.

2011-01-07 17:17:23 -05:00

uninstall_twitter_plugin.php

CC-1971

2011-02-22 18:22:31 +01:00