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
|
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 |
|
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 |