Commit Graph

3165 Commits

Author SHA1 Message Date
Martin Konecny ca0fb969b7 fix jplayer errors for mp3 and firefox (flash) 2012-09-19 13:23:06 -04:00
Martin Konecny ddc0e8d2ba remove console.log from javascript library :/ 2012-09-19 11:04:01 -04:00
denise 281e7d1092 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-19 10:49:52 -04:00
denise 0c823af660 CC-4155: Playlist Builder: Style static/dynamic expansion blocks in playlist contents
-done
2012-09-19 10:49:17 -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
Martin Konecny 1da4f44768 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-18 21:29:19 -04:00
Martin Konecny 7036036a86 CC-4476: Make all green notification boxes fade out after 5 seconds
-fixed
2012-09-18 21:29:02 -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
denise 5003e86eac - changed smart block qtip text 2012-09-18 17:37:38 -04:00
denise f9778f2da4 -removed windows CRLF 2012-09-18 17:26:34 -04:00
denise 610a5da24e Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-18 17:23:37 -04:00
denise 1d699fe0b8 CC-4479: Buttons in dialog windows are not styled
-done
2012-09-18 17:22:24 -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
denise 39e1bd5271 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-18 16:55:57 -04:00
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 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 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 b0f2176329 fix some TODO's in webstream.php 2012-09-18 12:40:44 -04:00