Commit graph

272 commits

Author SHA1 Message Date
Rudi Grinberg
23ccd75290 cc-4347: PDO getRbroadcastsRelative() 2012-09-07 12:10:07 -04:00
Rudi Grinberg
cfe0d7aa0c Unrelated refactorings of Show.php. Added TODO for more later work. 2012-09-07 12:07:29 -04:00
Rudi Grinberg
2a00e58610 cc-4347: PDO like a boss. 2012-09-07 11:58:57 -04:00
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
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
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
1852843f96 cc-4347: ~~~~PDO~~~~~~ 2012-09-06 15:55:29 -04:00
Rudi Grinberg
0fdf1e5e86 cc-4347: PDO 2012-09-06 15:47:07 -04:00
Rudi Grinberg
3f1d979c67 cc-4347: PDO PDO PDO!! 2012-09-06 14:41:40 -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
denise
91c74d8995 -fixed syntax error 2012-09-05 16:21:59 -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
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
Rudi Grinberg
0819419b3b fixed typo 2012-09-04 15:03:49 -04:00
Rudi Grinberg
1fcd20fea3 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-04 14:55:28 -04:00
Rudi Grinberg
89dcc18724 general cleanups 2012-09-04 14:55:23 -04:00
Martin Konecny
18dd0f232a Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-04 14:54:44 -04:00
Martin Konecny
0bdfe3986c CC-4348: Prepared statements - part 4
-fixed some incorrect usage of PDO.
2012-09-04 14:54:34 -04:00
Rudi Grinberg
ed7d233ca2 Changed execute( array(...) ) to multiple bindParam calls. 2012-09-04 14:45:16 -04:00
Rudi Grinberg
c840de0a71 Fix to the fix 2012-09-04 14:05:26 -04:00
Rudi Grinberg
330828fbdd Refactored sql substition into pdo 2012-09-04 13:52:33 -04:00
Rudi Grinberg
27ea00f5d4 Refactored sql substition into pdo 2012-09-04 13:50:13 -04:00
Martin Konecny
a731fc147b CC-4348: Prepared statements - part 4
-fixed Show.php
2012-09-04 13:34:05 -04:00
Martin Konecny
4848717d4d CC-4090: Make code style PSR compliant - part 4
-models dir
2012-08-29 10:58:03 -04:00
denise
5443c1931a CC-4081: Calendar -> Can create overlapping show by dragging a show in "day" view
-fixed
2012-08-24 15:27:04 -04:00
Martin Konecny
462542bf68 change Logging::log to Logging::info 2012-08-21 18:41:56 -04:00
Rudi Grinberg
64a36ea21a cc-4240: fixed 2012-08-21 16:33:37 -04:00
James
8b13af2e04 fix bug on widget 2012-08-10 12:14:15 -04:00
Martin Konecny
f33485f8ea Merge branch '2.1.x' into devel 2012-08-08 00:09:13 -04:00
denise
550c97a2dc CC-4154L: Indicate whether a show has scheduled content on the calendar page
-done
2012-08-07 14:57:04 -04:00
Martin Konecny
e20289e5cf Merge branch '2.1.x' into devel 2012-08-06 17:17:05 -04:00
Martin Konecny
975abbaf10 Remove unecessary information being sent from API 2012-08-06 17:16:43 -04:00
Martin Konecny
48a1bf3f02 Merge branch '2.1.x' into devel
Conflicts:
	airtime_mvc/application/controllers/ApiController.php
	airtime_mvc/application/models/Schedule.php
	airtime_mvc/application/models/Show.php
2012-08-06 17:10:46 -04:00
Martin Konecny
40023d9086 CC-4152: Widget does not display current show in some modes
-fixed
2012-08-06 17:07:18 -04:00