Commit graph

10762 commits

Author SHA1 Message Date
Martin Konecny
b82f4f0fa9 Merge branch '2.3.x' into 2.3.x-saas 2013-04-11 15:13:08 -04:00
Martin Konecny
984828ef36 SAAS-301: Calendar content indicator did not update automatically after adding content to a show
-fixed
2013-04-11 15:13:02 -04:00
Martin Konecny
a65be248bd Merge branch '2.3.x' into 2.3.x-saas 2013-04-11 15:05:08 -04:00
Martin Konecny
5cd6dd907b Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x 2013-04-11 15:04:29 -04:00
Martin Konecny
3000f543d8 SAAS-301:
Calendar content indicator did not update automatically after adding content to a show

-fixed
2013-04-11 15:04:16 -04:00
Daniel James
a7cdaa9629 Updated translation files against current strings 2013-04-11 18:20:25 +01:00
Daniel James
1bb5f171a8 Updated Canadian localization, eh? :-) 2013-04-11 17:05:33 +01:00
Daniel James
de6ccd9c72 Updated US English localization 2013-04-11 17:02:53 +01:00
Martin Konecny
fc80d54b9d Merge branch '2.3.x-saas' of dev.sourcefabric.org:airtime into 2.3.x-saas 2013-04-08 18:56:17 -04:00
Martin Konecny
10fb9c9165 Merge branch '2.3.x' into 2.3.x-saas 2013-04-08 18:56:12 -04:00
Martin Konecny
5b4bc038b0 Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x 2013-04-08 18:53:49 -04:00
Martin Konecny
aca651a1b4 better logging 2013-04-08 18:53:35 -04:00
Martin Konecny
ddc44412e2 Merge branch '2.3.x' into 2.3.x-saas 2013-04-07 20:22:23 -04:00
Martin Konecny
6705669549 code cleanup 2013-04-07 20:20:21 -04:00
Martin Konecny
67cdfd4b09 when doing reinstall, make sure monit isn't restarting services 2013-04-07 20:20:14 -04:00
Martin Konecny
0d45d7b8cd CC-5042:
Do process matching by process name instead of PID file

-fixed
2013-04-07 20:19:51 -04:00
Martin Konecny
67e3803189 Merge branch '2.3.x' into 2.3.x-saas 2013-04-05 17:33:19 -04:00
Martin Konecny
3d135a9f4a improved logging on why files sometimes aren't removed 2013-04-05 17:31:55 -04:00
Martin Konecny
5b1383d48d Merge branch '2.3.x' into 2.3.x-saas 2013-04-05 15:57:41 -04:00
Martin Konecny
5ff7ce857f use sigkill immediately for unresponsive telnet
-fix order of arguments
2013-04-05 15:57:16 -04:00
Martin Konecny
92d0a6178e Merge branch '2.3.x' into 2.3.x-saas 2013-04-05 15:34:04 -04:00
Martin Konecny
d1f655d79d CC-5038: Silan error: list index out of range
-fixed
2013-04-05 15:32:44 -04:00
Martin Konecny
afb55c7b51 CC-5038:
Silan error: list index out of range

cosmetic bug fix to prevent so much logging
2013-04-05 14:20:34 -04:00
Martin Konecny
1a389a3765 Merge branch '2.3.x' into 2.3.x-saas 2013-04-05 13:57:46 -04:00
Martin Konecny
cdb53048c7 ensure that an empty listener stats dict is not sent to the server 2013-04-05 13:56:41 -04:00
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