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 |
|
Rudi Grinberg
|
ff22b80dfc
|
formatting
|
2012-09-17 17:49:16 -04:00 |
|
Rudi Grinberg
|
3ba3df07f8
|
better logging
|
2012-09-17 17:39:41 -04:00 |
|
Rudi Grinberg
|
5a37777cfd
|
formatting
|
2012-09-17 17:04:49 -04:00 |
|
Rudi Grinberg
|
9c5ebdc4c0
|
Removed old commented code
|
2012-09-17 17:02:59 -04:00 |
|
Rudi Grinberg
|
1c736d6366
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-17 16:47:45 -04:00 |
|
Rudi Grinberg
|
d0e67d8475
|
cc-4462: Bandaided, marked as hack
|
2012-09-17 16:47:33 -04:00 |
|
Martin Konecny
|
117f11ef97
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-17 16:46:57 -04:00 |
|
Martin Konecny
|
75620be761
|
remove all mosty carriage return characters
|
2012-09-17 16:46:51 -04:00 |
|
Rudi Grinberg
|
81c72b8344
|
cc-4462: Bandaided
|
2012-09-17 16:46:49 -04:00 |
|
Martin Konecny
|
56eb2dff92
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-17 16:40:37 -04:00 |
|
Martin Konecny
|
c310cecf40
|
CC-4463: do we need getFileExtension()?
|
2012-09-17 16:40:27 -04:00 |
|
Rudi Grinberg
|
ae1ae80d36
|
in_array -> array_key_exists
|
2012-09-17 16:40:22 -04:00 |
|
Rudi Grinberg
|
c2b2ea1d16
|
Fixed formatting
|
2012-09-17 16:27:10 -04:00 |
|
Martin Konecny
|
8b445486b1
|
CC-4427: Listen button does not work
fixed
|
2012-09-17 16:17:53 -04:00 |
|
Martin Konecny
|
efc0ace49c
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-17 16:06:30 -04:00 |
denise
|
182bdd0cf6
|
-added border to smart block expansion
|
2012-09-17 15:57:41 -04:00 |
|
Martin Konecny
|
0e82083ba1
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-17 15:55:53 -04:00 |
|
Rudi Grinberg
|
1a29499bb8
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-17 15:48:09 -04:00 |
James
|
c9b7fa7073
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-17 15:41:40 -04:00 |
|
James
|
54b6b12ec0
|
CC-4094: Dashboard -> Source Info panel: DJ assigned to current show can turn off the Master Resouce but cannot disconnect it.
- fixed
|
2012-09-17 15:41:27 -04:00 |
|
denise
|
43c336eb6d
|
CC-4155: Playlist Builder: Style static/dynamic expansion blocks in playlist contents
-implemented css changes
-formatted playlist_builder.css
|
2012-09-17 15:41:22 -04:00 |
|
Rudi Grinberg
|
4f576afc00
|
cc-4396. Initial fix problem was a module was not being included in the soundcloud upload script.
|
2012-09-17 15:24:02 -04:00 |
|
Martin Konecny
|
54bb414500
|
CC-4318: Widgets: Weekly show cannot show the schedule
-fixed
|
2012-09-17 14:56:34 -04:00 |