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 |
denise
|
a75a12a198
|
-smart block criteria UI change for small screen resolution
|
2012-09-14 18:02:40 -04:00 |
|
denise
|
d5a2fc93e1
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-14 17:35:25 -04:00 |
|
denise
|
84deda99c5
|
CC-4440: System -> Streams: Update and Save 'Stream 1/2/3' will make it invisible
-fixed
|
2012-09-14 17:35:14 -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
|
7b1b271a2c
|
Reformatted sql to use heredocs
|
2012-09-14 17:09:05 -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
|
4ea3d86121
|
remove unnecessary logging
|
2012-09-14 16:58:42 -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
|
c84a608747
|
CC-4438: Station Time is always UTC time no matter what the time zone setting is
-fixed
|
2012-09-14 16:51:39 -04:00 |
|
Martin Konecny
|
3ced92db7a
|
CC-4415: Smart Block audio preview doesn't work
|
2012-09-14 16:51:14 -04:00 |
|
Rudi Grinberg
|
ec3e0a9b9f
|
Added todo
|
2012-09-14 16:50:28 -04:00 |
|
Rudi Grinberg
|
29909f0bd9
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-14 16:49:37 -04:00 |
|
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 |