Commit graph

10737 commits

Author SHA1 Message Date
Martin Konecny
7727b72e68 Merge branch '2.3.x' into 2.3.x-saas 2013-04-05 12:42:34 -04:00
Martin Konecny
266823b1d9 use sigkill immediately for unresponsive telnet 2013-04-05 12:42:05 -04:00
Martin Konecny
a0bfbce61b Merge branch '2.3.x' into 2.3.x-saas 2013-04-05 11:28:07 -04:00
Martin Konecny
f8dbbe71ab increase monit timeout after liquidsoap starts to 30 seconds. 2013-04-05 11:27:45 -04:00
Martin Konecny
b988cda2d1 monit alerts in saas 2013-04-04 16:30:39 -04:00
Martin Konecny
a061464ffb Merge branch '2.3.x' into 2.3.x-saas 2013-04-04 15:14:04 -04:00
Martin Konecny
301115c035 CC-5039: Encoded forward slash causing lots of apache error logs
-fixed: data should have been sent as POST rather than GET
2013-04-04 15:12:52 -04:00
Martin Konecny
6c0b0f7732 Merge branch '2.3.x' into 2.3.x-saas 2013-04-03 17:58:51 -04:00
Martin Konecny
3c68a295b4 CC-5039:
Encoded forward slash causing lots of apache error logs

-fixed: data should have been sent as POST rather than GET
2013-04-03 17:57:29 -04:00
Martin Konecny
eb3fda8423 Merge branch '2.3.x' into 2.3.x-saas 2013-04-03 17:12:14 -04:00
Martin Konecny
a748b05125 CC-5040:
All API actions need to have consistent return value

-temp fix. Correct fix will require ensuring api_client always sends
XmlHttpRequest
2013-04-03 17:11:36 -04:00
Martin Konecny
5dd54783c0 Merge branch '2.3.x' into 2.3.x-saas 2013-04-03 16:48:37 -04:00
Martin Konecny
ec7c898f5a fix some problems with invalid Liquidsoap PID file 2013-04-03 16:47:46 -04:00
Daniel James
d2455fa9c3 Updated translation credits 2013-04-03 10:51:08 +01:00
Daniel James
49929495f7 Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x 2013-04-02 17:38:20 +01:00
Daniel James
08a4802300 Updated credits file 2013-04-02 17:37:54 +01:00
Martin Konecny
2d2aa8eb46 Merge branch '2.3.x' into 2.3.x-saas 2013-04-02 12:31:03 -04:00
Martin Konecny
142ce9c3d2 Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x 2013-04-02 12:30:37 -04:00
Martin Konecny
0bb7fa4975 don't change monit monitor state on service start/stop 2013-04-02 12:30:15 -04:00
Daniel James
ffe11465ec Added translators to credits file 2013-04-02 17:26:49 +01:00
Daniel James
860524a873 Added locales for English localizations 2013-04-02 17:19:48 +01:00
Daniel James
ebbb9f1b9c Added Austrian German localization, thanks Hoerich! 2013-04-02 17:06:16 +01:00
Daniel James
7f729cb038 Explicit dependency on libc-bin and locales packages so we can check or set UTF-8 locale 2013-04-02 10:31:58 +01:00
Daniel James
254dbafd1b Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x 2013-03-27 12:34:14 +00:00
Daniel James
3323029507 Prompt user to run airtime-install script with -d option for custom Apache setups 2013-03-27 12:33:47 +00:00
Martin Konecny
863c2c11cc Merge branch '2.3.x' into 2.3.x-saas 2013-03-26 16:34:28 -04:00
Martin Konecny
d9646994e9 remove airtime-demo specific code 2013-03-26 16:33:14 -04:00
Martin Konecny
5dc0a4477b disable deletion of users 2013-03-26 16:10:42 -04:00
Martin Konecny
01cca88c58 Merge branch '2.3.x' into 2.3.x-saas 2013-03-26 15:02:43 -04:00
Martin Konecny
caa2413fd8 Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x 2013-03-26 15:02:08 -04:00
Martin Konecny
7237d48ef6 fix missing import 2013-03-26 15:01:53 -04:00
Martin Konecny
d79bfaaef9 -fix infinite loop on invalid files 2013-03-26 15:01:44 -04:00
Martin Konecny
265ac49f2e remove duplicate cc_config 2013-03-24 23:11:55 -04:00
Martin Konecny
38f8a0d231 more robust handling if system permissions go wrong 2013-03-24 22:58:13 -04:00
Martin Konecny
89983bd4f8 remove unnecessary file delete 2013-03-24 22:25:38 -04:00
Martin Konecny
00475275e5 Merge branch '2.3.x' into 2.3.x-saas 2013-03-22 14:24:12 -04:00
Martin Konecny
fc6742869f better frozen liquidsoap handling 2013-03-22 14:23:42 -04:00
Martin Konecny
19753429dc add wait timer before liquidsoap is shutdown 2013-03-22 14:04:50 -04:00
Martin Konecny
ffe06ea2a0 Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x 2013-03-19 15:23:02 -04:00
Martin Konecny
708d36ba9c syntax error 2013-03-19 15:22:27 -04:00
Daniel James
abb2d9d93f Don't run the airtime-install script if Apache has not been configured [#CC-5020] 2013-03-19 17:40:42 +00:00
Martin Konecny
65b4d4ee57 2.3.1 release prep 2013-03-19 12:57:09 -04:00
Martin Konecny
5bc49341a1 CC-5023: Miss base_dir in GetServerType() will cause Web Server Type is "A"
-fixed
2013-03-12 17:01:31 -04:00
Martin Konecny
c563aaf608 CC-5023:
Miss base_dir in GetServerType() will cause Web Server Type is "A"

-fixed
2013-03-12 17:00:52 -04:00
Martin Konecny
13b3eec0ad Merge branch '2.3.x' into 2.3.x-saas 2013-03-12 16:38:16 -04:00
Martin Konecny
661a407f72 CC-5016: Allow user control for webstream metadata format
-fixed
2013-03-08 16:45:19 -05:00
Martin Konecny
fe96b66fd7 CC-5016:
Allow user control for webstream metadata format

-fixed
2013-03-08 16:00:16 -05:00
Martin Konecny
0075b27947 CC-5015: Allow for cue_out points to be Null in DB
-prep for 2.4
2013-03-08 14:57:20 -05:00
Martin Konecny
30970598fe minor fixes
-don't show print subprocess commands to py-interpreter.log
2013-03-08 12:39:29 -05:00
Martin Konecny
3969e38d51 Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x 2013-03-07 18:34:10 -05:00