Commit Graph

410 Commits

Author SHA1 Message Date
james e762633405 CC-1724:Phone home statistics
- Final commit for client side.
2011-06-20 17:58:38 -04:00
Naomi Aro ea21da6b61 CC-1799 Put Airtime Storage into a Human Readable File Naming Convention
recursively copying the audio_samples directory.
2011-06-17 17:54:36 +02:00
james 5adfb79981 CC-1724:Phone home statistics
Temp commit
2011-06-15 17:51:44 -04:00
james cf654f1a45 CC-1724:phone-home-statistics
Rebase from devel into this branch
2011-06-15 12:06:50 -04:00
james 11b601308e CC-1724:Phone home statistics
Temp commit
2011-06-15 11:17:03 -04:00
Paul Baranowski eb76bbe7f0 Merge branch 'master' of dev.sourcefabric.org:airtime
Conflicts:
	VERSION
	airtime_mvc/application/configs/conf.php
	airtime_mvc/application/models/Playlist.php
	airtime_mvc/application/models/Schedule.php
	airtime_mvc/application/models/Shows.php
	airtime_mvc/application/models/StoredFile.php
	airtime_mvc/application/views/scripts/form/preferences_general.phtml
	airtime_mvc/application/views/scripts/user/remove-user.phtml
	airtime_mvc/public/js/airtime/schedule/add-show.js
	airtime_mvc/public/js/airtime/schedule/schedule.js
	install/airtime-upgrade.php
	install/include/AirtimeInstall.php
	python_apps/api_clients/api_client.py
	utils/airtime-clean-storage
	utils/airtime-clean-storage.php
	utils/airtime-import
	utils/airtime-import.php
2011-04-25 17:24:53 -04:00
martin 4b7ea32c7d -syntax errors discovered by eclipse 2011-04-21 17:23:59 -04:00
Naomi eb312ae454 fixes to template, javascript to handle error arrays. 2011-04-15 10:51:06 -04:00
Naomi c3a02e2569 some fixes to display rows in form. 2011-04-15 10:04:16 -04:00
Paul Baranowski b11cbd8159 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