paul.baranowski b6d117d456 Fixed merge conflicts

2011-02-14 13:16:57 +01: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

CC-1917 file meta data screen

2011-02-12 14:44:55 -05:00

login

-bug CC-1823 should be fixed.

2011-01-30 16:47:11 -05:00

nowplaying

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

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

partialviews

-small fixes

2011-02-10 20:48:26 -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

schedule

show cancelling available (needed for repeating shows)

2011-02-12 17:21:37 -05:00

search

starting advanced search

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

user

-fixed up about tool-tip

2011-02-11 11:56:14 -05:00

menu.phtml

airtime menu now uses ACL with the custom viewscript.

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