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 |
|
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 |
|
denise
|
1698aae251
|
CC-4466: Buttons on Now Playing page are clickable even though they are disabled
-fixed
|
2012-09-18 10:53:19 -04:00 |
|
Martin Konecny
|
aa3bf3941b
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-17 22:48:16 -04:00 |
|
Martin Konecny
|
a661ab8850
|
CC-4289: Airtime 2.2 upgrade script
-fixed
|
2012-09-17 22:48:03 -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
|
7b72a14a02
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-17 17:59:02 -04:00 |
|
James
|
8f991dc50b
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-17 17:56:45 -04:00 |
|
James
|
81a015dfac
|
CC-4460: Differences between upgraded and fresh installed Airtime database
- done
|
2012-09-17 17:56:33 -04: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
|
8b50ff70c3
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-17 17:52:00 -04:00 |