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

CC-1985 : Automatic rebroadcast of recorded content

2011-03-15 15:20:10 -04:00

cron

Removed even more old code, getting closer to a clean code base!

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

tests

Created a new Metadata class to hold static functions which parse audio

2011-03-06 11:05:12 -05:00

Alib.php

Removing lots of old code that is no longer used.

2011-03-05 11:06:22 -05:00

DateHelper.php

-further modifications to now-playing view with grouping by shows

2011-03-04 23:53:29 -05:00

genres.xml

adding zend project folders into old campcaster.

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

index.php

CC-1971

2011-02-22 18:22:31 +01:00

Nowplaying.php

CC-2025

2011-03-10 19:28:57 -05:00

Playlist.php

Removed even more old code, getting closer to a clean code base!

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

Preference.php

-CC-1944

2011-03-04 12:07:22 -05:00

Prefs.php

Removed even more old code, getting closer to a clean code base!

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

Schedule.php

CC-1848

2011-03-10 16:41:41 -05:00

Shows.php

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

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

SmilPlaylist.php

CC-1971

2011-02-22 18:22:31 +01:00

StoredFile.php

so no playlists show up on left side when a show is overbooked.

2011-03-07 12:59:46 -05:00

Subjects.php

Removing lots of old code that is no longer used.

2011-03-05 11:06:22 -05:00

Users.php

-CC-1736: install/airtime-user.php script needs to be updated for the new Zend Framework

2011-02-22 19:01:33 -05:00

XmlParser.php

CC-1971

2011-02-22 18:22:31 +01:00