Commit graph

9734 commits

Author SHA1 Message Date
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
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
James
575400b4c2 CC-4623: Library: Preview button for Flac does not work
- fixed
2012-11-01 16:44:37 -04:00
Rudi Grinberg
5933cc3306 Merge branch '2.2.x' of dev.sourcefabric.org:airtime into cc-4652 2012-11-01 16:19:22 -04:00
Rudi Grinberg
bf363dcdde cc-4652: Added code to create the stor/ structure before adding any watched 2012-11-01 15:48:26 -04:00
Rudi Grinberg
176f2c45ba Added information message when media monitor is restarted 2012-11-01 15:42:58 -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
Rudi Grinberg
c0dc38be62 cc-4652: added logging for when watch fails on startup 2012-11-01 15:16:23 -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
0999b28b2d Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x 2012-10-31 16:51:41 -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
Martin Konecny
1472eb5e51 Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x 2012-10-31 16:39:03 -04:00
Martin Konecny
766a17bc2b CC-4657: Don't use deb-multimedia.org for package liblame 2012-10-31 16:38:53 -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
denise
fd0e1c3c95 CC-4641: Now Playing: Extending show's length won't change the overbooked track's style
-fixed
2012-10-31 12:36:45 -04:00
james
2e4d5ec142 CC-4539: Advanced search: Sample rate searched on Hz, but search results
shown in kHz

- fixed
2012-10-31 12:32:40 -04: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