Commit Graph

125 Commits

Author SHA1 Message Date
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 d4e89df94e CC-4895: Remove all json die() statements from code 2013-01-31 14:06:45 -05:00
denise 5adadc2e91 CC-1960: Internationalize Airtime / Support translations
- added gettext wrapper function to all strings in controllers
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
James 504d9968f1 CC-4639:
Give an option to allow smart blocks to reuse tracks if not enough tracks meet the time limit

- fixed the bug where airtime hangs when repeat is checked but 0 files that
meet criteria
- fixed dynamic block bug where it didn't generate correct list
2012-11-06 16:32:00 -05:00
james 9293a26738 CC-4639: Give an option to allow smart blocks to reuse tracks if not enough
tracks meet the time limit

- code optimazation
2012-10-31 12:05:17 -04:00
James 9d495ebc03 CC-4639: Give an option to allow smart blocks to reuse tracks if not enough tracks meet the time limit.
- done
2012-10-30 17:57:58 -04:00
denise c95050c04c CC-4546: Library->Context view for playlist: It only displays "..." instead of Static smart block's name
-fixed
2012-10-10 15:06:30 -04:00
Rudi Grinberg e2f8d8e0e7 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-13 11:10:43 -04:00
Rudi Grinberg d409af2876 shortened logging 2012-09-13 11:07:29 -04:00
Rudi Grinberg dced49c425 Removed unused variable 2012-09-13 10:52:58 -04:00
denise e1403d45bd CC-4368: Unused local variables in Airtime Controllers. Should be removed.
-done
2012-09-13 10:32:33 -04:00
denise 33fe2f3467 CC-4351: Library->Deletion of Smart Block and saving it leads to "Processing" message being displayed for a while
-fixed
2012-09-06 14:10:50 -04:00
denise 8d1003bbbe CC-4303: Library Tab grays out after certain scenario with normal playlist
-fixed
2012-09-06 11:48:00 -04:00
denise 15f750eca5 CC-4248: Playlist Builder: 'Something went wrong' error message when dragging playlist into playlist
-included webstreams in the allowance type list in the error message
2012-09-04 11:29:23 -04:00
denise 80258f1fb7 CC-4302: Library : Deletion of newly created Smart Block does not prevent you from editing it which leads to small hang up
-fixed for dragging tracks into deleted blocks
2012-08-29 16:13:18 -04:00
denise 7c79aad5f4 CC-4302: Library : Deletion of newly created Smart Block does not prevent you from editing it which leads to small hang up
-removed unnecessary exception catch
2012-08-29 16:04:40 -04:00
denise fe48780932 CC-4302: Library : Deletion of newly created Smart Block does not prevent you from editing it which leads to small hang up
-fixed
2012-08-29 16:00:58 -04:00
denise 46a6a5fc30 CC-4312: Smart Block: Please don't save the change of title when there is any warning after click 'Save'
-added in saving behaviour for regular playlists
2012-08-29 12:05:41 -04:00
denise 5effb253bf CC-4312: Smart Block: Please don't save the change of title when there is any warning after click 'Save'
-done
2012-08-29 11:38:47 -04:00
Martin Konecny 699a49a103 CC-4090: Make code style PSR compliant - part 4
-controllers dir
2012-08-29 10:54:36 -04:00
denise 69b61c4cfe CC-4285: Playlists-> Smart Block - displays that certain amount meets the criteria while no criteria is specified
-fixed
2012-08-28 12:13:58 -04:00
Martin Konecny 24988616b3 CC-1665: Scheduled stream rebroadcasting and recording
-current Library session object should not be stored as a property of the Controller class.
-fixed
2012-08-22 14:03:11 -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
Martin Konecny 51ebae3de9 Make sure we are using the Library controller for the Library page 2012-08-21 11:12:33 -04:00
Martin Konecny 47852bce2a indentation fixes 2012-08-21 10:50:24 -04:00
Martin Konecny 337e5fec8a Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-20 18:36:32 -04:00
Martin Konecny d517bf6e19 fix indentation and remove \r characters 2012-08-20 18:29:57 -04:00
James a24da9e324 CC-4256: Smart Playlist: change name to smart block and etc
- done
2012-08-20 17:17:48 -04:00
denise 817fe13533 CC-4248: Playlist Builder: 'Something went wrong' error message when dragging playlist into playlist
-fixed
2012-08-17 15:56:16 -04:00
denise 9930ffae35 CC-4178: Smart Playlist: Cannot update the block's title
-fixed
2012-08-16 16:00:59 -04:00
denise b17cd2b3c9 CC-4178: Smart Playlist: Cannot update the block's title
-fixed
2012-08-16 15:58:03 -04:00
denise 0d21d9a9af Smart Playlists: code cleanup 2012-08-16 15:40:36 -04:00
James 9fc5411895 CC-4229: Smart Playlist: refactor code
- done
2012-08-15 11:36:41 -04:00
denise bd966915ee CC-4207: Smart Playlists: Criteria is lost on 'Shuffle' click
-fixed
2012-08-10 11:56:01 -04:00
denise 10ea825536 CC-4201: Playlist Builder -> Smart Playlist: DJ user can edit SP created by others in particular situation
-fixed
2012-08-09 18:24:22 -04:00
denise f75cf5ffe2 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-09 17:24:00 -04:00
denise e674654cb1 CC-4192: Smart Playlist Builder: make save button save title, description, and criteria
-done
2012-08-09 17:23:52 -04:00
James 6c721cd68d CC-4184: Playlist Builder : Error alert for trying to add Web Stream to Smart Playlist
- fixed
- extra fix: context menu for webstream
2012-08-09 16:59:18 -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
James d1e6f8178b CC-4166: Playlist Builder -> Regular Playlist : clicking Fade in/out button for a empty playlist will cause PHP Fatal Error
- fixed. Not displaying fade setting button if the playst/smartplaylist
is empty.
2012-08-08 15:29:09 -04:00
James 028e089c82 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
Conflicts:
	airtime_mvc/application/models/Block.php
2012-08-02 16:37:12 -04:00
James 0d2d8218bf CC-84: Smart Playlists
- audio preview on playlist
- cleaning up some code
2012-08-02 16:36:12 -04:00
denise 997b5c31c3 CC-84: Smart Playlists
- fixed dragging tracks into playlists (smart and dumb)
- display alert when dragging into dynamic block
- display alert when dragging playlist into block
2012-08-02 11:52:11 -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
James 27017c7903 CC-84: Smart Playlists
- fixed getCriteria() to non static function
2012-07-30 18:21:27 -04:00
James 019d13b4c9 CC-84: Smart Playlists
- backend implementation
- UI for blocks within playlist
2012-07-30 17:55:22 -04:00