Commit Graph

260 Commits

Author SHA1 Message Date
Naomi 109b313d37 CC-5424 : Same webstream playing will switch off ON AIR light 2013-10-16 12:26:39 -04:00
denise 91ea1f2240 CC-5184: Timeline -> Filter by show option doesn't work 2013-05-29 15:00:35 -04:00
Naomi Aro 4d1a15b7ca CC-3817 : Should use soundcloud icon for recorded & uploaded shows in timeline for past shows to match calendar 2013-05-28 14:27:59 -04:00
denise 3d09747990 CC-5150: Calendar->Add/Remove Show contents: Exception happens when try to adding contents for show 2013-05-16 13:42:06 -04:00
Martin Konecny 5080807a21 IM-629
-fix minor SQL syntax error
2013-05-14 19:18:41 -04:00
Martin Konecny bb36556bb9 IM-629
-filter by using instance id instead of show id

Conflicts:
	airtime_mvc/application/models/Schedule.php
2013-05-14 19:18:08 -04:00
Naomi 74c0e390b6 CC-5147 : check builder feed on now playing page updating when not needed
wrong timestamp used when changing to prepared statement.
2013-05-14 16:51:34 -04:00
denise c173744929 CC-5090: Unscheduled tracks are still marked at Scheduled in linked show 2013-05-14 10:58:06 -04:00
Naomi 82945038d5 CRLF fix 2013-05-10 17:44:50 -04:00
Naomi b0018083c7 CC-5121 : fix some SQL statements not being escaped/prepared 2013-05-10 17:14:10 -04:00
Martin Konecny 9c05511613 CC-5121: fix some SQL statements not being escaped/prepared 2013-05-09 15:08:47 -04:00
denise 71526a94cc Merge branch 'cc-4961-show-linking'
Conflicts:
	airtime_mvc/application/controllers/ScheduleController.php
2013-04-29 15:35:16 -04:00
Martin Konecny fd78ad29bf cleanup of function names 2013-04-19 20:24:05 -04:00
Martin Konecny f39f9329cc CC-4992:
Decouple pypo from Airtime install

-first commit
2013-04-19 20:10:51 -04:00
denise a9b5d00d87 CC-4961: Show linking 2013-04-18 16:12:26 -04:00
denise 6766d208aa CC-4961: Show linking
Removed logic out of edit-show action
Created new SchedulerService
Fixed overlapping show bug
2013-03-21 16:31:05 -04:00
denise 99c07272fd - Moved all form validation to it's own function in schedule service
- Moved show creation to it's own function in schedule service
2013-03-06 09:58:35 -05:00
drigato bdab294fce Added comments to Schedule Service 2013-03-06 09:58:35 -05:00
denise d08f6cf3e1 CC-4961: Show linking
-initial schedule service experimentation
2013-03-06 09:58:35 -05:00
Martin Konecny 93ec4c001b Merge branch '2.3.x' into devel
Conflicts:
	airtime_mvc/application/controllers/LibraryController.php
	airtime_mvc/application/models/StoredFile.php
2013-02-02 21:07:34 -05:00
denise cf2ed25bfb CC-4900: Indicate in the library if a webstream is scheduled in the future or belongs to a playlist
-done
2013-01-30 16:53:59 -05:00
drigato c45440482a CC-4887: Show whether track is scheduled in the future on Library page 2013-01-30 08:57:59 -05:00
denise 5f3f2cd97c CC-4881: Cue in time can be greater than Cue out time in some situations
-fixed
2013-01-28 16:46:11 -05:00
James 5a97fb69f2 CC-4384: Remove annoying usage of $CC_CONFIG
- done
2013-01-14 16:16:14 -05:00
James dcf3526000 CC-4384: Remove annoying usage of $CC_CONFIG
- done
2013-01-10 18:09:00 -05:00
James 048ee05030 CC-4821: Add option to disable ReplayGain
- done
2013-01-10 13:49:41 -05:00
james c0665e4748 CC-4754: Replay gain modifier
- Initial commit
2012-12-27 00:36:11 -05:00
denise b2699fa914 merge from devel 2012-12-03 11:06:56 -05:00
Martin Konecny fe44d23b74 CC-4715: Better management of tracks that are shorter than they claim to be. 2012-11-20 16:31:27 -05:00
Martin Konecny 7efa7169ca CC-4700: Return mime type of streams instead of null
-fixed
2012-11-15 16:41:46 -05:00
James 33b2520c14 Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x 2012-11-08 17:27:28 -05:00
James 628e6bed37 CC-4689: Live Stream: The 1st song of a show won't play if there is another show have live stream assigned and finished right before
- fixed
2012-11-08 17:26:55 -05:00
Martin Konecny fd3305bc4c SAAS-289: Remove all isSaaS checks
-done
2012-11-06 17:10:47 -05:00
James 575400b4c2 CC-4623: Library: Preview button for Flac does not work
- fixed
2012-11-01 16:44:37 -04:00
James 5651dbce56 CC-4644: Exception from zendphp.log
- fixed
2012-10-29 16:37:27 -04:00
James 4861397872 CC-4644: Exception from zendphp.log
- fixed
2012-10-29 16:19:23 -04:00
Martin Konecny 4daaa776e2 CC-4620: Now Playing page loading is very slow because 1M records in cc_schedule table
-fixed
2012-10-23 17:45:55 -04:00
james dff5bb4e2b CC-4620: Now Playing page loading is very slow because 1M records in cc_schedule table
- fixed
2012-10-23 12:24:38 -04:00
James a9df8cd7f2 CC-4610: Creating recording show will generate lots of exception in zendphp.log
- fixed
2012-10-19 17:30:54 -04:00
Martin Konecny 9dfee6aa68 CC-4564: Webstream: Book same webstream twice in Scheduler, the 2nd one doesn't get played
-fixed
2012-10-19 15:39:45 -04:00
denise 8f5830757f CC-4553: Calendar: Can create overlapping show by repeat show's instances
-fixed
2012-10-12 14:26:54 -04:00
Martin Konecny 4c58c4c9a9 CC-4473: On Air button greys out when one out of two same Webstreams is cancelled
-fixed
2012-09-18 15:27:27 -04:00
denise 1e0595d7ad Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-17 14:53:17 -04:00
denise 8801ccecce CC-4459: Now Playing -> Timeline: 'Filter by show' does not work
-fixed
2012-09-17 14:52:56 -04:00
Martin Konecny 5d0592c729 CC-4454: Show deleting: if you do 'delete this instance and all following', it doesn't remove entries from cc_schedule table
-fixed
2012-09-17 12:32:39 -04:00
Martin Konecny d534f22ce4 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-13 16:11:15 -04:00
Martin Konecny da72c00f28 CC-4370: Transitioning between two webstreams: a hiccup in the stream is audible
-fixed
2012-09-13 16:10:17 -04:00
Rudi Grinberg 11ef613d1c comment formatting 2012-09-13 15:16:46 -04:00
Rudi Grinberg e31d570a1c Sql formatting 2012-09-13 15:13:37 -04:00
Rudi Grinberg f754d78687 Formatted comments and = 2012-09-13 15:12:54 -04:00