Commit graph

12967 commits

Author SHA1 Message Date
Martin Konecny
c0e3e12e9d Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x 2013-01-25 12:12:02 -05:00
Martin Konecny
21a04803e5 Fix Pypo giving up too early on attempting to receive schedule 2013-01-25 12:11:50 -05:00
denise
c14d1fcfac Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x 2013-01-25 11:52:22 -05:00
denise
0cf8526f87 CC-4878"Send support feedback" button at initial login tries to load "http://showbuilder" and was missing the local host IP.
-fixed
2013-01-25 11:51:56 -05:00
denise
4d74e6036f Merge branch '2.3.x-saas' of dev.sourcefabric.org:airtime into 2.3.x-saas 2013-01-25 11:38:30 -05:00
denise
7bea2df8bd Live chat was in audio preview and listen popup windows 2013-01-25 11:38:15 -05:00
Martin Konecny
a14d99d87b Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x 2013-01-25 11:31:05 -05:00
Martin Konecny
d5894279c4 Merge branch '2.3.x' into 2.3.x-saas 2013-01-25 11:30:46 -05:00
Martin Konecny
7b3850fac6 false not being returned on connection error 2013-01-25 11:30:36 -05:00
denise
1873022a13 CC-4876: Default interface language setting does not appear to affect text or drop-down menu on login page?
-fixed
2013-01-25 11:21:34 -05:00
Martin Konecny
78dac3ea9a Merge branch '2.3.x-saas' of dev.sourcefabric.org:airtime into 2.3.x-saas 2013-01-24 17:49:25 -05:00
Martin Konecny
6f5ffdc1e7 Merge branch '2.3.x' into 2.3.x-saas 2013-01-24 17:49:08 -05:00
Martin Konecny
56c61d4ab7 CC-4873: Airtime takes 7 seconds to load 32K (very small) from db
-minor cleanup of function init
2013-01-24 14:09:14 -05:00
Martin Konecny
c3f2bf57de CC-4873: Airtime takes 7 seconds to load 32K (very small) from db
-further optimization by looking at the preferred time scale
2013-01-24 14:02:50 -05:00
Martin Konecny
2f3a30b580 CC-4873: Airtime takes 7 seconds to load 32K (very small) from db
-we know what month will be the initial view for the user.
-Provide this data ahead of time via ajax request
2013-01-24 12:52:24 -05:00
Martin Konecny
ef806b8357 Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x 2013-01-24 12:14:12 -05:00
Martin Konecny
091f5ff49f CC-4873: Airtime takes 7 seconds to load 32K (very small) from db
-we know what month will be the initial view for the user.
-Provide this data ahead of time.
2013-01-24 12:13:55 -05:00
denise
f4f6f9043a Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x 2013-01-24 12:00:47 -05:00
denise
1e336fa2d7 CC-4875: use a reference when iterating over show events 2013-01-24 12:00:31 -05:00
Martin Konecny
548b73db42 CC-4873: Airtime takes 7 seconds to load 32K (very small) from db
-remove an unnecessary roundtrip to server
2013-01-23 18:31:45 -05:00
denise
78f617cacb CC-4873: Airtime takes 7 seconds to load 32K (very small) from db
- put makeFullCalendarEvent inline with loop
- removed unnecessary epoch time conversion
2013-01-23 17:33:34 -05:00
denise
7ab7236d5d Merge branch '2.3.x' into devel 2013-01-23 16:31:42 -05:00
denise
adaab6ba96 CC-4873: Airtime takes 7 seconds to load 32K (very small) from db
-added a 5 second grace period for checking if shows are partially filled
2013-01-23 16:31:20 -05:00
denise
9714b44d7f CC-4873: Airtime takes 7 seconds to load 32K (very small) from db 2013-01-23 16:27:26 -05:00
denise
2069da64c1 Merge branch '2.3.x' into devel 2013-01-23 16:19:00 -05:00
denise
9fd3b43bb2 CC-4873: Airtime takes 7 seconds to load 32K (very small) from db
Made improvement by accessing db just once to determine if each show instance is full or not
2013-01-23 16:12:16 -05:00
denise
1e57309e66 CC-4692: Update jquery.jplayer.min.js to version 2.2 2013-01-23 12:19:07 -05:00
Martin Konecny
fb2ccc6c46 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-22 13:03:09 -05:00
Martin Konecny
c6ee5bfe58 prepare baby mm for saas 2013-01-22 13:02:45 -05:00
Daniel James
64051179f3 Set Icecast admin password in defaultdata.sql so that stats work out of the box 2013-01-22 17:19:56 +00:00
denise
77b0c21192 Small refactor 2013-01-22 10:39:20 -05:00
Daniel James
eaafcfe269 Update snapshot script and files for 2.3.0 release 2013-01-22 12:48:44 +00:00
Daniel James
a0685c5479 We are using Liquidsoap 1.0.1 now 2013-01-22 12:39:15 +00:00
Daniel James
76e7cc87a8 Added Silan to list of third party code used by Airtime 2013-01-22 12:34:42 +00:00
drigato
ac6c279bef Removed extra '/' is audio preview url 2013-01-21 20:20:29 -05:00
Martin Konecny
5d56341757 baseUrl is set incorrectly for previewing tracks 2013-01-21 19:32:00 -05:00
Martin Konecny
acc0bf4393 CC-4871: Generating locales on Debian fails.
-fixed
2013-01-21 19:06:56 -05:00
drigato
ff7ff473be Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-21 14:56:48 -05:00
drigato
c13188d0e1 Added Czech and Brazilian Portuguese language options 2013-01-21 14:56:27 -05:00
Martin Konecny
b7009c5880 Merge branch 'devel' into 2.3.x-saas 2013-01-21 13:37:38 -05:00
Martin Konecny
b291fda79e fix syntax error in upgrade script 2013-01-21 13:37:22 -05:00
Martin Konecny
064827c4fa Merge branch 'devel' into 2.3.x-saas 2013-01-21 13:10:37 -05:00
Daniel James
f0a1c9983d First commit of Brazilian Portuguese localization, thanks to Luciano De Fazio! 2013-01-21 11:16:40 +00:00
Martin Konecny
c0ca6b381f merge conflict cleanup 2013-01-18 17:48:13 -05:00
Martin Konecny
909e290bd3 Merge branch 'devel' into 2.3.x-saas
Conflicts:
	airtime_mvc/application/controllers/PreferenceController.php
2013-01-18 17:38:48 -05:00
James
dfa392d914 CC-4868: Replay gain modifier is not setting the correct value
- fixed
2013-01-18 17:29:38 -05:00
denise
b9c7ea1184 CC-4869: Default fades greater than 99 seconds won't allow you to drag item into block/playlist
-fixed
2013-01-18 17:22:54 -05:00
Martin Konecny
210336d20a Merge branch 'devel' into 2.3.x-saas 2013-01-18 17:14:11 -05:00
denise
e0efaea0c9 CC-4867: Library -> Audio preview doesnt work with airtime in subdirectory
-fixed
2013-01-18 17:10:52 -05:00
denise
280c4a81ad CC-4859: I18N: "AND" and "OR" for Smartblock's criteria need to be translated.
-fixed
2013-01-18 17:04:39 -05:00