Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
sintonia/airtime_mvc/application
History
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
..
configs Merge branch 'master' of dev.sourcefabric.org:airtime 2011-04-25 17:24:53 -04:00
controllers CC-2203: Search results: "Delete" should be at the bottom of the list and should have a confirmation 2011-04-18 12:43:04 -04:00
forms CC-2196: Update a Live show with invalid data, uncheck the Record checkbox 2011-04-18 12:01:02 -04:00
layouts/scripts 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
logging CC-2186: Integration of a logger tool 2011-04-20 00:46:03 -04:00
models Merge branch 'master' of dev.sourcefabric.org:airtime 2011-04-25 17:24:53 -04: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 'master' of dev.sourcefabric.org:airtime 2011-04-25 17:24:53 -04:00
Bootstrap.php CC-2186: Integration of a logger tool 2011-04-20 00:46:03 -04:00