Commit Graph

8773 Commits

Author SHA1 Message Date
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
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 5412fd8bcf Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-05 14:12:20 -04:00
Martin Konecny 6955708723 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-05 12:42:52 -04:00
Martin Konecny c09c3ff151 CC-4356: Improved method of detecting RabbitMQ PID
-fixed
2012-09-05 12:42:40 -04:00
Rudi Grinberg 131fd2cce4 sexification of docstring 2012-09-05 11:56:31 -04:00
Rudi Grinberg 71d4462272 MM2: removed redundant kbps in filename 2012-09-05 11:15:31 -04:00
Rudi Grinberg 7d010e1e28 cc-4241: Changed date to time in filename for recorded shows 2012-09-05 11:06:33 -04:00
Rudi Grinberg f4848a8306 cc-4241: Tweaked metadata handling again 2012-09-05 10:59:56 -04:00
Rudi Grinberg d12833a71e Pypo debugging 2012-09-05 10:36:32 -04:00
Rudi Grinberg 6c52a229b9 mm2: added back metadata handling. Added new "Enterprise Metadata
Framework"
2012-09-05 10:32:37 -04:00
Rudi Grinberg ab9fbc48ae MM2: Added docstrings 2012-09-05 10:24:10 -04:00
Rudi Grinberg 5c9d0b7db5 mm2: changed metadata handling 2012-09-05 10:20:10 -04:00
Rudi Grinberg 1590bf4fa0 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-05 10:17:04 -04:00
Rudi Grinberg ed368b82c0 Removed unnecessary songs from media monitor. 2012-09-04 17:25:13 -04:00
Rudi Grinberg b08874ad97 Changed pypo recordeder to output title metadata with media monitor compatible output. To avoid extra parsing. 2012-09-04 17:24:29 -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 122bfc6e97 CC-4070: Built-in help text is wrongly worded about adding files
-fixed
2012-09-04 16:25:05 -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