naomiaro 8f86b05a4b Merge branch 'master' of dev.sourcefabric.org:campcaster ...

Conflicts:
	application/controllers/ScheduleController.php
	public/css/styles.css

2011-03-15 17:02:22 -04:00

..

airtime-recorder

soundcloud python/php apis, recorder python script so far.

2011-03-05 11:53:29 -05:00

dashboard

Fixed merge conflicts

2011-02-14 13:16:57 +01:00

error

-fixed bug CC-1837

2011-02-01 20:28:38 -05:00

form

add classes to day check in jQuery or else zend doesn't populate the form properly.

2011-02-10 19:19:55 -05:00

index

adding zend project folders into old campcaster.

2010-12-07 14:19:27 -05:00

library

advanced search tab does not appear.

2011-02-14 11:52:50 -05:00

login

Cleaned up conf.php to make it more obvious what a user should change and what they shouldnt.

2011-03-03 18:08:51 -05:00

nowplaying

-removed <a> tags in favour of <span> tags

2011-02-13 17:51:28 -05:00

partialviews

CC-2002

2011-03-11 13:56:13 -05:00

playlist

CC-1916 playlist metadata page looks better.

2011-02-11 18:55:08 -05:00

plupload

adding zend project folders into old campcaster.

2010-12-07 14:19:27 -05:00

preference

-implemented new ui design for preferences page.

2011-02-07 12:36:35 -05:00

recorder

soundcloud python/php apis, recorder python script so far.

2011-03-05 11:53:29 -05:00

schedule

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

2011-03-15 17:02:22 -04:00

search

starting advanced search

2011-02-09 22:37:18 -05:00

user

Minor tweaks to some frontend text.

2011-03-09 18:21:29 -05:00

menu.phtml

airtime menu now uses ACL with the custom viewscript.

2011-02-10 18:03:41 -05:00