Commit Graph

9752 Commits

Author SHA1 Message Date
Martin Konecny 5f534b5ef6 CC-4702Webstream: When webstream is playing, it isn't marked as 'media_item_played' in cc_schedule 2012-11-15 17:29:25 -05:00
Martin Konecny 8c73731c41 CC-4633: Use David's new method of Liquidsoap webstream switching
-fixed
2012-11-15 16:43:22 -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 2010778876 cleanup redundant code, remove whitespace 2012-11-15 13:33:27 -05:00
Martin Konecny d1a22fe7ca CC-4677: Improve Smart block repeat description
-fixed
2012-11-15 11:30:56 -05:00
Martin Konecny 9518769738 Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x 2012-11-15 11:23:04 -05:00
Martin Konecny cfad1079bb CC-4626: Airtime installation on Wheezy 2012-11-15 11:22:31 -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
Martin Konecny 90f14584b5 Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x 2012-11-06 16:51:49 -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
Rudi Grinberg b3c9472bcb cc-4672: added dirty workaround to fix this issue 2012-11-06 16:16:37 -05:00
Rudi Grinberg 1762e418c0 added better logging 2012-11-06 14:57:53 -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
Rudi Grinberg b4555e9845 docstring formatting 2012-11-06 13:51:04 -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 e434af368f Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x 2012-11-05 13:58:22 -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
Martin Konecny 16a13afd4e Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x 2012-11-05 12:05:38 -05:00
Martin Konecny f6ee2afb88 CC-4665: ReplayGain does not work for FLAC files
-fixed
2012-11-05 12:03:25 -05:00
denise c59605040d Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x 2012-11-05 12:00:54 -05:00
denise c051e0671d CC-4625: On tablet you cannot create a playlist, smart block or webstream
-attempt #2
2012-11-05 12:00:37 -05:00
Martin Konecny fffaf7788a Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x 2012-11-05 11:53:52 -05:00
Martin Konecny af7e94a44d don't break 80 character line limit 2012-11-05 11:53:37 -05:00
Martin Konecny d89166e2ff CC-4665: ReplayGain does not work for FLAC files
-fixed
2012-11-05 11:53:20 -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
Rudi Grinberg 44e240741a Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x 2012-11-02 12:45:01 -04:00
Rudi Grinberg a1d5037e04 cc-4584: fixxxed 2012-11-02 12:42:24 -04:00
denise 6267acc4b0 Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x 2012-11-02 11:59:54 -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
Rudi Grinberg e9524c8615 Merge remote-tracking branch 'rudi/cc-4652' into 2.2.x 2012-11-02 11:30:04 -04:00
Rudi Grinberg 466b647b59 Merge remote-tracking branch 'rudi/cc-4630' into 2.2.x 2012-11-02 11:29:22 -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 b746f65304 CC-4601: Do not rewrite metadata for master source and show source streams.
- fixed
2012-11-01 17:24:41 -04:00
Rudi Grinberg 6bcadd7ed6 cc-4630: Added permission set on permission folder before watching it 2012-11-01 17:01:32 -04:00