mkonecny 16bdfb7611 Merge branch 'master' of dev.sourcefabric.org:campcaster ...

Conflicts:
	public/css/styles.css

2011-02-07 19:06:06 -05:00

..

plugins

-improved now-playing page

2011-01-25 18:41:59 -05:00

ApiController.php

-audio preview now works in firefox!! CC-1707

2011-01-31 00:50:33 -05:00

ErrorController.php

adding zend project folders into old campcaster.

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

IndexController.php

using zend form for validation of adding shows, still needs some UI tweaks for showing/hiding options

2010-12-08 15:40:53 -05:00

LibraryController.php

documentation seems weird, trying to get content to be rerquested for playlist contents.

2011-02-04 01:28:55 -05:00

LoginController.php

moved menu/styles.css to bootstrap, as well as nowplaying javascript since they should be on everypage almost except for the login screen currently.

2011-02-01 11:43:52 -05:00

NowplayingController.php

-changes to list view. Framework so that we may change selected day

2011-02-07 19:03:14 -05:00

PlaylistController.php

first version of playlist builder with cues/fades. need to do some work to display errors, look to see if I can position the cursor better on the contenteditable spans within the lis because jQuery sortable is interfering with normal operation. don't have a fade in/out for theplaylist overall yet.

2011-02-07 18:44:42 -05:00

PluploadController.php

moved menu/styles.css to bootstrap, as well as nowplaying javascript since they should be on everypage almost except for the login screen currently.

2011-02-01 11:43:52 -05:00

PreferenceController.php

-implemented new ui design for preferences page.

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

ScheduleController.php

cannot schedule anything in a show that overlaps.

2011-02-06 23:58:58 -05:00

SearchController.php

removing js that isn't needed, don't have slot minute option on month view.

2011-02-02 14:57:51 -05:00

UserController.php

-changes to list view. Framework so that we may change selected day

2011-02-07 19:03:14 -05:00