Commit Graph

121 Commits

Author SHA1 Message Date
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
Martin Konecny 15eae0698b Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-21 16:55:17 -04:00
Martin Konecny a1b91aebbd CC-1665: Scheduled stream rebroadcasting and recording
-use sessions to determine currently open object in Library
2012-08-21 16:54:14 -04:00
denise 2cdaa186e3 CC-4257: Smart Block: Admin cannot delete DJ user's block
-fixed
2012-08-21 15:42:44 -04:00
denise d06f02f1f5 CC-4244: Playlist Builder: Original Length should not be changed after setting Cue in/out value
-fixed
2012-08-21 14:08:30 -04:00
Martin Konecny 51ebae3de9 Make sure we are using the Library controller for the Library page 2012-08-21 11:12:33 -04:00
denise ae0d5d8598 CC-4238: Playlists: Fade in/out is in wrong format
-added comment
2012-08-16 14:45:51 -04:00
denise 5e6a94edb9 CC-4238: Playlists: Fade in/out is in wrong format
-fixed
2012-08-16 14:37:10 -04:00
James 9fc5411895 CC-4229: Smart Playlist: refactor code
- done
2012-08-15 11:36:41 -04:00
Martin Konecny fe3f4ea678 CC-1665: Scheduled stream rebroadcasting and recording
-capture stream mime type and store in db.
2012-08-10 00:57:03 -04:00
Martin Konecny 4129900858 CC-1665: Scheduled stream rebroadcasting and recording
-step 1 of getting stream preview on show builder working
2012-08-09 17:42:25 -04:00
James ae5b6e58d7 CC-4144: Playlist Builder: Adding smart playlist into regular playlist will reset the Fade in/out settings to default value
- fixed
2012-08-09 11:03:57 -04:00
Martin Konecny 8876b312fb CC-4167: Create new playlist doesn't work
-fixed
2012-08-07 19:49:59 -04:00
James 0d2d8218bf CC-84: Smart Playlists
- audio preview on playlist
- cleaning up some code
2012-08-02 16:36:12 -04:00
James 6e71a6bb92 CC-84: Smart Playlists
- dynamic block length display
2012-08-02 11:17:10 -04:00
James 9d51222dae CC-84: Smart Playlists
- Length calculation for dynamic blocks and playlist that contains
dynamic blocks
2012-07-31 17:46:37 -04:00
Martin Konecny ab85ab59d9 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-07-30 21:48:25 -04:00
Martin Konecny 7e433b61fb CC-1665: Scheduled stream rebroadcasting and recording
-improve working with "webstreams"
2012-07-30 21:48:04 -04:00
James 019d13b4c9 CC-84: Smart Playlists
- backend implementation
- UI for blocks within playlist
2012-07-30 17:55:22 -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
James 7cde4ba2ba CC-84: Smart Playlists
- merging code
2012-07-26 16:16:07 -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 ccdc06786d CC-1665: Scheduled stream rebroadcasting and recording
-remove some hardcoded webstream values
-fix some broken problems from devel
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
Martin Konecny be8262b67c CC-1665: Scheduled stream rebroadcasting and recording
-fixed web stream length not showing up correctly
2012-07-26 14:49:32 -04:00
Martin Konecny 8b2facaa96 CC-1665: Scheduled stream rebroadcasting and recording
-playlists load contents now correctly identify tracks vs streams
2012-07-26 14:49:32 -04:00
denise bef9ba1eea CC-84: Smart Playlists
- added 'Smart Block' filter in datatable
- added block files to library datatable
2012-07-25 17:08:22 -04:00
James 1f3cbd8aba CC-84: Smart Playlists
- introducing smart-block
2012-07-25 12:44:37 -04:00