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
|
5795871bcc
|
layout has more widget-like setup now. side playlist reused in search.
|
2010-12-21 23:33:58 -05:00 |
|
naomiaro
|
055f541657
|
side playlist working, need to add to search page as well.
|
2010-12-21 17:47:51 -05:00 |
|
naomiaro
|
9fd60932bd
|
side playlist almost done, just need to do drag and drop.
|
2010-12-21 16:45:36 -05:00 |
|
naomiaro
|
7ef0c18b26
|
adding zend project folders into old campcaster.
|
2010-12-07 14:19:27 -05:00 |