Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,828 Commits 3 Branches 0 Tags 405 MiB
Commit Graph

1221 Commits

Author SHA1 Message Date
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 45729f16e7 cc-4347: PDOOOOOOOOOOOOOOOO 2012-09-06 14:14:05 -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
denise 6cb8dd35e2 - fixed sql error 2012-09-06 12:23:53 -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
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 b112a0fe2b cc-4347: PDOOOOOOOOOOOOO 2012-09-05 17:59:18 -04:00
Rudi Grinberg 8be51d5bf4 sexified code 2012-09-05 17:52:27 -04:00
Rudi Grinberg aa6e061118 conflicts merged 2012-09-05 17:51:16 -04:00
Rudi Grinberg 0385c008ce cc-4347: PDO00!!! 2012-09-05 17:46:48 -04:00
Martin Konecny 43f5258219 CC-4348: Prepared statements - part 4 
-User.php
 2012-09-05 17:43:45 -04:00
Rudi Grinberg 8f33523095 cc-4347: PDO 2012-09-05 17:35:08 -04:00
Rudi Grinberg 0838e31094 cc-4347: PDO 2012-09-05 16:57:01 -04:00
denise 91c74d8995 -fixed syntax error 2012-09-05 16:21:59 -04:00
denise 87e58282de Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-05 16:14:23 -04:00
denise 8ec9ccedf3 CC-4358: Calendar: Show Content: Undefined Index 
-fixed
 2012-09-05 16:07:40 -04:00
Martin Konecny bc5cc9ff48 remove cartesian cross-product on some SQL queries 2012-09-05 16:06:10 -04:00
Martin Konecny 27bd22f10c CC-4348: Prepared statements - part 4 
-Syntax error
 2012-09-05 16:02:23 -04:00
Martin Konecny 87ef317b6f Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-05 15:16:34 -04:00
Martin Konecny f036c84a64 CC-4348: Prepared statements - part 4 
-StreamSetting.php
 2012-09-05 15:15:56 -04:00
denise cf0fc13c81 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-05 14:50:34 -04:00
denise 7543a33aa1 CC-4345: Prepared statements - part 1 
-fixed for Datatables.php
 2012-09-05 14:50:26 -04:00
Rudi Grinberg ab6ae1ce8e cc-4336: Fixed the issue. But this whole chunk of code could probably be removed. 2012-09-05 14:33:49 -04:00
Rudi Grinberg 1590bf4fa0 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-05 10:17:04 -04:00
Martin Konecny e636d371b0 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-04 17:22:32 -04:00
Martin Konecny ac547342f1 Logging typo 2012-09-04 17:22:21 -04:00
Martin Konecny 982dd1e2a7 CC-4348: Prepared statements - part 4 
-StoredFile.php
 2012-09-04 17:21:59 -04:00
denise 63bd2f6381 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-04 16:59:40 -04:00
denise 5bb1f4720e CC-4345: Prepared statements - part 1 
-Block.php done
 2012-09-04 16:59:33 -04:00
Rudi Grinberg cae2245936 MM2: Cleaned up pure.py a little 2012-09-04 16:52:22 -04:00
Martin Konecny 4b09d5eff2 CC-4199: Webstream: Please show warning when the URL is too long 
-upped max webstream length to 512
-show warning if > 512 characters
 2012-09-04 16:18:18 -04:00
Martin Konecny f698b70341 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-04 16:00:26 -04:00
Martin Konecny 9701614087 CC-4342: Enabling hardware audio output kills all stream output 
-fixed
 2012-09-04 16:00:12 -04:00
Rudi Grinberg 4f4b08c0af major sexification 2012-09-04 15:38:48 -04:00
Rudi Grinberg f660e1da9f removed useless code 2012-09-04 15:31:09 -04:00
Rudi Grinberg 1d758db42b Sexified some code. PDO'd the shit out of some sql query. 2012-09-04 15:26:12 -04:00
Rudi Grinberg 398215f1d0 Corrected documentation for method. 2012-09-04 15:25:18 -04:00
Rudi Grinberg 8c02b3ec8a removed redundancy 2012-09-04 15:14:56 -04:00
Rudi Grinberg fa5939a72f Added todo to later clean code. 2012-09-04 15:14:26 -04:00
Rudi Grinberg 867fa559a0 Sexified code 2012-09-04 15:10:04 -04:00
Rudi Grinberg c974d3df0c fixored 2012-09-04 15:08:51 -04:00