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

10432 commits

This branch
This branch
All branches
Author SHA1 Message Date
Martin Konecny
784cb390d3 Merge branch 'devel' into 2.3.x-saas 2013-01-17 10:56:18 -05:00
james
5283757cc6 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-16 16:38:44 -05:00
james
3f2ab9bb4e CC-4847: Listener Stats page shows misleading error when the Icecast admin password has not been entered 
- done
 2013-01-16 16:38:24 -05:00
cliff.wang
d7e40710f4 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-16 16:33:30 -05:00
cliff.wang
e05d99e16f Update Chinese translation 2013-01-16 16:33:16 -05:00
denise
e4c2f43d9e CC-4855: System->Preferences->Fade in/out settings: Number's format is incorrect. 
-fixed
 2013-01-16 15:40:50 -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
9d8c9149fd remove code that will never be executed on SaaS branch 2013-01-16 14:06:04 -05:00
Martin Konecny
74877b289e CC-4843: Make listener stats work with SaaS in 2.3.x-saas branch 
-fixed
 2013-01-16 14:05:45 -05:00
Martin Konecny
dbaf7d9b4b Merge branch 'devel' into 2.3.x-saas 2013-01-16 13:41:27 -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
denise
9cb4633823 CC-4850: Upgrade Scripts -> Add default timezone and locale for each user in cc_pref 
-fallback to default settings if user setting is not set
 2013-01-16 12:42:58 -05:00
Martin Konecny
bd3d12bd26 CC-4849: 2.3.x-saas: Empty page for Support feedback 
-fixed
 2013-01-16 12:34:20 -05:00
denise
4766c3fca8 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-16 11:55:29 -05:00
denise
da137addf8 CC-4797: Generate localization locales on install 
-added check on Debian before writing to /etc/locale.gen
 2013-01-16 11:55:19 -05:00
Martin Konecny
3a474f056a 2.3.0 initial db upgrade script 2013-01-16 11:54:44 -05:00
denise
b7fb7a4166 Removed English-US language option 2013-01-16 11:49:04 -05:00
denise
712df8b12d Removed extra style element 2013-01-16 11:10:23 -05:00
Daniel James
5f12bc713d Bumped copyright date to 2013 2013-01-16 12:24:45 +00:00
denise
2791c5fcc5 Updating fr_FR .po files 2013-01-15 17:05:57 -05:00
denise
e485e312b9 CC-4846: Upgrade meet PHP warning 
-fixed
 2013-01-15 16:48:42 -05:00
denise
6de4c4b63d Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-15 16:29:14 -05:00
denise
7442f91a5d CC-4797: Generate localization locales on install 
-check if locale exists before writing it to /etc/locale.gen on Debian
 2013-01-15 16:29:02 -05:00
denise
4d3f5e1ba4 Reverting last commit 2013-01-15 16:27:50 -05:00
denise
6fe4840e32 CC-4797: Generate localization locales on install 
-check if locale exists before writing it to /etc/locale.gen on Debian
 2013-01-15 16:22:17 -05:00
denise
e46ba0eb77 Changed version number in UpgradeCommon.php 2013-01-15 15:46:07 -05:00
Martin Konecny
e98d6e92bb Merge branch 'devel' into 2.3.x-saas 2013-01-15 15:38:27 -05:00
Martin Konecny
84373391de Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-15 15:37:39 -05:00
Martin Konecny
973a415164 -fix installation error 2013-01-15 15:37:26 -05:00
denise
aef19aadbe Updating es_ES .po files 2013-01-15 15:31:38 -05:00
denise
d5f36dad1c CC-4797: Generate localization locales on install 
-added check for Debian
 2013-01-15 15:22:10 -05:00
denise
3d6336cae7 Updating default base directory in upgrade script config files 2013-01-15 15:06:10 -05:00
cliff.wang
52bd3d17d7 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-15 14:40:52 -05:00
cliff.wang
e51a53671b Update Chiness translation file 2013-01-15 14:40:36 -05:00
Martin Konecny
c57e19983c -fix merge mistakes from devel 2013-01-15 14:06:02 -05:00
James
08b52fceca Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-15 13:54:56 -05:00
James
8226105b2f - translation(Korean) 2013-01-15 13:54:40 -05:00
denise
bbedce2951 Changed default base directory in airtime.conf and api_client.cfg 2013-01-15 13:47:35 -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
James
72aa2ab7de Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-15 13:27:53 -05:00
James
8664acaaec - re-install fix 2013-01-15 13:27:40 -05:00
Martin Konecny
93505353e7 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 
Conflicts:
	install_minimal/include/airtime-upgrade.php
 2013-01-15 12:32:49 -05:00
Martin Konecny
c266bf189f upgrade version number to 2.3.0 2013-01-15 12:31:41 -05:00
cliff.wang
3f1bbade52 Update Chinese translation files 2013-01-15 11:00:24 -05:00
denise
dc5cac9834 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-15 10:41:45 -05:00
denise
146326c406 Updating .po files with new messages 2013-01-15 10:41:03 -05:00
Martin Konecny
4e0d644d8b Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-14 17:16:01 -05:00
Martin Konecny
e22a573d8a CC-2184: Hardcoded CSS path should be relative path instead 
-missed some paths
 2013-01-14 17:15:53 -05:00