Commit Graph

3394 Commits

Author SHA1 Message Date
martin 5ba964c783 Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x 2012-11-23 14:03:51 -05:00
martin 75adf9b6a1 CC-4701: same webstream played twice in a row does not work.
-fixed
2012-11-23 14:03:31 -05:00
James 87d0383533 CC-4703: Now Playing duration column ignores any cue point set
- fixed
2012-11-22 14:37:57 -05:00
Martin Konecny 2fa8f05c3c Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x 2012-11-22 11:40:55 -05:00
Martin Konecny 3a1945a818 CC-4702Webstream: When webstream is playing, it isn't marked as 'media_item_played' in cc_schedule
-fixed
2012-11-22 11:40:44 -05:00
James acf2ffc9d5 CC-4707: Webstream: Preview for Webstream in Scheduler is forbidden
- fixed
2012-11-22 11:18:42 -05:00
James 8483439551 CC-4709:
Exception happens when DJ try to click a Webstream not belongs to himself

- fixed
2012-11-22 10:29:40 -05:00
James dcc9a192d1 Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x 2012-11-22 10:15:35 -05:00
denise 2a4e4c6405 CC-4710: Preferences -> Default Fade in/out: Cannot add songs into schedule if the default fade value is set to int value, for instance, 5 secs.
-fixed
2012-11-21 14:17:46 -05:00
denise 48253b8d14 CC-4710: Preferences -> Default Fade in/out: Cannot add songs into schedule if the default fade value is set to int value, for instance, 5 secs.
-fixed
2012-11-21 10:19:21 -05:00
James 4242fecd34 CC-4615: Now Playing page: Fail to get soundcloud file id in Schedule
- fixed
2012-11-20 18:03:13 -05:00
James 8d9fa1976e Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x 2012-11-20 16:39:04 -05:00
James 3c1f80de68 CC-4658: Smart Block: Unable to drag songs into block directly
- fixed
2012-11-20 16:38:43 -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 9c612d17a3 CC-4694: Apache/Zend error only specific to some users 2012-11-19 18:41:31 -05:00
Martin Konecny 7efa7169ca CC-4700: Return mime type of streams instead of null
-fixed
2012-11-15 16:41:46 -05:00
Martin Konecny d1a22fe7ca CC-4677: Improve Smart block repeat description
-fixed
2012-11-15 11:30:56 -05:00
denise a727f2bb1e CC-4638: Stream Settings -> Apache error when setting master source port to same port Airtime is running on
-fixed
2012-11-12 14:28:50 -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
denise 29c7e58643 CC-4679: Library: Deleting Webstream leaves the SAVE button
-fixed
2012-11-06 16:49:36 -05:00
denise f623445b0d Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x 2012-11-06 16:34:19 -05:00
denise bf4f5fd699 CC-4607: Library: Please make the 'Add x items' following mouse's point
-fixed
2012-11-06 16:34:06 -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
denise c605c97268 CC-4455: "Add to current smart block" context menu action should be disabled for dynamic smart blocks
-disabled this option from context menu
2012-11-06 14:33:34 -05:00
denise a1a7396ec9 CC-4455: "Add to current smart block" context menu action should be disabled for dynamic smart blocks
-disabled this button in the library toolbar if dynamic blocks are open
2012-11-06 14:29:26 -05:00
denise e262d48eec CC-4675: Preferences: Error messages are hidden
-fixed
2012-11-06 12:17:45 -05:00
denise de89686d48 CC-4536: Smart block criteria use AND logic, but additional modifiers use OR logic, without labels to show the difference
-added comments
2012-11-06 12:03:49 -05:00
denise 2cbba60037 CC-4673: Smart Block: Exception happens when create a smart block with 5 criteria
-fixed
2012-11-06 11:54:24 -05:00
denise a99191f4bd CC-4669: Smart Blocks: Dynamic length of less than 1 hour shows 0.0
-fixed
2012-11-06 11:14:40 -05:00
denise 6ef646124e CC-4668: Blocks/Playlists: Length includes deleted tracks
-fixed
2012-11-06 10:58:25 -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
denise c051e0671d CC-4625: On tablet you cannot create a playlist, smart block or webstream
-attempt 
2012-11-05 12:00:37 -05:00
denise 106b18bf30 CC-4637: Media Library: Item will be removed from Playlist if it's removed from Library
-fixed
2012-11-02 17:49:32 -04:00
denise 2854dd40e0 CC-4663: Smart Blocks -> Deleting a track in smart block from library gives error
-fixed
-tracks with undefined mime type were not handled properly
2012-11-02 16:54:49 -04:00
denise 796274e4ef CC-4642: Default Fade preference should be in seconds and tenths, rather than millionths
-fixed
2012-11-02 15:51:36 -04:00
denise ba1f6ed054 CC-4374: Nowplayling page: Cannot remove tracks from recording show
-fixed by disallowing dragging into recording shows
2012-11-02 13:24:47 -04:00
denise 715a21acb2 CC-4625: On tablet you cannot create a playlist, smart block or webstream
-upgraded bootstrap-dropdown.js to v2.2.1
2012-11-02 11:59:36 -04:00
denise a937df30ad Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x 2012-11-02 10:48:16 -04:00
denise cc208da2fb CC-4536: Smart block criteria use AND logic, but additional modifiers use OR logic, without labels to show the difference
-added labels
2012-11-02 10:48:08 -04:00
James feb6c9d6f5 CC-4636: Exception happens when trying to remove user that have created some smart block
- doing delete cascade on cc_block on deleting users
2012-11-01 17:45:28 -04:00
James 575400b4c2 CC-4623: Library: Preview button for Flac does not work
- fixed
2012-11-01 16:44:37 -04:00
James d7a5ab4d94 CC-4622: Library: AAC file can be preview but is blocked from playlist and content menu
- fixed
2012-11-01 15:21:56 -04:00
denise 5b14c4fe88 CC-4656: Library -> No error message when a dj tries to delete smart blocks and webstreams they do not own
-fixed
2012-10-31 17:19:27 -04:00
denise 2507e0f8a4 CC-4655: DJ's can delete files that they do not own
-fixed
2012-10-31 16:51:29 -04:00
denise fc613aa597 CC-4604: Edit Metadata: DJ's cannot edit metadata on their own files
-fixed
2012-10-31 16:01:17 -04:00
denise dfd52eedf1 CC-4654: Library -> Simple search still has effects even if you are doing an advanced search
-fixed
2012-10-31 15:24:50 -04:00
denise cc40dfdf4e CC-4641: Now Playing: Extending show's length won't change the overbooked track's style
-added comment
2012-10-31 14:16:16 -04:00
denise 71be2b2bd1 Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x 2012-10-31 12:36:56 -04:00