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 |
Martin Konecny
|
b6b4e25a37
|
allow Airtime environment to be accessed from CLI
-fixed
|
2012-09-05 17:34:12 -04:00 |
Martin Konecny
|
dad1cf32c9
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-05 17:29:55 -04:00 |
Martin Konecny
|
7cbfb5d40d
|
allow Airtime environment to be accessed from CLI
|
2012-09-05 17:29:34 -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
|
d9baddeba0
|
CC-4349: Encoded search in library should be labelled 'Encoded by'
-fixed
|
2012-09-05 16:38:55 -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 |
Rudi Grinberg
|
7ad4d8cdd6
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-05 16:09:39 -04:00 |
Rudi Grinberg
|
8a5333fa7f
|
Removed supported for files that mutagen cannot read
|
2012-09-05 16:09:29 -04:00 |
denise
|
8ec9ccedf3
|
CC-4358: Calendar: Show Content: Undefined Index
-fixed
|
2012-09-05 16:07:40 -04:00 |
Martin Konecny
|
dc9a181f7e
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-05 16:06:23 -04:00 |
Martin Konecny
|
bc5cc9ff48
|
remove cartesian cross-product on some SQL queries
|
2012-09-05 16:06:10 -04:00 |
Rudi Grinberg
|
0798d67b2d
|
cc-4350: Possible fix.
|
2012-09-05 16:04:59 -04:00 |
Rudi Grinberg
|
272840eb5a
|
Added logging for liquidsoap run command.
|
2012-09-05 16:04:28 -04:00 |
Rudi Grinberg
|
4fdf3c1b77
|
MM2: Removed assertion in favor of warning.
|
2012-09-05 16:04:11 -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 |
Martin Konecny
|
86a5caeb4c
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-05 15:59:15 -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 |
Martin Konecny
|
83d79907f0
|
CC-4356: Improved method of detecting RabbitMQ PID
-fixed
|
2012-09-05 15:51:38 -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 |
Rudi Grinberg
|
0538023e39
|
MM2: Removed python 2.7 style dictionary comprehnsions for backward compatibility
|
2012-09-05 15:27: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
|
545c7563db
|
update release script
-we aren't using Liquidsoap git submodule anymore
|
2012-09-05 15:16:23 -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 |