sintonia/airtime_mvc/application
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
..
configs 1.9.5 preparations 2011-11-02 15:19:27 -04:00
controllers SAAS-67: "Hardware Audio Out" shows when SaaS is enabled 2011-11-14 16:23:23 -05:00
forms CC-3001: Preferences->"Submit" button renamed to "Save", and should be at the top and the bottom of the screen 2011-11-09 16:03:32 -05:00
layouts/scripts CC-2950: Tell users if they are running an out-of-date version or not 2011-11-14 00:34:53 -05:00
logging CC-2747: When metadata contains non utf-8 encoding, we should handle it 2011-08-31 14:46:21 -04:00
models Merge branch '1.9.1' into devel 2011-11-14 21:19:56 -05:00
validate 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
views Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-11-14 00:35:27 -05:00
Bootstrap.php CC-2950: Tell users if they are running an out-of-date version or not 2011-11-14 00:34:53 -05:00