sintonia/airtime_mvc/application/models
Martin Konecny 909e290bd3 Merge branch 'devel' into 2.3.x-saas
Conflicts:
	airtime_mvc/application/controllers/PreferenceController.php
2013-01-18 17:38:48 -05:00
..
airtime Merge branch 'silan-script' into devel 2013-01-18 11:54:10 -05:00
formatters naming convention fix 2012-09-18 16:40:23 -04:00
tests CC-4370: Transitioning between two webstreams a hiccup in the stream is audible 2012-09-07 17:38:24 -04:00
Auth.php CC-1960: Internationalize Airtime / Support translations 2012-11-27 17:11:29 -05:00
Block.php CC-4869: Default fades greater than 99 seconds won't allow you to drag item into block/playlist 2013-01-18 17:22:54 -05:00
Dashboard.php
Datatables.php CC-4539: Advanced search: Sample rate searched on Hz, but search results 2012-10-31 12:32:40 -04:00
Email.php CC-4413: Unused local variables in models. 2012-09-12 17:26:41 -04:00
Library.php
LibraryEditable.php
ListenerStat.php CC-4661: Listener Statistics 2012-11-07 16:26:31 -05:00
LiveLog.php
Locale.php Changed path to locale directory from absolute to relative 2013-01-17 14:31:40 -05:00
LoginAttempts.php
MusicDir.php Merge branch 'devel' into cc-1960-internationalize-airtime 2012-11-21 11:44:40 -05:00
Playlist.php CC-4869: Default fades greater than 99 seconds won't allow you to drag item into block/playlist 2013-01-18 17:22:54 -05:00
PlayoutHistory.php CC-4554: Playout History search sticks on 'Processing' message 2012-10-16 12:04:52 -04:00
Preference.php Merge branch 'devel' into 2.3.x-saas 2013-01-17 10:56:18 -05:00
RabbitMq.php Merge branch 'devel' into 2.3.x-saas 2013-01-15 13:44:44 -05:00
Schedule.php Merge branch 'devel' into 2.3.x-saas 2013-01-15 13:44:44 -05:00
Scheduler.php CC-4855: System->Preferences->Fade in/out settings: Number's format is incorrect. 2013-01-18 14:35:17 -05:00
ServiceRegister.php
Show.php CC-4384: Remove annoying usage of $CC_CONFIG 2013-01-14 16:16:14 -05:00
ShowBuilder.php CC-4819: Tracks length in Scheduler is 0.0 all the time 2013-01-10 11:49:02 -05:00
ShowInstance.php CC-4599: Calendar: Add an icon to indicate show is not fully booked 2013-01-07 12:41:28 -05:00
Soundcloud.php CC-4384: Remove annoying usage of $CC_CONFIG 2013-01-14 16:16:14 -05:00
StoredFile.php CC-4841: Silan script 2013-01-18 11:53:26 -05:00
StreamSetting.php CC-4848: Streaming server passwords should be hidden with dots, once entered 2013-01-16 14:36:56 -05:00
Subjects.php CC-4384: Remove annoying usage of $CC_CONFIG 2013-01-10 18:09:00 -05:00
Systemstatus.php CC-4384: Remove annoying usage of $CC_CONFIG 2013-01-14 16:16:14 -05:00
User.php - saas patch #1 2012-10-23 18:47:15 -04:00
Webstream.php Merge branch 'cc-4759-add-aac-stream-in-support' into devel 2012-12-27 17:29:25 -05:00