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 |
|
Rudi Grinberg
|
23ee726cfd
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-05 17:41:21 -04:00 |
|
James
|
4af9bfaa9d
|
CC-4346: Prepared statements - part 2
- fix spelling
|
2012-09-05 17:41:18 -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 |
|
Rudi Grinberg
|
c1bc50c1db
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-05 16:56:14 -04:00 |
|
Rudi Grinberg
|
80fa090f13
|
Uncommented old line of code perhaps it's useful
|
2012-09-05 16:39:58 -04:00 |
|
denise
|
91c74d8995
|
-fixed syntax error
|
2012-09-05 16:21:59 -04:00 |
|
denise
|
24024a0a60
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-05 16:15:11 -04:00 |
|
James
|
326ba012c1
|
CC-4346: Prepared statements - part 2
- CRLF
- adding include in bootstrap
|
2012-09-05 16:15:02 -04:00 |
|
denise
|
87e58282de
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-05 16:14:23 -04:00 |
|
James
|
15b9d09991
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-05 16:12:44 -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 |
|
James
|
0a70b7d6f1
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-05 15:59:28 -04:00 |
|
James
|
4ac2d6ac4e
|
CC-4346: Prepared statements - part 2
- adding common function to prepare param to PDO statement and excute.
|
2012-09-05 15:59:15 -04:00 |
|
Rudi Grinberg
|
f86fa8f945
|
gotten rid of annoying logging
|
2012-09-05 15:38:43 -04:00 |
|
Rudi Grinberg
|
a61d856be9
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-05 15:27:36 -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 |
|
Rudi Grinberg
|
579180301a
|
Removed stat caching to make sure is_file is accurate
|
2012-09-05 15:05:50 -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 |
|