Commit Graph

10746 Commits

Author SHA1 Message Date
denise 7238790c41 Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x 2013-01-30 11:51:35 -05:00
denise 595429e6e5 CC-4897: XSS exploit on library page
-fixed
2013-01-30 11:51:27 -05:00
Martin Konecny e459f739f2 indentation error fix 2013-01-30 11:29:28 -05:00
Martin Konecny 2a0cc9e45f fix indentation 2013-01-30 11:23:20 -05:00
denise d4742577c9 Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x 2013-01-30 10:20:27 -05:00
Martin Konecny b15c4569eb CC-4894: Need to filter output for potential XSS exploits
-fixed few areas
2013-01-29 15:17:29 -05:00
Martin Konecny 9d4e0d2dd1 Merge branch 'martin' into 2.3.x 2013-01-29 12:17:36 -05:00
Martin Konecny 28c01760dd be more gentle to Liquidsoap when sending lots of commands 2013-01-29 12:17:05 -05:00
drigato db4e6bb94a CC-4889: API client URL request is not wrapping in try/catch
-fixed
2013-01-29 10:29:29 -05:00
Martin Konecny 9d8a9faca8 make code formatting easier on eyes 2013-01-28 17:00:35 -05:00
Martin Konecny d7358338f0 improved logging in pypo fetch 2013-01-28 17:00:16 -05:00
denise 5f3f2cd97c CC-4881: Cue in time can be greater than Cue out time in some situations
-fixed
2013-01-28 16:46:11 -05:00
denise f1215c10fd CC-4882: Scheduled item does not take into account cue_out - cue_in time
-fixed
2013-01-28 14:21:11 -05:00
Martin Konecny b389e44001 take liquidsoap by the horns if it misbehaves. 2013-01-27 15:00:56 -05:00
Martin Konecny c93b90cc54 prepare for improvements to way pypo communicates with LS 2013-01-26 20:05:31 -05:00
Martin Konecny d47469be25 read num bytes used from file instead of calculating manually 2013-01-25 16:36:57 -05:00
Martin Konecny 3d103aed0f fix merge conflict 2013-01-25 16:24:45 -05:00
Martin Konecny 2ef8604c31 remove unnecessary code 2013-01-25 16:23:12 -05:00
Martin Konecny c6493f9d74 remove unecessary saas code 2013-01-25 16:22:08 -05:00
Martin Konecny ea9e97d834 Merge branch '2.3.x' into 2.3.x-saas 2013-01-25 15:15:07 -05:00
Martin Konecny 807aa6b4a6 fix restart liquidsoap being sent as default no arguments for pypo-notify 2013-01-25 15:14:40 -05:00
Martin Konecny 22aafda2a8 Merge branch '2.3.x' into 2.3.x-saas 2013-01-25 14:17:23 -05:00
Martin Konecny f02e0b6cab Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x 2013-01-25 14:17:07 -05:00
Martin Konecny 8dd7ffee8c locks should occur inside try/catch 2013-01-25 14:16:53 -05:00
denise d0a4141ae4 Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x 2013-01-25 12:44:37 -05:00
denise a6f4805e1a CC-4879: Pop-up HTML Audio Player still seems to be changing spaces to %20 and so on...
-fixed
2013-01-25 12:44:20 -05:00
Martin Konecny 20d8bf3bc7 Merge branch '2.3.x' into 2.3.x-saas 2013-01-25 12:33:50 -05:00
Martin Konecny a16e8d05aa -don't push new schedule until end of request 2013-01-25 12:33:27 -05:00
Martin Konecny 9d6f2ebdf4 remove unecessary code 2013-01-25 12:32:37 -05:00
Martin Konecny 5b04b2d82a Merge branch '2.3.x-saas' of dev.sourcefabric.org:airtime into 2.3.x-saas 2013-01-25 12:12:35 -05:00
Martin Konecny 7c327e4c75 Merge branch '2.3.x' into 2.3.x-saas 2013-01-25 12:12:21 -05:00
Martin Konecny c0e3e12e9d Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x 2013-01-25 12:12:02 -05:00
Martin Konecny 21a04803e5 Fix Pypo giving up too early on attempting to receive schedule 2013-01-25 12:11:50 -05:00
denise c14d1fcfac Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x 2013-01-25 11:52:22 -05:00
denise 0cf8526f87 CC-4878"Send support feedback" button at initial login tries to load "http://showbuilder" and was missing the local host IP.
-fixed
2013-01-25 11:51:56 -05:00
denise 4d74e6036f Merge branch '2.3.x-saas' of dev.sourcefabric.org:airtime into 2.3.x-saas 2013-01-25 11:38:30 -05:00
denise 7bea2df8bd Live chat was in audio preview and listen popup windows 2013-01-25 11:38:15 -05:00
Martin Konecny a14d99d87b Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x 2013-01-25 11:31:05 -05:00
Martin Konecny d5894279c4 Merge branch '2.3.x' into 2.3.x-saas 2013-01-25 11:30:46 -05:00
Martin Konecny 7b3850fac6 false not being returned on connection error 2013-01-25 11:30:36 -05:00
denise 1873022a13 CC-4876: Default interface language setting does not appear to affect text or drop-down menu on login page?
-fixed
2013-01-25 11:21:34 -05:00
Martin Konecny 78dac3ea9a Merge branch '2.3.x-saas' of dev.sourcefabric.org:airtime into 2.3.x-saas 2013-01-24 17:49:25 -05:00
Martin Konecny 6f5ffdc1e7 Merge branch '2.3.x' into 2.3.x-saas 2013-01-24 17:49:08 -05:00
Martin Konecny 56c61d4ab7 CC-4873: Airtime takes 7 seconds to load 32K (very small) from db
-minor cleanup of function init
2013-01-24 14:09:14 -05:00
Martin Konecny c3f2bf57de CC-4873: Airtime takes 7 seconds to load 32K (very small) from db
-further optimization by looking at the preferred time scale
2013-01-24 14:02:50 -05:00
Martin Konecny 2f3a30b580 CC-4873: Airtime takes 7 seconds to load 32K (very small) from db
-we know what month will be the initial view for the user.
-Provide this data ahead of time via ajax request
2013-01-24 12:52:24 -05:00
Martin Konecny ef806b8357 Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x 2013-01-24 12:14:12 -05:00
Martin Konecny 091f5ff49f CC-4873: Airtime takes 7 seconds to load 32K (very small) from db
-we know what month will be the initial view for the user.
-Provide this data ahead of time.
2013-01-24 12:13:55 -05:00
denise f4f6f9043a Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x 2013-01-24 12:00:47 -05:00
denise 1e336fa2d7 CC-4875: use a reference when iterating over show events 2013-01-24 12:00:31 -05:00