Martin Konecny
|
5cb950e43f
|
Merge branch '2.3.x'
|
2013-04-08 18:55:54 -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
|
f13f6c6a70
|
Merge branch 'master' of dev.sourcefabric.org:airtime
|
2013-04-07 20:20:57 -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
|
db5d2283f4
|
Merge branch '2.3.x'
Conflicts:
python_apps/pypo/pypofetch.py
|
2013-04-05 17:33:02 -04:00 |
|
Martin Konecny
|
3d135a9f4a
|
improved logging on why files sometimes aren't removed
|
2013-04-05 17:31:55 -04:00 |
|
Martin Konecny
|
18574fd10f
|
Merge branch '2.3.x'
|
2013-04-05 15:57:54 -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
|
4595aab694
|
Merge branch '2.3.x'
|
2013-04-05 15:33:48 -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
|
08c93e10fd
|
Merge branch '2.3.x'
|
2013-04-05 13:57:32 -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
|
1a8ab6cd89
|
Merge branch '2.3.x'
|
2013-04-05 12:43:01 -04:00 |
|
Martin Konecny
|
266823b1d9
|
use sigkill immediately for unresponsive telnet
|
2013-04-05 12:42:05 -04:00 |
|
Martin Konecny
|
2b019c4615
|
Merge branch '2.3.x'
|
2013-04-05 11:28:47 -04:00 |
|
Martin Konecny
|
f8dbbe71ab
|
increase monit timeout after liquidsoap starts to 30 seconds.
|
2013-04-05 11:27:45 -04:00 |
|
Martin Konecny
|
fcbac2a044
|
Merge branch '2.3.x' into devel
|
2013-04-04 15:15:19 -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
|
61f8e64329
|
Merge branch '2.3.x' into devel
|
2013-04-03 17:59:04 -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
|
d1e72cfeea
|
Merge branch '2.3.x' into devel
|
2013-04-03 17:12:28 -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
|
e2e6a4263c
|
Merge branch '2.3.x' into devel
|
2013-04-03 16:48:19 -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
|
563f5b64d2
|
Merge branch '2.3.x' into devel
Conflicts:
debian/postinst
|
2013-04-02 12:31:48 -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 |
|
Martin Konecny
|
811abc4baf
|
don't change monit monitor state on service start/stop
|
2013-04-01 19:31:13 -04:00 |
|
Martin Konecny
|
5ac51e289d
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2013-04-01 19:15:02 -04:00 |
|
Martin Konecny
|
6ae8da98e4
|
removing logging
|
2013-04-01 19:14:55 -04: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
|
ee617c8a70
|
Merge branch '2.3.x' into devel
Conflicts:
airtime_mvc/application/controllers/UserController.php
|
2013-03-26 16:34:11 -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
|
6b57462ca1
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2013-03-26 15:02:30 -04:00 |
|
Martin Konecny
|
894887bd62
|
Merge branch '2.3.x' into devel
|
2013-03-26 15:02:17 -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 |
|