Martin Konecny a941743ed7 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel ... Conflicts: airtime_mvc/application/models/User.php		2012-09-06 12:55:24 -04:00
..
airtime	…
formatters	CC-4090: Make code style PSR compliant - part 4	2012-08-29 10:58:03 -04:00
tests	…
Auth.php	…
Block.php	CC-4345: Prepared statements - part 1	2012-09-06 11:11:09 -04:00
Dashboard.php	…
Datatables.php	CC-4345: Prepared statements - part 1	2012-09-06 11:21:36 -04:00
Email.php	Merge branch 'devel' of dev.sourcefabric.org:airtime into devel	2012-08-29 11:05:14 -04:00
Library.php	CC-4090: Make code style PSR compliant - part 4	2012-08-29 10:58:03 -04:00
LibraryEditable.php	…
LiveLog.php	…
LoginAttempts.php	…
MusicDir.php	…
Playlist.php	CC-4090: Make code style PSR compliant - part 4	2012-08-29 10:58:03 -04:00
PlayoutHistory.php	cc-4288:Sexification of =>.	2012-08-31 13:33:55 -04:00
Preference.php	CC-4348: Prepared statements - part 4	2012-09-05 15:15:56 -04:00
RabbitMq.php	MM2: Cleaned up pure.py a little	2012-09-04 16:52:22 -04:00
Schedule.php	cc-4360: Fix for this bug. Table name was being quoted needlessly.	2012-09-06 11:03:24 -04:00
Scheduler.php	CC-4321: NowPlaying: Cancelling Webstream has no effect and results in OnAir being grayed out	2012-08-31 12:18:37 -04:00
ServiceRegister.php	CC-4090: Make code style PSR compliant - part 4	2012-08-29 10:58:03 -04:00
Show.php	-fixed syntax error	2012-09-05 16:21:59 -04:00
ShowBuilder.php	…
ShowInstance.php	cc-4347: PDOOOOOOOOOOOOO	2012-09-05 17:59:18 -04:00
Soundcloud.php	…
StoredFile.php	cc-4336: Fixed the issue. But this whole chunk of code could probably be removed.	2012-09-05 14:33:49 -04:00
StreamSetting.php	CC-4348: Prepared statements - part 4	2012-09-05 15:15:56 -04:00
Subjects.php	…
Systemstatus.php	…
User.php	Merge branch 'devel' of dev.sourcefabric.org:airtime into devel	2012-09-06 12:55:24 -04:00
Webstream.php	CC-4199: Webstream: Please show warning when the URL is too long	2012-09-04 16:18:18 -04:00