Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
10572 commits 3 branches 0 tags 405 MiB
Commit graph

1136 commits

Author SHA1 Message Date
Martin Konecny
c398ce930b Merge branch '2.3.x' into 2.3.x-saas 
Conflicts:
	airtime_mvc/application/controllers/PreferenceController.php
 2013-02-04 16:22:35 -05:00
Martin Konecny
e2472f1f5d CC-4913: System -> Media Folder: Exception happens when media folder's path contains '<' 2013-02-04 16:21:56 -05:00
denise
20a3f674b4 CC-4897: XSS exploit on library page 
-fixed where this was happening on Calendar - show content
 2013-02-04 12:12:57 -05:00
denise
d63865625d Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x 2013-02-04 11:06:53 -05:00
denise
1f0b9fa5dc CC-4897: XSS exploit on library page 2013-02-04 11:06:46 -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
denise
595429e6e5 CC-4897: XSS exploit on library page 
-fixed
 2013-01-30 11:51: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
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
7c327e4c75 Merge branch '2.3.x' into 2.3.x-saas 2013-01-25 12:12:21 -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
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
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
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
Martin Konecny
5d56341757 baseUrl is set incorrectly for previewing tracks 2013-01-21 19:32:00 -05: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
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
Martin Konecny
f8208a355c Merge branch 'devel' into 2.3.x-saas 2013-01-18 12:22:45 -05:00
James
ed7b22118c Merge branch 'silan-script' into devel 2013-01-18 11:54:10 -05:00
James
f70ca93b53 CC-4841: Silan script 
done
 2013-01-18 11:53:26 -05:00
Martin Konecny
4a7b345649 fix exception on support settings page 2013-01-17 17:35:16 -05:00
denise
94a87a0b2e Smart block tooltip content breaks when language setting is not english 2013-01-17 16:19:35 -05:00
denise
796099b413 CC-4860: Library -> Context Menu -> Can't download files 
-fixed
 2013-01-17 13:37:32 -05:00
Martin Konecny
784cb390d3 Merge branch 'devel' into 2.3.x-saas 2013-01-17 10:56:18 -05:00
Martin Konecny
6640c1ea4b CC-4856: 2.3.x-saas: Overwriting metadata doesn't take effect 
-fixed
 2013-01-16 14:45:14 -05:00
denise
f7e8fd33fd CC-4848: Streaming server passwords should be hidden with dots, once entered 
-fixed
 2013-01-16 14:36:56 -05:00
Martin Konecny
8b12f692cd CC-4854: Remove SaaS checking from codebase 
-fixed
 2013-01-16 14:31:43 -05:00
Martin Konecny
ab83029b2f CC-4852: 2.3.x-saas: Exception happens when updating System -> Preferences 
-fixed
 2013-01-16 12:44:26 -05:00
Martin Konecny
8cd6bd9aa4 Merge branch 'devel' into 2.3.x-saas 
Conflicts:
	airtime_mvc/application/controllers/PreferenceController.php
	airtime_mvc/application/forms/AddShowWhen.php
	airtime_mvc/application/forms/GeneralPreferences.php
	airtime_mvc/application/forms/LiveStreamingPreferences.php
	airtime_mvc/application/forms/SoundcloudPreferences.php
	airtime_mvc/application/forms/SupportSettings.php
	airtime_mvc/application/views/scripts/form/preferences.phtml
	airtime_mvc/application/views/scripts/form/preferences_email_server.phtml
	airtime_mvc/application/views/scripts/form/preferences_general.phtml
	airtime_mvc/application/views/scripts/form/preferences_livestream.phtml
	airtime_mvc/application/views/scripts/form/support-setting.phtml
	airtime_mvc/application/views/scripts/schedule/add-
show-form.phtml
	airtime_mvc/public/js/airtime/preferences/preferences.js
	python_apps/api_clients/api_client.py
	python_apps/pypo/listenerstat.py
 2013-01-15 13:44:44 -05:00
denise
a85b394d63 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-14 17:02:05 -05:00
denise
692c1a1c9e CC-4838: I18N: HTML contents of Print preview for Playout History need to be translated 
-fixed
 2013-01-14 17:01:50 -05:00
James
9ae3559305 Merge branch 'cc-4384-remove-table-calling-with-cc-config' into devel 
Conflicts:
	airtime_mvc/application/Bootstrap.php
 2013-01-14 16:19:51 -05:00
James
5a97fb69f2 CC-4384: Remove annoying usage of $CC_CONFIG 
- done
 2013-01-14 16:16:14 -05:00
Martin Konecny
0dfd8acf7a Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-14 16:00:46 -05:00
Martin Konecny
fae3f3a03f CC-2184: Hardcoded CSS path should be relative path instead 
-Make '/' the default root
 2013-01-14 16:00:38 -05:00
denise
8ea3aca3a0 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-14 14:07:55 -05:00
James
cf09175ff1 CC-4796: Listener Stat: Authentication exception happens but no warning message on UI. 
- done
 2013-01-14 13:57:32 -05:00
James
891e993cd1 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-14 13:56:24 -05:00