Martin Konecny
|
ab99e64e8a
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-17 11:13:44 -04:00 |
|
Rudi Grinberg
|
f6967ac575
|
Added Martin's fix
|
2012-09-17 11:03:36 -04:00 |
|
Martin Konecny
|
7fed5bcd18
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-17 10:57:19 -04:00 |
|
Rudi Grinberg
|
a664e7f74a
|
Removed extra comments
|
2012-09-17 10:30:55 -04:00 |
|
Rudi Grinberg
|
1c2cebf5a8
|
Removed comment
|
2012-09-17 10:27:12 -04:00 |
|
Rudi Grinberg
|
f809a17c02
|
Formatting
|
2012-09-14 19:05:30 -04:00 |
|
Martin Konecny
|
be80eeb5fd
|
CC-4404: restart airtime-liquidsoap will interrupt the output stream and never resume until restart playout engine
-fixed
|
2012-09-14 18:20:46 -04:00 |
|
Rudi Grinberg
|
2faf299c73
|
Removed code duplication
|
2012-09-14 17:28:50 -04:00 |
|
Rudi Grinberg
|
092595eb9f
|
Removed profane logging message
|
2012-09-14 17:10:10 -04:00 |
|
Rudi Grinberg
|
f2b07e4a83
|
alignment
|
2012-09-14 17:02:38 -04:00 |
|
Rudi Grinberg
|
67483f8bb2
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-14 17:01:45 -04:00 |
|
Rudi Grinberg
|
81dadb7f85
|
Removed annoying logging
|
2012-09-14 17:01:35 -04:00 |
|
Martin Konecny
|
39903be69a
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-14 16:51:48 -04:00 |
|
Martin Konecny
|
3ced92db7a
|
CC-4415: Smart Block audio preview doesn't work
|
2012-09-14 16:51:14 -04:00 |
|
Rudi Grinberg
|
bf651a96aa
|
cc-4431: Fixed isUserType
|
2012-09-14 16:47:55 -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 |
|
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
|
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 |
|
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 |
|
Rudi Grinberg
|
410a3406af
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-13 15:05:48 -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 |
|
denise
|
e1403d45bd
|
CC-4368: Unused local variables in Airtime Controllers. Should be removed.
-done
|
2012-09-13 10:32:33 -04:00 |
|
Martin Konecny
|
1f3bab2458
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-12 23:06:19 -04:00 |
|
Rudi Grinberg
|
cc88a9a8e3
|
Fixed a lot of unused variables
|
2012-09-12 18:36:27 -04:00 |
|
Martin Konecny
|
1c293839da
|
CC-4393: Please ignore AAC and Flac items for Playlist Preview and disable to preview it as a single track
-disable preview icon
|
2012-09-12 17:32:19 -04:00 |
|
Martin Konecny
|
20f5fe6480
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
Conflicts:
airtime_mvc/application/models/Block.php
airtime_mvc/public/css/styles.css
|
2012-09-12 15:55:43 -04:00 |
|
Martin Konecny
|
87fb9998dd
|
increase mem warning limit to 30MB
|
2012-09-12 15:44:26 -04:00 |
|
Rudi Grinberg
|
975830ff90
|
Removed wrong comments
|
2012-09-11 18:22:24 -04:00 |
|
Rudi Grinberg
|
e2d69df4a6
|
Removed unused code
|
2012-09-11 17:51:39 -04:00 |
|
Rudi Grinberg
|
dc91db1f46
|
formatting
|
2012-09-11 17:48:08 -04:00 |
|