Commit Graph

8853 Commits

Author SHA1 Message Date
Rudi Grinberg 22a250b5d2 cc-4347: PDOOO 2012-09-07 11:54:32 -04:00
Rudi Grinberg 92682b9f89 Added TODO about unused code 2012-09-07 11:39:58 -04:00
Rudi Grinberg f61463b8ba premature optimization 2012-09-07 11:20:23 -04:00
Rudi Grinberg c28f3af9cf removed unused code. reformatted some comments. 2012-09-07 11:18:10 -04:00
Rudi Grinberg d805995e72 cc-4347: ~~~~PDO~~~~~~ 2012-09-07 11:12:26 -04:00
Daniel James e7e8e36da3 Add dependency on timeout package for Ubuntu Lucid only
Fix Description line so it is Debian/Ubuntu compliant
2012-09-07 10:52:10 +01:00
Martin Konecny 1787be1541 CC-4369: Remove upgrade scripts from versions we no longer support
-ensure versions of Airtime less than 2.0 cause upgrade script to exit
2012-09-07 00:18:02 -04:00
Martin Konecny 0ad4e0dd28 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-07 00:10:54 -04:00
Martin Konecny 8b37e50bd6 CC-4369: Remove upgrade scripts from versions we no longer support
-removed files
2012-09-07 00:10:10 -04:00
James 95cd5a7dde Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-06 17:46:58 -04:00
James 0f1cb61a13 CC-4330: Media Library - > Search: Please change the way to search by owner
- fixed
2012-09-06 17:46:45 -04:00
Rudi Grinberg 33326ec052 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-06 17:23:58 -04:00
Rudi Grinberg 73ba643563 cc-4347: _-=~^PDO^~=-_ 2012-09-06 17:23:39 -04:00
James d9af434138 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-06 16:46:35 -04:00
James 7d3ac8eb07 CC-4346: Prepared statements - part 2
- done
2012-09-06 16:46:22 -04:00
Martin Konecny 18f310d28b CC-4365: Installation - Full installation is complaining on "Package timeout is not available"
-fixed
2012-09-06 16:36:39 -04:00
Martin Konecny 83415cf298 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-06 16:18:37 -04:00
Martin Konecny fba5d56c76 CC-4364: Show - > On Air button is greyed out although you can hear the playout
-fixed
2012-09-06 16:18:28 -04:00
Rudi Grinberg f30507fce6 cc-4347: pdo 2012-09-06 16:17:14 -04:00
Rudi Grinberg 2b659f9c91 Sexified. 2012-09-06 16:16:53 -04:00
Rudi Grinberg 1852843f96 cc-4347: ~~~~PDO~~~~~~ 2012-09-06 15:55:29 -04:00
Rudi Grinberg 977c664bfe cc-4347: Fixed table quoting 2012-09-06 15:49:13 -04:00
Rudi Grinberg ad6e601d5e Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-06 15:47:20 -04:00
Rudi Grinberg 0fdf1e5e86 cc-4347: PDO 2012-09-06 15:47:07 -04:00
Martin Konecny 18ec23526f CC-4294: Webstream length should make hours or minutes optional. Also minutes > 59 should be parsed correctly.
-fixed
2012-09-06 15:02:26 -04:00
Martin Konecny 1b597cf6ed Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-06 14:52:18 -04:00
Martin Konecny ca012afde7 CC-4341: Report of stream status does not work the first time, but works after 'Save' is clicked
-added missing package to install script
2012-09-06 14:50:52 -04:00
Rudi Grinberg 5c13223315 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-06 14:48:55 -04:00
Rudi Grinberg 3f1d979c67 cc-4347: PDO PDO PDO!! 2012-09-06 14:41:40 -04:00
denise 8534cf16d8 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-06 14:30:20 -04:00
denise 8125d6b553 CC-4344: Conductor column not available in library view
-done
2012-09-06 14:30:09 -04:00
Rudi Grinberg 264e909d5a cc-4347: PDOOOOOOOOOOOOOOOO 2012-09-06 14:17:24 -04:00
Rudi Grinberg cd9e89560d cc-4347: small correction. 2012-09-06 14:16:10 -04:00
Rudi Grinberg a39116c687 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-06 14:14:19 -04:00
Rudi Grinberg 45729f16e7 cc-4347: PDOOOOOOOOOOOOOOOO 2012-09-06 14:14:05 -04:00
denise 46d87a2868 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-06 14:11:08 -04:00
denise 33fe2f3467 CC-4351: Library->Deletion of Smart Block and saving it leads to "Processing" message being displayed for a while
-fixed
2012-09-06 14:10:50 -04:00
Martin Konecny acf06e289f Try catching more errors into zendphp.log 2012-09-06 14:01:54 -04:00
Martin Konecny a941743ed7 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
Conflicts:
	airtime_mvc/application/models/User.php
2012-09-06 12:55:24 -04:00
Martin Konecny eae48cf47d CC-4348: Prepared statements - part 4
-User.php
2012-09-06 12:54:44 -04:00
Rudi Grinberg d196666c31 got rid of print statements possible interfering with view 2012-09-06 12:52:11 -04:00
Rudi Grinberg 744577a8b5 Removed bad line break 2012-09-06 12:38:55 -04:00
Rudi Grinberg 3f898bfc3a Fixed wrong function name 2012-09-06 12:33:04 -04:00
denise 7a3c2db2bf Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-06 12:24:07 -04:00
denise 6cb8dd35e2 - fixed sql error 2012-09-06 12:23:53 -04:00
Rudi Grinberg f4591f825f Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-06 12:17:39 -04:00
Rudi Grinberg 56527e727c extra debuggin 2012-09-06 12:17:18 -04:00
denise 8d1003bbbe CC-4303: Library Tab grays out after certain scenario with normal playlist
-fixed
2012-09-06 11:48:00 -04:00
denise 35a5e38aca Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-06 11:21:47 -04:00
denise 9b29f5e701 CC-4345: Prepared statements - part 1
-modified Datatables.php to use Application_Common_Database::prepareAndExecute()
2012-09-06 11:21:36 -04:00