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

4669 commits

Author SHA1 Message Date
drigato
ac6c279bef Removed extra '/' is audio preview url 2013-01-21 20:20:29 -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
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
Martin Konecny
c1941fea2b Merge branch 'devel' into 2.3.x-saas 2013-01-18 14:45:55 -05:00
denise
ad0879996d CC-4855: System->Preferences->Fade in/out settings: Number's format is incorrect. 
-use existing function to convert seconds to time format
 2013-01-18 14:35:17 -05:00
denise
22ecc3f1fc CC-4855: System->Preferences->Fade in/out settings: Number's format is incorrect. 
-fixed
 2013-01-18 14:28:45 -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
james
e2b83a0c8c CC-4857: Playlist length will increase every time I duplicate it. 
- fixed
 2013-01-17 22:20:28 -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
6acc5696f9 Save button on edit user settings was not translating 2013-01-17 14:34:18 -05:00
denise
57629b4eac Changed path to locale directory from absolute to relative 2013-01-17 14:31:40 -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
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