Commit Graph

2660 Commits

Author SHA1 Message Date
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
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
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
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 2507e0f8a4 CC-4655: DJ's can delete files that they do not own
-fixed
2012-10-31 16:51:29 -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 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
James 1899d588ee - CRLF fix 2012-10-30 18:03:03 -04:00
James cbee9422ec Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x 2012-10-30 17:58:16 -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
Martin Konecny 9b77007e03 Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x 2012-10-30 17:19:51 -04:00
Martin Konecny 8c90c1a12f CC-4645: Add support for x-scpls playlist types
-fixed
2012-10-30 17:19:40 -04:00
James ef68680868 Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x 2012-10-30 13:23:23 -04:00
James 3e60ac4393 remove \r line endings 2012-10-30 13:23:09 -04:00
denise acc3ccca22 Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x 2012-10-30 13:03:05 -04:00
denise b8039e315a CC-4577: Webstream UI: little improvement about 'SAVE' button and input boxes for URL and length
-done
2012-10-30 13:02:55 -04:00
James bba7975882 Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x 2012-10-30 12:36:59 -04:00
James 5061dfa05d CC-4647: apache error log entries
- fixed
2012-10-30 12:36:50 -04:00
denise 71291b14f0 CC-4646: Library: Make advanced search options hidden by default
-done
2012-10-30 11:59:52 -04:00
James 5651dbce56 CC-4644: Exception from zendphp.log
- fixed
2012-10-29 16:37:27 -04:00
James a937aa0e28 Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x 2012-10-29 16:19:39 -04:00
James 4861397872 CC-4644: Exception from zendphp.log
- fixed
2012-10-29 16:19:23 -04:00
denise 8ac0f41987 CC-4590: New smart block says 'Empty playlist'
-fixed
2012-10-29 11:57:20 -04:00
Rudi Grinberg d6a4f2f713 Cleaned up soundcloud 2012-10-26 18:45:27 -04:00
James f14320a769 CC-4603: Dynamic Smart Blocks: adding to multiple shows at once generates the same content
- fixed
2012-10-26 17:15:39 -04:00
Rudi Grinberg dc361c1136 Aligned constants 2012-10-26 13:10:08 -04:00
Martin Konecny 4daaa776e2 CC-4620: Now Playing page loading is very slow because 1M records in cc_schedule table
-fixed
2012-10-23 17:45:55 -04:00
Martin Konecny 2d6be404d4 cc-4304: fixed ticket by deleting playlists when user is deleted. also removed useless index on file_exists
-regen propel files
2012-10-23 13:45:15 -04:00
james dff5bb4e2b CC-4620: Now Playing page loading is very slow because 1M records in cc_schedule table
- fixed
2012-10-23 12:24:38 -04:00
denise 9ddd54ec12 Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x 2012-10-22 16:37:19 -04:00
denise c51fb8a040 CC-4549: Tooltip for source username cannot be shared between input and output settings
-fixed
2012-10-22 16:37:06 -04:00