sintonia/airtime_mvc
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
..
application Merge branch 'cc-3336-refactor-pypo' of dev.sourcefabric.org:airtime into cc-3336-refactor-pypo 2012-02-28 13:58:10 -05:00
build CC-3174 : showbuilder 2012-02-15 18:27:59 +01:00
library CC-3297: Depend on zendframework and php-pear as external packages 2012-02-06 20:28:38 -05:00
public CC-3335 : Timeline: Drag and drop usability improvements 2012-02-23 17:46:07 +01:00
tests 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