Commit Graph

9736 Commits

Author SHA1 Message Date
Rudi Grinberg 34248921fc refactored code to use displayable 2012-11-05 10:09:34 -05:00
Rudi Grinberg aa9a6691f2 added a single test for checking if a file should be shown or not 2012-11-05 10:08:29 -05:00
Rudi Grinberg 311c88a8a2 added check for hidden in buildEntry 2012-11-05 09:54:00 -05:00
Rudi Grinberg a62e64969d Removed commented method 2012-11-05 09:49:49 -05:00
Rudi Grinberg 00a4e45491 added check for hidden in buildEntry 2012-11-05 09:47:16 -05:00
Rudi Grinberg 800f8b9ded added criteria to remmove hidden files in blocks 2012-11-05 09:40:58 -05:00
Rudi Grinberg 4522fa94b2 added clause to exclude hidden files from getShowListContent 2012-11-05 09:30:21 -05:00
Rudi Grinberg e01a61208d Merge remote-tracking branch 'sf/2.2.x' into cc-4585 2012-11-05 09:19:20 -05:00
Rudi Grinberg 7e03333496 changed deletion by the user to be setting the file to be hidden instead 2012-11-03 01:33:13 -04:00
Rudi Grinberg 9c4f2e3298 refactored addWatchedDir to use early return style 2012-11-03 01:16:57 -04:00
Rudi Grinberg 5d3aa68c72 written method to unhide all files in a music dir 2012-11-03 01:09:36 -04: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
Rudi Grinberg 2ae3c0ac03 Line wrapping 2012-11-02 16:06:12 -04:00
Rudi Grinberg 1111fd8163 align 2012-11-02 16:04:47 -04:00
Rudi Grinberg ac9b47f5e2 made rescanWatchDirectoryAction more concise 2012-11-02 16:02:05 -04:00
Rudi Grinberg 5cb83909d8 Merge remote-tracking branch 'sf/2.2.x' into cc-4585 2012-11-02 16:00:09 -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
Rudi Grinberg 270eb97128 Merge branch '2.2.x' of dev.sourcefabric.org:airtime into cc-4585 2012-11-01 15:14:53 -04:00
Rudi Grinberg 226bdbf738 added todo 2012-10-31 17:41:50 -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
Rudi Grinberg 4cca80fe44 Added schema changes 2012-10-31 16:23:12 -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
Rudi Grinberg a3a2edc3f1 Added column for files that have been deleted by user 2012-10-31 14:53:36 -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