Commit Graph

3880 Commits

Author SHA1 Message Date
Martin Konecny 2a36ecbebf simplification of saas only code 2013-01-31 16:34:10 -05:00
Martin Konecny 0a198ae424 Merge branch '2.3.x' into 2.3.x-saas
Conflicts:
	airtime_mvc/application/models/User.php
2013-01-30 18:31:45 -05:00
Martin Konecny 216b580395 Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x 2013-01-30 14:40:47 -05:00
Martin Konecny 52d96241da CC-4754: Replay gain modifier
-fix regression
2013-01-30 14:40:29 -05:00
Martin Konecny cc5acf3c9e improved logging for boolean vars 2013-01-30 14:34:06 -05:00
denise 595429e6e5 CC-4897: XSS exploit on library page
-fixed
2013-01-30 11:51:27 -05:00
denise d4742577c9 Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x 2013-01-30 10:20:27 -05:00
Martin Konecny b15c4569eb CC-4894: Need to filter output for potential XSS exploits
-fixed few areas
2013-01-29 15:17:29 -05:00
denise 5f3f2cd97c CC-4881: Cue in time can be greater than Cue out time in some situations
-fixed
2013-01-28 16:46:11 -05:00
denise f1215c10fd CC-4882: Scheduled item does not take into account cue_out - cue_in time
-fixed
2013-01-28 14:21:11 -05:00
Martin Konecny d47469be25 read num bytes used from file instead of calculating manually 2013-01-25 16:36:57 -05:00
Martin Konecny 2ef8604c31 remove unnecessary code 2013-01-25 16:23:12 -05:00
Martin Konecny c6493f9d74 remove unecessary saas code 2013-01-25 16:22:08 -05:00
Martin Konecny 22aafda2a8 Merge branch '2.3.x' into 2.3.x-saas 2013-01-25 14:17:23 -05:00
denise d0a4141ae4 Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x 2013-01-25 12:44:37 -05:00
denise a6f4805e1a CC-4879: Pop-up HTML Audio Player still seems to be changing spaces to %20 and so on...
-fixed
2013-01-25 12:44:20 -05:00
Martin Konecny 20d8bf3bc7 Merge branch '2.3.x' into 2.3.x-saas 2013-01-25 12:33:50 -05:00
Martin Konecny a16e8d05aa -don't push new schedule until end of request 2013-01-25 12:33:27 -05:00
Martin Konecny 9d6f2ebdf4 remove unecessary code 2013-01-25 12:32:37 -05:00
Martin Konecny 5b04b2d82a Merge branch '2.3.x-saas' of dev.sourcefabric.org:airtime into 2.3.x-saas 2013-01-25 12:12:35 -05:00
Martin Konecny 7c327e4c75 Merge branch '2.3.x' into 2.3.x-saas 2013-01-25 12:12:21 -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 7bea2df8bd Live chat was in audio preview and listen popup windows 2013-01-25 11:38:15 -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 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 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 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 77b0c21192 Small refactor 2013-01-22 10:39:20 -05:00
drigato ac6c279bef Removed extra '/' is audio preview url 2013-01-21 20:20:29 -05:00
drigato c13188d0e1 Added Czech and Brazilian Portuguese language options 2013-01-21 14:56:27 -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
denise b818f1d46e CC-4866: Library -> Edit metadata -> table does not redraw after
-fixed
2013-01-18 16:40:31 -05:00
denise c4b1346f4e CC-4865: Password reset -> Cancel -> url is missing base directory
-fixed
2013-01-18 15:54:56 -05:00