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

3048 commits

Author SHA1 Message Date
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
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
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
Martin Konecny
e98d6e92bb Merge branch 'devel' into 2.3.x-saas 2013-01-15 15:38:27 -05:00
Martin Konecny
973a415164 -fix installation error 2013-01-15 15:37:26 -05:00
Martin Konecny
c57e19983c -fix merge mistakes from devel 2013-01-15 14:06:02 -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
bb2f9316af CC-4841: Silan script 
- temp commit
 2013-01-15 11:16:50 -05:00
James
175dbcbabc Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-14 17:09:03 -05:00
James
ea70357920 - remove logging 2013-01-14 17:08:47 -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
8c19384d32 - CRLF fix 2013-01-14 16:21:02 -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
James
a55bc9973c - temp commit 2013-01-14 14:43:02 -05:00
denise
9603e7c2fd CC-4830: I18N: System -> Streams: "dB" for Replay Gain Modifier is not translated 
-fixed
 2013-01-14 14:30:59 -05:00
denise
7b4693e5f9 CC-4831: I18N: Error message of background settings when creating a show is not translated 
-fixed
 2013-01-14 14:13:32 -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
James
d4124f916d CC-4796: Listener Stat: Authentication exception happens but no warning message on UI. 
- done
 2013-01-14 13:56:00 -05:00
denise
2c3e79e842 CC-4832: I18N: Tool tip for show is partially filled in Calendar page is not translated 
-fixed
 2013-01-14 13:53:27 -05:00
denise
1e6b0fe6ae CC-4833: I18N: Alert message "Please select a cursor posion from timeline." in Now playing page is not translated 
-fixed
 2013-01-14 13:47:41 -05:00
denise
83be01d0d0 CC-4835: I18N: "Copy of ..." from Duplicating playlist would better be translated 
-fixed
 2013-01-14 13:42:17 -05:00
denise
f067b952db CC-4829: Password Verify does not work on Lucid 
-code cleanup
 2013-01-14 12:17:33 -05:00
denise
83a450565e CC-4829: Password Verify does not work on Lucid 
-fixed
 2013-01-14 12:07:17 -05:00
James
1666a04451 CC-4826: Please re-push the liquidsoap queue if updating Replay Gain settings 
- done
 2013-01-14 11:28:48 -05:00
denise
8362860904 Block expansion ajax url was missing baseUrl 2013-01-11 14:11:01 -05:00
Martin Konecny
89274e43b3 fix spelling mistake 2013-01-11 13:17:08 -05:00
James
dcf3526000 CC-4384: Remove annoying usage of $CC_CONFIG 
- done
 2013-01-10 18:09:00 -05:00
denise
a129b0b081 CC-4472: User password verify or clear text display. 
-done with password verify
 2013-01-10 17:51:25 -05:00
James
55fa8b8dc1 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-10 14:52:45 -05:00
denise
9f857433fa CC-4817: I18N: "Playlist Shuffled" is not listed for translation 
-fixed
 2013-01-10 14:22:25 -05:00
denise
a0be1c647e CC-4786: Refresh page when language setting changes 
-configure localization and reinitiliaze edit user form after the user locale is set
 2013-01-10 14:01:03 -05:00
denise
dffe932223 Added missing base directory to urls 2013-01-10 13:58:11 -05:00
denise
2797809c74 CC-4786: Refresh page when language setting changes 
-done
 2013-01-10 13:55:52 -05:00
James
048ee05030 CC-4821: Add option to disable ReplayGain 
- done
 2013-01-10 13:49:41 -05:00
denise
c20ed7ebad Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-10 12:04:44 -05:00
denise
690a6d2654 Removed user id from cc_pref keystr value 2013-01-10 12:04:27 -05:00