Congegni
/
libretime
mirror of https://github.com/libretime/libretime.git
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
8,834 Commits 18 Branches 27 Tags 434 MiB
Commit Graph

8834 Commits

Author SHA1 Message Date
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
Rudi Grinberg 9079f29584 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-06 11:15:12 -04:00
Rudi Grinberg bed360cd3e Formatting 2012-09-06 11:15:01 -04:00
denise b25ce921ee Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-06 11:11:15 -04:00
denise f06b3e2c36 CC-4345: Prepared statements - part 1 
-modified Block.php to use Application_Common_Database::prepareAndExecute()
 2012-09-06 11:11:09 -04:00
Rudi Grinberg f3ff9cc461 cc-4360: Fix for this bug. Table name was being quoted needlessly. 2012-09-06 11:03:24 -04:00
Rudi Grinberg 88c5ef484f Formatting 2012-09-06 10:38:14 -04:00
Rudi Grinberg 5481191730 added type hint 2012-09-05 18:01:20 -04:00
Rudi Grinberg b112a0fe2b cc-4347: PDOOOOOOOOOOOOO 2012-09-05 17:59:18 -04:00
denise 78c81aa434 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 
Conflicts:
	airtime_mvc/application/common/Database.php
 2012-09-05 17:55:26 -04:00
denise 26c2c2c0d1 CC-4345: Prepared statements - part 1 
-added extra parameter to prepareAndExecute()
 2012-09-05 17:52:53 -04:00
Rudi Grinberg 8be51d5bf4 sexified code 2012-09-05 17:52:27 -04:00
Rudi Grinberg 73e152ebcf added type annotation again 2012-09-05 17:51:50 -04:00
Rudi Grinberg aa6e061118 conflicts merged 2012-09-05 17:51:16 -04:00
Rudi Grinberg d2e883da7a Added type annotation 2012-09-05 17:48:15 -04:00
Rudi Grinberg 0385c008ce cc-4347: PDO00!!! 2012-09-05 17:46:48 -04:00
Martin Konecny 0ae1b9fea6 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 
Conflicts:
	airtime_mvc/application/common/Database.php
 2012-09-05 17:45:13 -04:00
Martin Konecny 139950fac2 PSR fixes 2012-09-05 17:44:09 -04:00
Martin Konecny 43f5258219 CC-4348: Prepared statements - part 4 
-User.php
 2012-09-05 17:43:45 -04:00
James 3894990975 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-05 17:41:30 -04:00