sintonia/airtime_mvc/application
Martin Konecny 413d669bbf Merge branch 'cc-3336-refactor-pypo' of dev.sourcefabric.org:airtime into cc-3336-refactor-pypo
Conflicts:
	airtime_mvc/application/models/Schedule.php
	python_apps/pypo/pypofetch.py
	python_apps/pypo/pypopush.py

-weird conflict. I must have committed while I had my changes git-stash'ed
2012-02-28 13:58:10 -05:00
..
configs CC-3174 : showbuilder 2012-02-23 12:13:00 +01:00
controllers CC-3336: Refactor schedule API used by pypo 2012-02-23 15:20:24 -05:00
forms Merge branch 'CC-3174' into devel 2012-02-17 11:50:49 +01:00
layouts/scripts CC-3340 : Remove "Search" tab from library view 2012-02-22 21:56:55 +01:00
logging CC-3153: When cancelling a show that is currently on-air, the show-instance is not removed. 2011-12-02 16:22:54 -05:00
models Merge branch 'cc-3336-refactor-pypo' of dev.sourcefabric.org:airtime into cc-3336-refactor-pypo 2012-02-28 13:58:10 -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 CC-3340 : Remove "Search" tab from library view 2012-02-22 21:56:55 +01:00
Bootstrap.php Merge branch '2.0.x' into devel 2012-02-14 14:47:07 -05:00