Naomi 108bf65930 Merge branch 'master' of dev.sourcefabric.org:campcaster ...

Conflicts:
	application/controllers/ScheduleController.php

2011-02-09 14:15:18 -05:00

..

sql

Merge branch 'master' of dev.sourcefabric.org:campcaster

2011-02-09 13:07:36 -05:00

build.properties

-added new users management screen

2011-02-09 13:03:46 -05:00

database.conf

-added script that updates various database config files for the frameworks we are using.

2011-01-07 16:32:41 -05:00

runtime-conf.xml

database changes for name, searching for playlist for a show.

2011-01-10 13:24:21 -05:00

schema.xml

Merge branch 'master' of dev.sourcefabric.org:campcaster

2011-02-09 13:07:36 -05:00

update_db_info.py

-updated update_db_info.py script so that propel-gen handles regenerating /application/configs/propel-config.php

2011-01-07 16:50:33 -05:00