Commit graph

9466 commits

Author SHA1 Message Date
denise
b77429164b CC-4465: Calendar: Remove warning icon on empty shows if show is in the past
-removed setInterval function
2012-09-18 16:55:46 -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
denise
cc966ca62b Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-18 16:49:52 -04:00
denise
54ab58a9c7 CC-4465: Calendar: Remove warning icon on empty shows if show is in the past
-removed (commented out) code for this ticket
-postponing for now
2012-09-18 16:49:45 -04:00
Rudi Grinberg
d55915d649 naming convention fix 2012-09-18 16:40:23 -04:00
Rudi Grinberg
539cc9e11d added comments 2012-09-18 16:10:55 -04:00
Rudi Grinberg
608fff090c Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-18 15:52:26 -04:00
denise
1c89244b02 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-18 15:52:20 -04:00
Rudi Grinberg
7a958ec8b6 formatting 2012-09-18 15:52:16 -04:00
denise
8cae11d588 CC-4478: Library: audio preview check should be skipped if file does not exist
-fixed
2012-09-18 15:52:11 -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
denise
0241eb4714 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-18 15:29:08 -04:00
denise
09b117999e CC-4475: Register form button doesn't have any styling
-fixed
2012-09-18 15:28:38 -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
a2f3210c79 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-18 15:26:53 -04:00
Rudi Grinberg
72e6ee35fa cc-4304: Temporarily fixed 2012-09-18 15:26:43 -04:00
denise
e676cf856f -remove console.log 2012-09-18 15:16:54 -04:00
denise
0386f8a9cb Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-18 15:14:57 -04:00
denise
7bbd10556b CC-4465: Calendar: Remove warning icon on empty shows if show is in the past
-done
2012-09-18 15:14:46 -04:00
Rudi Grinberg
66aee1a01b Added TODO 2012-09-18 15:13:39 -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
b372c9ae50 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-18 14:56:53 -04:00
James
859041bcf4 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-18 14:40:32 -04:00
James
98f0692b8d CC-4457: Media Library: The background of 'Adding items' is minimize to a point
- fixed
2012-09-18 14:40:18 -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
b1f0bdb6ae CC-4377: Make sure upgrade script handles new required packages
-removing package checking from main install script (not its duty to perform this)
2012-09-18 12:41:19 -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
81887b291a cc-4129: Changed unused organization to label 2012-09-18 11:39:28 -04:00
denise
355ceadedb Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-18 11:22:44 -04:00
denise
e00ff6367d CC-4458: Now Playing -> "+ Add to current playlist text" might be replaced by something more appropriate
-fixed
2012-09-18 11:22:37 -04:00
Rudi Grinberg
9759543943 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-18 11:11:06 -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
denise
75d6b509ea Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-18 11:05:20 -04:00
denise
9c721f202f -small UI improvement 2012-09-18 11:05:13 -04:00
Rudi Grinberg
49e1b29bc9 Removed instances of getLine and getFile 2012-09-18 11:04:33 -04:00