Rudi Grinberg
|
f801fcb81e
|
empty space
|
2012-09-19 11:20:26 -04:00 |
|
Rudi Grinberg
|
014da73eed
|
heredoc sql
|
2012-09-19 11:17:32 -04:00 |
|
Rudi Grinberg
|
ecb5c93ddf
|
Removed methods again...
|
2012-09-19 11:14:59 -04:00 |
|
Rudi Grinberg
|
7dac1c6561
|
Added them back because not sure
|
2012-09-19 11:14:26 -04:00 |
|
Rudi Grinberg
|
99b28cca82
|
Removed unused methods
|
2012-09-19 11:11:50 -04:00 |
|
Rudi Grinberg
|
20b79374e2
|
Removed empty method
|
2012-09-19 10:25:29 -04:00 |
|
Rudi Grinberg
|
58620203cf
|
line wrap
|
2012-09-19 10:24:45 -04:00 |
|
Rudi Grinberg
|
fb4f7c1cb5
|
psr
|
2012-09-19 10:23:54 -04:00 |
|
Rudi Grinberg
|
33be48e9e3
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-18 18:21:00 -04:00 |
|
Rudi Grinberg
|
a9eefe21fa
|
cc-4304: Add call to save after each file reassignment
|
2012-09-18 18:20:33 -04:00 |
denise
|
92b40bea0c
|
CC-4484: Some js files do not have the airtime version appended
-fixed
|
2012-09-18 17:43:13 -04:00 |
Martin Konecny
|
b69f3288d3
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-18 17:22:22 -04:00 |
|
Martin Konecny
|
6420e6a830
|
remove trailing whitespace
|
2012-09-18 17:22:14 -04:00 |
James
|
3ecbab3259
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-18 16:50:57 -04:00 |
|
James
|
8433ec5445
|
CC-4482: Smart Blocks -> tracks with empty "Album" name are NOT filtered in
- fixed
|
2012-09-18 16:50:42 -04:00 |
|
Rudi Grinberg
|
d55915d649
|
naming convention fix
|
2012-09-18 16:40:23 -04:00 |
|
Rudi Grinberg
|
608fff090c
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-18 15:52:26 -04:00 |
|
Rudi Grinberg
|
7a958ec8b6
|
formatting
|
2012-09-18 15:52:16 -04:00 |
|
James
|
be214ac126
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-18 15:47:48 -04:00 |
|
James
|
eecc90547d
|
CC-4461: Now Playing: Timeline does not reflect the changes on Show start time (which is changed from Calendar->Edit Show)
- fixed
|
2012-09-18 15:47:37 -04:00 |
|
Martin Konecny
|
da11dc077e
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-18 15:27:35 -04:00 |
|
Martin Konecny
|
4c58c4c9a9
|
CC-4473: On Air button greys out when one out of two same Webstreams is cancelled
-fixed
|
2012-09-18 15:27:27 -04:00 |
|
Rudi Grinberg
|
72e6ee35fa
|
cc-4304: Temporarily fixed
|
2012-09-18 15:26:43 -04:00 |
|
Rudi Grinberg
|
2cfb0c85d5
|
Formatted sql
|
2012-09-18 15:04:22 -04:00 |
|
Rudi Grinberg
|
3a60d729fd
|
added todo
|
2012-09-18 15:02:07 -04:00 |
|
Rudi Grinberg
|
b069b1254e
|
Aligned
|
2012-09-18 12:56:01 -04:00 |
|
Rudi Grinberg
|
90d3494576
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-18 12:48:55 -04:00 |
|
Rudi Grinberg
|
6ac241b1fc
|
Added todo
|
2012-09-18 12:48:45 -04:00 |
|
Martin Konecny
|
09bc686d99
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-18 12:41:30 -04:00 |
|
Martin Konecny
|
b0f2176329
|
fix some TODO's in webstream.php
|
2012-09-18 12:40:44 -04:00 |
|
Rudi Grinberg
|
a22ba39de1
|
formatting
|
2012-09-18 12:26:07 -04:00 |
|
Rudi Grinberg
|
d2f43058c2
|
fixed comment
|
2012-09-18 12:09:28 -04:00 |
|
Rudi Grinberg
|
f9319b869a
|
Corrected comments
|
2012-09-18 12:08:30 -04:00 |
|
Rudi Grinberg
|
bc873a3ece
|
Added extension handling for file path
|
2012-09-18 12:04:54 -04:00 |
|
Rudi Grinberg
|
8657a80459
|
removed return ''
|
2012-09-18 11:51:13 -04:00 |
|
Rudi Grinberg
|
6fc0d50c9f
|
lined up
|
2012-09-18 11:46:35 -04:00 |
|
Rudi Grinberg
|
018b50d316
|
added better logging
|
2012-09-18 11:45:10 -04:00 |
|
Rudi Grinberg
|
0a83b33a5a
|
Removed extra logging statements
|
2012-09-18 11:10:54 -04:00 |
|
Rudi Grinberg
|
6481556f9b
|
Showbuilder formatting
|
2012-09-18 11:07:32 -04:00 |
|
Rudi Grinberg
|
49e1b29bc9
|
Removed instances of getLine and getFile
|
2012-09-18 11:04:33 -04:00 |
|
Rudi Grinberg
|
2e0e0849c5
|
More clean up
|
2012-09-18 11:03:34 -04:00 |
|
Rudi Grinberg
|
d90559fdf8
|
Cleaned up ShowbuilderController
|
2012-09-18 11:02:41 -04:00 |
|
Rudi Grinberg
|
96f138a9fe
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-18 10:55:55 -04:00 |
|
Rudi Grinberg
|
9249bf8cd0
|
Big formatting changes.
|
2012-09-18 10:55:42 -04:00 |
Naomi Aro
|
f50fccaf5f
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-17 16:28:36 -07:00 |
|
Naomi Aro
|
bb3ffce071
|
CC-3944 : Now Playing -> Time Line view: Cannot cancel record show, cancel button is disabled
|
2012-09-17 16:28:28 -07:00 |
|
Rudi Grinberg
|
542c5c857f
|
alignment
|
2012-09-17 17:54:10 -04:00 |
|
Rudi Grinberg
|
53c6d77821
|
Formatting
|
2012-09-17 17:52:56 -04:00 |
|
Rudi Grinberg
|
095a5cce4f
|
Added better debugging
|
2012-09-17 17:51:50 -04:00 |
|
Rudi Grinberg
|
69756f60ca
|
formatting
|
2012-09-17 17:49:25 -04:00 |