sintonia/airtime_mvc/application/models
Duncan Sommerville 8fcaf7fc74 Merge branch 'saas-dev' into soundcloud
Conflicts:
	airtime_mvc/application/configs/constants.php
2015-06-24 16:35:06 -04:00
..
airtime Fix SoundCloud and TaskManager bugs, switch tasks to use acks_late, and provide feedback from SoundCloud context menu items 2015-06-18 18:18:48 -04:00
formatters Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00
tests Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00
Auth.php Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00
Block.php Merge branch '2.5.x' into saas 2015-01-27 15:39:40 -05:00
Cache.php Fixes for code review https://github.com/sourcefabric/Airtime/pull/84 2015-01-15 16:33:33 -05:00
Dashboard.php Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00
Datatables.php Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00
Email.php Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00
Library.php Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00
LibraryEditable.php Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00
ListenerStat.php Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00
LiveLog.php Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00
Locale.php Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00
LoginAttempts.php Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00
MusicDir.php Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00
Playlist.php Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00
Preference.php Return default value for disk quota if none set 2015-06-23 19:08:49 -04:00
RabbitMq.php SAAS-868 - Refactor third party + celery workflow, implement locking on TaskManager 2015-06-16 15:10:08 -04:00
Schedule.php SAAS-877 - Fix live-info-v2 behaviour 2015-06-24 14:28:04 -04:00
Scheduler.php Merge branch 'saas' into saas-speedy 2015-04-15 16:44:43 -04:00
ServiceRegister.php Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00
Show.php Merge branch 'saas-dev' into saas-installer-albert 2015-06-10 12:02:08 -04:00
ShowBuilder.php CC-6046, CC-6045, CC-6047 - New SoundCloud implementation 2015-06-03 16:57:17 -04:00
ShowInstance.php CC-6046, CC-6045, CC-6047 - New SoundCloud implementation 2015-06-03 16:57:17 -04:00
StoredFile.php Add fields to SoundCloud upload 2015-06-24 15:46:53 -04:00
StreamSetting.php SAAS-863: Streams not disabled properly in Liquidsoap config when downgrading 2015-06-15 12:19:03 -04:00
Subjects.php Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00
Systemstatus.php Merge branch '2.5.x-installer' into saas-installer-albert 2015-05-22 16:05:29 -04:00
User.php CC-6050: User management bugfix 2015-06-05 12:34:51 -04:00
Webstream.php CC-5120: Can't add PLS webstreams 2015-05-11 11:08:43 -04:00