Commit Graph

166 Commits

Author SHA1 Message Date
denise 0a851f3c96 CC-4263: Calendar: Can create one show contains another show (overlapping)
-fixed
2012-08-23 17:41:05 -04:00
denise 0071caf94d CC-4080: Calendar -> Cannot create show because there was a repeating show at same time before
-fixed
2012-08-22 15:22:01 -04:00
Martin Konecny 462542bf68 change Logging::log to Logging::info 2012-08-21 18:41:56 -04:00
Martin Konecny 2a1ea33362 CC-1665: Scheduled stream rebroadcasting and recording
-store Liquidsoap metadata in cc_schedule instead of cc_webstream
2012-08-17 15:07:58 -04:00
Martin Konecny 4ee0c368ac CC-1665: Scheduled stream rebroadcasting and recording
-pre buffer streams part 2
2012-08-15 17:03:14 -04:00
Martin Konecny 1e57c12ce7 CC-1665: Scheduled stream rebroadcasting and recording
-pre buffer streams part 1
2012-08-15 16:43:01 -04:00
Martin Konecny d773dcd112 CC-1665: Scheduled stream rebroadcasting and recording
-send stream name back to Airtime: [("url","http://idobiradio.com/"), ("title","Good Charlotte - Like It's Her Birthday")]
2012-08-15 15:12:44 -04:00
Martin Konecny 8f3037c3e4 CC-1665: Scheduled stream rebroadcasting and recording
-remove incorrect "no items" warning when a show only contained a webstream
2012-08-08 23:02:08 -04:00
Martin Konecny db36870aec CC-1665: Scheduled stream rebroadcasting and recording
-fix creator id on another SQL query
2012-08-07 20:38:36 -04:00
Martin Konecny 47ae223a1c CC-1665: Scheduled stream rebroadcasting and recording
-fix SQL error
2012-08-07 19:23:42 -04:00
Martin Konecny 48a1bf3f02 Merge branch '2.1.x' into devel
Conflicts:
	airtime_mvc/application/controllers/ApiController.php
	airtime_mvc/application/models/Schedule.php
	airtime_mvc/application/models/Show.php
2012-08-06 17:10:46 -04:00
Martin Konecny 40023d9086 CC-4152: Widget does not display current show in some modes
-fixed
2012-08-06 17:07:18 -04:00
Martin Konecny 63b89043b6 CC-1665: Scheduled stream rebroadcasting and recording
on-air light works with streams now
2012-08-01 14:51:56 -04:00
Martin Konecny b83be1a922 CC-1665: Scheduled stream rebroadcasting and recording
-fix incorrectly named column
2012-07-31 11:00:01 -04:00
Martin Konecny 527b43e8ba CC-1665: Scheduled stream rebroadcasting and recording
-fix incorrectly named column
2012-07-31 10:13:41 -04:00
James 4e022c407d Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-07-27 11:52:08 -04:00
James 5becd70ab1 CC-84: Smart Playlists
- drag and drop playlist that contains block
- audio preview of playlist that contains static block
2012-07-27 11:51:50 -04:00
Martin Konecny ebed110429 CC-1665: Scheduled stream rebroadcasting and recording
-code cleanup
2012-07-26 17:51:47 -04:00
Martin Konecny eb4c23b0b6 CC-1665: Scheduled stream rebroadcasting and recording
-Fix scheduled streams mixed with scheduled files
2012-07-26 14:49:32 -04:00
Martin Konecny fbc5b72f14 CC-1665: Scheduled stream rebroadcasting and recording
-webstreams now start and stop at the correct time.
2012-07-26 14:49:32 -04:00
Martin Konecny c90495d2d3 CC-1665: Scheduled stream rebroadcasting and recording
-getting closer to being able to schedule a webstream
2012-07-26 14:49:32 -04:00
Martin Konecny 3735579378 -remove cc_access table and gunid usage 2012-07-26 14:49:32 -04:00
denise 647de9ed39 CC-84: Smart Playlists
- started storing last played time in cc_files
- db column (lptime) already existed but was not being used before this
- will use this as a criteria for smart playlists
2012-07-19 18:07:39 -04:00
Rudi Grinberg 20e32b98ba Merge branch 'devel' into mediamonitor2
Conflicts:
	python_apps/api_clients/api_client.py
2012-07-16 17:41:36 -04:00
Martin Konecny 4ebcb1b1f9 Merge branch '2.1.x' into devel
Conflicts:
	airtime_mvc/application/controllers/ApiController.php
	airtime_mvc/application/controllers/LibraryController.php
	airtime_mvc/application/controllers/PlaylistController.php
	airtime_mvc/application/models/Playlist.php
	python_apps/media-monitor/airtimefilemonitor/airtimemediamonitorbootstrap.py
	python_apps/media-monitor/airtimefilemonitor/airtimemetadata.py
2012-07-16 14:31:03 -04:00
Martin Konecny 583695f98c CC-430: Audio normalization (Replaygain Support)
-values are now written through to database
2012-07-15 22:22:42 -04:00
Martin Konecny 794cf2c845 CC-4090: Make code style PSR compliant
-run psr-cs-fixer
2012-07-15 21:17:13 -04:00
Martin Konecny bd51b4db02 CC-4100: Make number of shows displayed in widget customizable
-fixed
2012-07-11 19:31:24 -04:00
Martin Konecny ee3447f903 CC-4090: Make code style PSR compliant
-User.php
-removed all trailing whitespace
2012-07-10 18:51:32 -04:00
Martin Konecny 5c1af49252 CC-430: Audio normalization (Replaygain Support)
-Added support on Liquidsoap side
2012-07-05 23:24:34 -04:00
denise 4441bf18b7 CC-4072: Improve the check overlapping shows function
-done
2012-07-05 11:24:49 -04:00
denise 771974433b CC-4071: Prevent shows from overlapping on drag and drop in calendar
-done
2012-07-05 11:01:48 -04:00
denise 1fa3da5bd0 CC-4069: Edit Show -> cannot edit show
-fixed
2012-07-04 18:58:22 -04:00
denise cbf026412c CC-4056: Add Show -> Prevent shows from overlapping
-done
2012-07-04 11:34:18 -04:00
james 443537b2db CC-4020: Apache error found: Undefined variable: switch_start
- fixed
2012-06-27 22:50:46 -04:00
James 628f1518a7 CC-3906: PlaylistLibrary-> user can not delete track which has been already
played even after cancelling the show.

- fixed
2012-06-08 15:24:37 -04:00
James 2bf6408d90 CC-3864: Calendar -> Edit show: Can edit the start time of current playing show
- fixed
2012-06-06 18:23:27 -04:00
Martin Konecny 1edfb097da Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-05-23 16:17:37 -04:00
Martin Konecny 4608f04140 remove useless logging 2012-05-23 00:43:05 -04:00
James 164c158c80 CC-3859: Playout History: Filter out songs that are not played out
- done
2012-05-22 17:39:27 -04:00
Martin Konecny b2f39ae66b CC-3810: NowPlaying Bar during a recorded show looks scary in 2.1 (much nicer in 2.0.3 and earlier)
-introduced small problem, now fixed
2012-05-22 16:33:18 -04:00
Martin Konecny bbd694eb10 CC-3810: NowPlaying Bar during a recorded show looks scary in 2.1 (much nicer in 2.0.3 and earlier)
-introduced small problem, now fixed
2012-05-22 12:22:03 -04:00
Martin Konecny bbc101bde8 CC-3810: NowPlaying Bar during a recorded show looks scary in 2.1 (much nicer in 2.0.3 and earlier)
-fixed
2012-05-20 23:30:03 -04:00
denise 9967f5451c CC-3737: ON AIR turns to grey from time to time, while the stream keeps playing
- fixed
- added a 'type' key to distinguish between tracks and shows
2012-05-17 18:21:58 -04:00
Naomi Aro ff5aebfd6b CC-3817 : Should use soundcloud icon for recorded & uploaded shows in timeline for past shows to match calendar 2012-05-14 15:06:56 +02:00
James 0d5f581e35 CC-3731: Can add a show of zero length
- fixed
- extra fix: Changed all the duration format so it's consistent
2012-04-27 14:07:14 -04:00
Naomi Aro e242972a78 Merge branch 'CC-3174' into devel 2012-04-20 13:04:38 +02:00
Naomi Aro 6b4fd7d3bb CC-3686 : Improve differentiation of a record/rebroadcast show in the timeline 2012-04-20 13:03:50 +02:00
paul.baranowski 7f78a7f663 CC-1927: Remove PEAR DB
First pass through the model classes to remove use of $CC_DBC.
Web application is working.
There are still other parts of the app that use PEAR DB.
2012-04-19 16:33:05 -04:00
paul.baranowski f69a172ee1 Commented out a bunch of Logging debug lines. There was a lot of output
being logged in the Zend log file.
2012-04-19 16:16:56 -04:00