Commit Graph

10842 Commits

Author SHA1 Message Date
Martin Konecny 9a78c3f8e5 Merge branch '2.3.x' 2013-04-11 15:13:39 -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 d46fef8eda SAAS-301: Calendar content indicator did not update automatically after adding content to a show
-fixed
2013-04-11 15:11:20 -04:00
Martin Konecny 3714f83757 Merge branch '2.3.x' 2013-04-11 15:06:21 -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 0da0e798c6 make password input width same as text input width. Also make everything a little wider. 2013-04-10 18:19:46 -04:00
denise 9b2fb3bece CC-4961: Show linking 2013-04-09 15:55:18 -04:00
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
denise e64f6fb3fd CC-4961: Show linking
-modified db
2013-04-08 14:43:27 -04:00
denise 76bfce21b1 CC-4961: Show linking
-modified db
2013-04-08 14:42:37 -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
denise cfee74693b CC-4961: Show linking
moved move-show to calendar service
2013-04-05 17:44:30 -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
denise 62d1b22fcc CC-4961: Show linking
created new cc_show_stamp table
2013-04-05 12:27:54 -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
denise f9d7167638 CC-4961: Show linking 2013-04-04 16:30:33 -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
denise b40306cb1b Add comment to schema.xml to indicate what the broadcasted column is of cc_schedule 2013-04-03 16:21:30 -04:00
denise 81dbb17922 CC-4961: Show linking
-moved show deletion into show service
2013-04-03 11:46:46 -04:00
Martin Konecny bfb252edf5 CC-4417: Opus codec support 2013-04-03 11:40:57 -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