Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
sintonia/airtime_mvc/application/models
History
Martin Konecny 272e428fa7 Merge branch '2.2.x' into 2.2.x-saas 
Conflicts:
	airtime_mvc/application/controllers/PreferenceController.php
	airtime_mvc/application/controllers/ScheduleController.php
	airtime_mvc/application/forms/EmailServerPreferences.php
	airtime_mvc/application/forms/GeneralPreferences.php
	airtime_mvc/application/forms/LiveStreamingPreferences.php
	airtime_mvc/application/forms/Preferences.php
	airtime_mvc/application/forms/SupportSettings.php
	airtime_mvc/application/models/Schedule.php
	airtime_mvc/application/views/scripts/form/preferences.phtml
	airtime_mvc/application/views/scripts/form/preferences_email_server.phtml
	airtime_mvc/application/views/scripts/form/preferences_livestream.phtml
	airtime_mvc/application/views/scripts/form/support-setting.phtml
	airtime_mvc/application/views/scripts/menu.phtml
	airtime_mvc/application/views/scripts/schedule/add-
show-form.phtml
 		2012-11-06 17:23:32 -05:00
..
airtime CC-4668: Blocks/Playlists: Length includes deleted tracks 2012-11-06 10:58:25 -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-4283: Password Reset: Please let user input username they want to reset 2012-08-24 12:40:30 -04:00
Block.php CC-4639: 2012-11-06 16:32:00 -05:00
Dashboard.php CC-4090: Make code style PSR compliant 2012-07-15 21:17:13 -04:00
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 CC-4090: Make code style PSR compliant - part 4 2012-08-29 10:58:03 -04:00
LibraryEditable.php change Logging::log to Logging::info 2012-08-21 18:41:56 -04:00
LiveLog.php change Logging::log to Logging::info 2012-08-21 18:41:56 -04:00
LoginAttempts.php CC-4090: Make code style PSR compliant 2012-07-15 21:17:13 -04:00
MusicDir.php CC-4413: Unused local variables in models. 2012-09-12 17:26:41 -04:00
Playlist.php CC-4664: Playlist/Block preview: Tracks deleted from library still get played 2012-11-05 13:58:11 -05:00
PlayoutHistory.php CC-4554: Playout History search sticks on 'Processing' message 2012-10-16 12:04:52 -04:00
Preference.php SAAS-289: Remove all isSaaS checks 2012-11-06 16:48:34 -05:00
RabbitMq.php - saas patch #1 2012-10-23 18:47:15 -04:00
Schedule.php SAAS-289: Remove all isSaaS checks 2012-11-06 17:10:47 -05:00
Scheduler.php CC-4639: 2012-11-06 16:32:00 -05:00
ServiceRegister.php CC-4090: Make code style PSR compliant - part 4 2012-08-29 10:58:03 -04:00
Show.php CC-4641: Now Playing: Extending show's length won't change the overbooked track's style 2012-10-31 14:16:16 -04:00
ShowBuilder.php CC-4623: Library: Preview button for Flac does not work 2012-11-01 16:44:37 -04:00
ShowInstance.php Removed logging 2012-10-22 15:55:24 -04:00
Soundcloud.php Cleaned up soundcloud 2012-10-26 18:45:27 -04:00
StoredFile.php CC-4668: Blocks/Playlists: Length includes deleted tracks 2012-11-06 10:58:25 -05:00
StreamSetting.php add function necessary for saas 2012-10-17 15:28:05 -04:00
Subjects.php CC-4090: Make code style PSR compliant 2012-07-15 21:17:13 -04:00
Systemstatus.php change Logging::log to Logging::info 2012-08-21 18:41:56 -04:00
User.php - saas patch #1 2012-10-23 18:47:15 -04:00
Webstream.php CC-4656: Library -> No error message when a dj tries to delete smart blocks and webstreams they do not own 2012-10-31 17:19:27 -04:00