naomiaro
|
d9e8e1641a
|
Merge branch 'master' of dev.sourcefabric.org:campcaster
Conflicts:
application/controllers/LibraryController.php
application/controllers/SearchController.php
|
2011-01-06 01:05:34 -05:00 |
mkonecny
|
20c392343b
|
-changed some references from campcaster to airtime in the documentation / comments
|
2011-01-05 12:19:58 -05:00 |
|
naomiaro
|
101b6fafa6
|
searching includes groups for and/or
|
2011-01-04 19:18:44 -05:00 |
|
naomiaro
|
8f088abaea
|
close working on side playlist
|
2010-12-22 12:42:46 -05:00 |
Naomi
|
28bd92d073
|
added visual icon to event to show if a show has content scheduled.
|
2010-12-16 16:24:16 -05:00 |
|
naomiaro
|
1b216c16dd
|
didn't realize these functions were still used in StoredFile...
|
2010-12-16 01:02:06 -05:00 |
|
Naomi
|
1d9aa778a6
|
can add a playlist to the schedule table in a show. basic, need to make better.
|
2010-12-15 18:53:47 -05:00 |
paul.baranowski
|
84c2a3bceb
|
Converted API functions to Zend Framework. Converted pypo to use
the new Zendified URLs. Fixed bugs in the daemontool scripts.
The installed scheduler is still not working at this point, but
getting close.
|
2010-12-09 18:44:47 -05:00 |
|
naomiaro
|
7ef0c18b26
|
adding zend project folders into old campcaster.
|
2010-12-07 14:19:27 -05:00 |