Rudi Grinberg
|
bf651a96aa
|
cc-4431: Fixed isUserType
|
2012-09-14 16:47:55 -04:00 |
|
denise
|
ee98c8fba5
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-14 16:38:33 -04:00 |
|
denise
|
8ffaaaef25
|
-skip playable test if item is a smart block
|
2012-09-14 16:38:26 -04:00 |
|
Rudi Grinberg
|
ba08355c38
|
quick fix
|
2012-09-14 16:16:52 -04:00 |
|
Rudi Grinberg
|
76ba4bb6f0
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-14 16:03:03 -04:00 |
|
denise
|
4201176b3a
|
-small UI change
|
2012-09-14 15:59:34 -04:00 |
|
denise
|
da107f5120
|
-small UI fix
|
2012-09-14 15:55:55 -04:00 |
|
denise
|
0524e4e5d2
|
-implemented UI changes for playlist/block/webstream builder
|
2012-09-14 15:49:39 -04:00 |
|
Rudi Grinberg
|
05916a4d26
|
Code cleanup
|
2012-09-14 15:13:08 -04:00 |
|
Martin Konecny
|
198d15adc8
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-14 14:53:32 -04:00 |
|
Martin Konecny
|
78460703a2
|
CC-4434: Make Application_Model_Preference::getValue and setValue private methods
-done
|
2012-09-14 14:53:25 -04:00 |
|
Rudi Grinberg
|
79ce7b572c
|
cc-4202: Fixed
|
2012-09-14 14:51:50 -04:00 |
|
Martin Konecny
|
6e239d08e9
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-14 14:43:15 -04:00 |
|
Martin Konecny
|
239a228175
|
CC-4434: Make Application_Model_Preference::getValue and setValue private methods
-small fix
|
2012-09-14 14:36:31 -04:00 |
|
Martin Konecny
|
e3c1a3ac0e
|
CC-4434: Make Application_Model_Preference::getValue and setValue private methods
-initial commit
|
2012-09-14 12:09:40 -04:00 |
|
denise
|
c7f4ede766
|
-implemented UI changes for library page
|
2012-09-14 12:08:51 -04:00 |
|
denise
|
c35c76351b
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-13 17:11:10 -04:00 |
|
denise
|
8f48544bb7
|
-implemented UI changes for Now Playing page
|
2012-09-13 17:10:38 -04:00 |
|
James
|
43503475fd
|
CC-4430: Block: Please don't count the removed files in when calculating how many files meet the criteria
- CRLF fix
|
2012-09-13 17:07:47 -04:00 |
|
James
|
d2f0b10552
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-13 17:05:56 -04:00 |
|
James
|
0b917f385e
|
CC-4430: Block: Please don't count the removed files in when calculating how many files meet the criteria
- fixed
|
2012-09-13 17:05:40 -04:00 |
|
Martin Konecny
|
d534f22ce4
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-13 16:11:15 -04:00 |
|
Martin Konecny
|
505b53fa16
|
cc-1665: fix broken checkin for webstream
|
2012-09-13 16:11:06 -04:00 |
|
Martin Konecny
|
da72c00f28
|
CC-4370: Transitioning between two webstreams: a hiccup in the stream is audible
-fixed
|
2012-09-13 16:10:17 -04:00 |
|
Rudi Grinberg
|
11ef613d1c
|
comment formatting
|
2012-09-13 15:16:46 -04:00 |
|
Rudi Grinberg
|
e31d570a1c
|
Sql formatting
|
2012-09-13 15:13:37 -04:00 |
|
Rudi Grinberg
|
f754d78687
|
Formatted comments and =
|
2012-09-13 15:12:54 -04:00 |
|
Rudi Grinberg
|
410a3406af
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-13 15:05:48 -04:00 |
|
Martin Konecny
|
14db5053b1
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-13 14:56:10 -04:00 |
|
Martin Konecny
|
203378e60a
|
More exception handling
|
2012-09-13 14:56:03 -04:00 |
|
Rudi Grinberg
|
8d08aa888b
|
cc-4421: Added special handling for files that mutagen returns None for.
|
2012-09-13 14:54:52 -04:00 |
|
James
|
b2d61f2402
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-13 14:22:27 -04:00 |
|
James
|
2293fcda01
|
CC-4393: Please ignore Flac items for Playlist Preview and disable to preview it as a single track
- fixed
|
2012-09-13 14:22:13 -04:00 |
|
Rudi Grinberg
|
4137602116
|
Cleaned up API controller
|
2012-09-13 14:21:15 -04:00 |
|
Rudi Grinberg
|
8a2703c50d
|
Made method static
|
2012-09-13 12:33:15 -04:00 |
|
Rudi Grinberg
|
2b9e6081a4
|
Added log for exception
|
2012-09-13 12:27:04 -04:00 |
|
Rudi Grinberg
|
e043816bf4
|
Removed superfluous logging
|
2012-09-13 12:23:48 -04:00 |
|
Rudi Grinberg
|
3fb7526fbb
|
Shortened logging
|
2012-09-13 12:15:51 -04:00 |
|
Rudi Grinberg
|
b28116f622
|
removed empty space
|
2012-09-13 11:34:00 -04:00 |
|
Rudi Grinberg
|
d564b85e7c
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-13 11:12:32 -04:00 |
|
denise
|
a779142a08
|
-fix commenting error
|
2012-09-13 11:12:39 -04:00 |
|
Rudi Grinberg
|
e2f8d8e0e7
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-13 11:10:43 -04:00 |
|
Rudi Grinberg
|
d409af2876
|
shortened logging
|
2012-09-13 11:07:29 -04:00 |
|
Rudi Grinberg
|
dced49c425
|
Removed unused variable
|
2012-09-13 10:52:58 -04:00 |
|
Rudi Grinberg
|
55993352bf
|
Removed unused variables.
|
2012-09-13 10:35:24 -04:00 |
|
Rudi Grinberg
|
8eda4a7035
|
Subtle bug fixed in smartPrepareAndExecute.
|
2012-09-13 10:34:15 -04:00 |
|
denise
|
e1403d45bd
|
CC-4368: Unused local variables in Airtime Controllers. Should be removed.
-done
|
2012-09-13 10:32:33 -04:00 |
|
Rudi Grinberg
|
24b3fb7e8a
|
Remvod unused CC_CONFIG, reformatted some code
|
2012-09-13 10:26:50 -04:00 |
|
Martin Konecny
|
1f3bab2458
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-12 23:06:19 -04:00 |
|
Martin Konecny
|
54d7f496d9
|
add bootstrap.js to bootstrap.php
|
2012-09-12 23:06:05 -04:00 |
|