Commit Graph

9284 Commits

Author SHA1 Message Date
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
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 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
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
James df476d9cb6 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-17 17:47:53 -04:00
James db52f1cfcf CC-4383: Fatal error in phone_home_stat script (2.2.0 dev)
- fixed
2012-09-17 17:47:32 -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 d367c0f55c remove all newline characters from AirtimeInstall.php 2012-09-17 16:41:40 -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