Commit Graph

148 Commits

Author SHA1 Message Date
Naomi 1fa0ee49d6 CC-5190 : Playlist: Copy playlist will lost cue in/out setting 2013-05-30 15:36:55 -04:00
Martin Konecny 4ed7c4ccd3 fix errors reported by Facebook's scheck 2013-05-28 17:30:48 -04:00
Naomi 75e6f21ce0 CC-5108 : Waveform Editor UI
putting on the timescale for time reference.

fade editor now has cursor playback info.
2013-05-23 18:33:40 -04:00
Naomi c57de650e8 CC-5172 : errors from setting cues in waveform editor not handled properly
Conflicts:
	airtime_mvc/application/models/Playlist.php
2013-05-23 13:01:38 -04:00
Naomi 02292569f9 CC-5172 : errors from setting cues in waveform editor not handled properly
Conflicts:
	airtime_mvc/application/models/Playlist.php
2013-05-23 13:00:37 -04:00
Naomi d9b6a15fb6 CC-5139 : WaveForm: Click save will cause problem when setting crossfading between track and Smart block 2013-05-13 18:21:24 -04:00
denise 40eb51b892 CC-5121: fix some SQL statements not being escaped/prepared 2013-05-09 15:53:12 -04:00
Naomi 75e4e0c9b6 CC-2301 : only showing waveform buttons if the browser supports the audio api. 2013-05-03 14:42:42 -04:00
Naomi 517bb7557a CC-2301 : testing default crossfade settings 2013-05-02 16:15:21 -04:00
Naomi 2a1ac0ddb9 CC-2301 : updating playlist offsets in playlist builder to reflect crossfade overlaps. 2013-04-30 16:27:31 -04:00
Naomi 0db557a570 CC-2301 : fades editor saving offset to database for playlists and smart blocks. 2013-04-30 15:32:43 -04:00
Naomi 2e03e1982f CC-2301 : changing more CRLF files 2013-04-29 18:11:11 -04:00
Naomi b2a490ac47 CC-2301 : working on creating a crossfade method for waveforms. 2013-04-29 18:09:12 -04:00
Naomi 410d298272 CC-2301 : creating an offset column to help create crossfades in the playlist.
changing default fade to be a separate default fade in/out
2013-04-29 16:55:08 -04:00
Naomi 179621d687 CC-2301 : fades editor is loading now with a leftoffset for the second track and the cues for both tracks. 2013-04-24 14:15:07 -04:00
Martin Konecny 5ac51e289d Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-04-01 19:15:02 -04:00
Martin Konecny 6ae8da98e4 removing logging 2013-04-01 19:14:55 -04:00
denise ec159131a8 Merge branch '2.3.x' into devel 2013-02-13 16:09:53 -05:00
denise 3c73535f70 Convert clip length seconds to interval format before inserting into cc_playlistcontents / cc_blockcontents 2013-02-11 12:37:20 -05:00
denise 6071dea839 CC-4940: Playlist editor in Library ignores cue points set by silence detection when displaying item time
-small fix on where to set clip length
2013-02-11 12:32:20 -05:00
denise 69054806c4 CC-4940: Playlist editor in Library ignores cue points set by silence detection when displaying item time
- fixed by setting length to cue_out - cue_in when tracks get added to playlist/block
2013-02-11 12:24:06 -05:00
denise e8bde50909 CC-4939: All webstreams in a playlist will have 0 length in Schedule
- set cuein and cueout of playlist item if it is a webstream
2013-02-11 11:17:00 -05:00
denise 74bc485b4b XSS exploit prevention
- Calendar - Show Contents
- Playlist tooltip in Library page
- Adding track to a show
- Widgets
- Playlist/Webstream title and description
- Smart block expansion
2013-02-05 10:56:38 -05:00
denise 8309593a0f CC-4904: Library -> Sort by status doesn't work
- added 2 columns to cc_files (is_scheduled, is_playlist)
- split library status column into two columns (scheduled, playlist)
- is_scheduled gets updated when a track plays out, or when a file gets added/removed from/to a show
- is_playlist gets updated when a file gets added/removed from/to a playlist/block, when a playlist/block gets deleted, or when a playlist/block's contents is cleared
2013-02-01 17:47:07 -05:00
denise 384298f680 CC-4109: Playlist Builder: Add a button to remove all the items in the current editing playlist 2013-02-01 12:06:01 -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
denise 043fbd1dfb CC-4886: Warn if track is part of a playlist when deleting from library.
-done
2013-01-30 10:55:24 -05:00
denise 77b0c21192 Small refactor 2013-01-22 10:39:20 -05:00
denise b9c7ea1184 CC-4869: Default fades greater than 99 seconds won't allow you to drag item into block/playlist
-fixed
2013-01-18 17:22:54 -05:00
James dcf3526000 CC-4384: Remove annoying usage of $CC_CONFIG
- done
2013-01-10 18:09:00 -05:00
James ecbff94f11 CC-4795: Library -> Playlist: Cannot add Smart Block into Playlist
- fixed
2013-01-07 13:48:51 -05:00
James b8f80866cf CC-3018: Automatically strip out silence from audio tracks
- done
2013-01-03 14:02:06 -05:00
James dcdbc3160d CC-4769: Duplicate Playlist: Fade in/out setting doesn't get copied correctly
- fixed
2013-01-02 11:41:33 -05:00
denise a76b9b305f CC-1960: Internationalize Airtime / Support translations
-added gettext wrapper to all strings in models
2012-11-20 11:33:37 -05:00
James 2b2a1db055 CC-2401: Shuffle option in playlists
- done
2012-11-13 17:32:10 -05:00
denise b817684972 Merge branch '2.2.x' into devel
Conflicts:
	airtime_mvc/application/controllers/PreferenceController.php
	airtime_mvc/application/models/StoredFile.php
	airtime_mvc/public/js/bootstrap/bootstrap.js
2012-11-07 11:21:36 -05:00
denise 90a93e9a6c CC-4664: Playlist/Block preview: Tracks deleted from library still get played
-fixed
2012-11-05 13:58:11 -05:00
Rudi Grinberg 1c628bd831 renamed displayable to visible 2012-11-05 10:57:18 -05:00
Rudi Grinberg acf954f637 changed hidden check to displayable check 2012-11-05 10:55:54 -05:00
Rudi Grinberg 00a4e45491 added check for hidden in buildEntry 2012-11-05 09:47:16 -05:00
denise 5f35336fd0 CC-2295 Improvements to playlist builder beha...CC-2303 Cue-in Cue-out inconsistency with time values:
-fixed
2012-10-11 11:49:04 -04:00
denise 1b0dd13eac CC-4521: Playlist Builder: Cannot set fades
-fixed
2012-10-02 15:38:05 -04:00
denise aede8e8efa CC-4520: Playlist Builder: Cannot set cue in
-fixed
2012-10-02 15:35:49 -04:00
denise 3b43efefe0 CC-4413: Unused local variables in models.
-done
2012-09-12 17:26:41 -04:00
Martin Konecny a418f5777c CC-4393: Please ignore AAC and Flac items for Playlist Preview and disable to preview it as a single track
-initial commit
2012-09-12 15:43:50 -04:00
James 7d3ac8eb07 CC-4346: Prepared statements - part 2
- done
2012-09-06 16:46:22 -04:00
Martin Konecny 4848717d4d CC-4090: Make code style PSR compliant - part 4
-models dir
2012-08-29 10:58:03 -04:00
denise 82f2b2e7c3 CC-4249: Playlist: Playlist's length doesn't update if it contains a smart playlist which the length is changed
-fixed
2012-08-24 11:12:31 -04:00
denise bf69f23343 CC-4249: Playlist: Playlist's length doesn't update if it contains a smart playlist which the length is changed
-fixed
2012-08-23 11:53:44 -04:00
Martin Konecny 462542bf68 change Logging::log to Logging::info 2012-08-21 18:41:56 -04:00