Commit graph

3974 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
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
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
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
2d2aa8eb46 Merge branch '2.3.x' into 2.3.x-saas 2013-04-02 12:31:03 -04: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
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
265ac49f2e remove duplicate cc_config 2013-03-24 23:11:55 -04:00
Martin Konecny
43ffa2aece Merge branch '2.3.x' into 2.3.x-saas
Conflicts:
	airtime_mvc/application/controllers/SystemstatusController.php
2013-03-06 13:47:21 -05:00
Martin Konecny
7ca178295f CC-4993: airtime-check-system reports airtime-liquidsoap as down
-fixed
2013-03-06 13:43:22 -05:00
Martin Konecny
0ef1a5ffda CC-4976: Cannot select Ogg/Vorbis output stream after selecting SHOUTcast then selecting Icecast
-fixed
2013-03-05 18:19:08 -05:00
Martin Konecny
1c80701488 Merge branch '2.3.x' into 2.3.x-saas 2013-03-05 16:21:47 -05:00
Martin Konecny
d7d1170ee1 CC-5003:
Some tracks are being cut off before fully playout out

-fixed
2013-03-04 18:52:51 -05:00
Martin Konecny
00d577fd5b CC-4985: Ensure files deleted via the UI are deleted from stor directory.
-temporary fix. We know rabbitmq received the message, but we don't know
if media-monitor actually acted on it.
2013-03-04 15:22:09 -05:00
Martin Konecny
3f7ccf6967 fix missing closing parentheses 2013-03-04 11:41:42 -05:00
Martin Konecny
b744ab74ee Merge branch '2.3.x' into 2.3.x-saas 2013-03-01 18:22:12 -05:00
Martin Konecny
ae503121d8 CC-4984: Exception for replaygain
-fixed
2013-02-28 18:26:15 -05:00
Martin Konecny
e08732fba7 CC-4975: airtime-silan cmd error
-fixed
2013-02-25 19:45:26 -05:00
Martin Konecny
8bec9dea55 Merge branch '2.3.x' into 2.3.x-saas 2013-02-20 14:41:55 -05:00
Naomi
9a2b8af7b1 Revert "CC-4955: Datatables saves its parameters twice on every page load"
This reverts commit 39ec07e71c.
2013-02-15 16:50:43 -05:00
Naomi
f2773fcb01 Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x 2013-02-15 16:32:43 -05:00
Naomi
fe611e7c6a CC-4957 : Replay Gain undefined error, json response not being sent back properly. 2013-02-15 16:32:05 -05:00
Martin Konecny
09baf3a47d remove unecessary file + better error handling 2013-02-15 14:19:04 -05:00
Martin Konecny
39ec07e71c CC-4955: Datatables saves its parameters twice on every page load
-fixed
2013-02-15 14:18:32 -05:00
Martin Konecny
4f3ea3f406 Update ColReorder Datatables plugin 2013-02-14 17:48:32 -05:00
Martin Konecny
b30f67b24b CC-4950: builder-feed is called twice on NowPlaying screen load 2013-02-14 15:49:38 -05:00
Martin Konecny
58740d6b41 Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x 2013-02-14 13:33:27 -05:00
Martin Konecny
b3ab84db2e add minified datatables.js and upgrade from 1.9.1 to 1.9.4 2013-02-14 13:33:18 -05:00
denise
9e0d14a8a7 Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x 2013-02-14 13:31:39 -05:00
denise
1b5b7ae1f7 Stopped refetching calendar events when calendar is resized 2013-02-14 13:31:22 -05:00
Martin Konecny
9086c55281 Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x 2013-02-14 12:58:40 -05:00
Martin Konecny
bb7e56e39e CC-4943: Raspberry Pi optimization: don't create new background AJAX request until the previous one has returned
-fixed
2013-02-14 12:58:31 -05:00
Daniel James
06dbcfbcf8 Shorten Greek translation of 'Scheduled Play' (CC-4947) 2013-02-14 17:18:45 +00:00
denise
30c47df93d Audio preview wasn't working in Firefox when airtime is not in document root 2013-02-11 15:56:21 -05:00
denise
2c1fa283da CC-4941: Dynamic Smart Block ignores the silan check
-fixed for playlists that contain dynamic blocks
2013-02-11 14:17:18 -05:00
denise
51ade73e85 CC-4941: Dynamic Smart Block ignores the silan check
-fixed
2013-02-11 13:45:51 -05:00