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 |
|
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 |
|
denise
|
00947f9d7e
|
CC-4640: Automatically jump to current song when loading the Now Playing page.
-small fix
|
2012-10-30 15:34:38 -04:00 |
|
denise
|
5f03a38262
|
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x
|
2012-10-30 15:04:08 -04:00 |
|
denise
|
cabe583a3b
|
CC-4649: Library -> Disable simple search if advanced search fields are open
-done
|
2012-10-30 15:01:46 -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 |
|
denise
|
695c0fa926
|
CC-4607: Library: Please make the 'Add x items' following mouse's point
-fixed
|
2012-10-30 11:45:53 -04:00 |
|
denise
|
51de436fd5
|
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x
|
2012-10-30 11:18:18 -04:00 |
|
denise
|
b08f5091b5
|
CC-4609: Calendar -> Add/Remove contents: Please remove useless buttons: 'Jump to current playing song' and 'Cancel current show'
-done
|
2012-10-30 11:18:11 -04:00 |
|
Rudi Grinberg
|
7276985bb4
|
test commit
|
2012-10-29 19:19:48 -04:00 |
|
James
|
aea21a801b
|
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x
|
2012-10-29 16:37:47 -04:00 |
|
James
|
5651dbce56
|
CC-4644: Exception from zendphp.log
- fixed
|
2012-10-29 16:37:27 -04:00 |
|
Martin Konecny
|
5f0fd0ef09
|
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x
|
2012-10-29 16:29:20 -04:00 |
|
Martin Konecny
|
e40d49219b
|
add missing gstreamer.liq file
|
2012-10-29 16:29:10 -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 |
|