Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,549 Commits 3 Branches 0 Tags 405 MiB
Commit Graph

1676 Commits

Author SHA1 Message Date
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 e459f739f2 indentation error fix 2013-01-30 11:29:28 -05:00
Martin Konecny 2a0cc9e45f fix indentation 2013-01-30 11:23:20 -05:00
Martin Konecny 9d4e0d2dd1 Merge branch 'martin' into 2.3.x 2013-01-29 12:17:36 -05:00
Martin Konecny 28c01760dd be more gentle to Liquidsoap when sending lots of commands 2013-01-29 12:17:05 -05:00
drigato db4e6bb94a CC-4889: API client URL request is not wrapping in try/catch 
-fixed
 2013-01-29 10:29:29 -05:00
Martin Konecny 9d8a9faca8 make code formatting easier on eyes 2013-01-28 17:00:35 -05:00
Martin Konecny d7358338f0 improved logging in pypo fetch 2013-01-28 17:00:16 -05:00
Martin Konecny b389e44001 take liquidsoap by the horns if it misbehaves. 2013-01-27 15:00:56 -05:00
Martin Konecny c93b90cc54 prepare for improvements to way pypo communicates with LS 2013-01-26 20:05:31 -05:00
Martin Konecny ea9e97d834 Merge branch '2.3.x' into 2.3.x-saas 2013-01-25 15:15:07 -05:00
Martin Konecny 807aa6b4a6 fix restart liquidsoap being sent as default no arguments for pypo-notify 2013-01-25 15:14:40 -05:00
Martin Konecny 22aafda2a8 Merge branch '2.3.x' into 2.3.x-saas 2013-01-25 14:17:23 -05:00
Martin Konecny 8dd7ffee8c locks should occur inside try/catch 2013-01-25 14:16:53 -05:00
Martin Konecny 7c327e4c75 Merge branch '2.3.x' into 2.3.x-saas 2013-01-25 12:12:21 -05:00
Martin Konecny 21a04803e5 Fix Pypo giving up too early on attempting to receive schedule 2013-01-25 12:11:50 -05:00
Martin Konecny d5894279c4 Merge branch '2.3.x' into 2.3.x-saas 2013-01-25 11:30:46 -05:00
Martin Konecny 7b3850fac6 false not being returned on connection error 2013-01-25 11:30:36 -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 c6ee5bfe58 prepare baby mm for saas 2013-01-22 13:02:45 -05:00
Martin Konecny b637365f55 add some missing statements in the sql upgrade script 2013-01-18 15:58:00 -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 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 e98d6e92bb Merge branch 'devel' into 2.3.x-saas 2013-01-15 15:38:27 -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
Martin Konecny c266bf189f upgrade version number to 2.3.0 2013-01-15 12:31:41 -05:00
Martin Konecny 1d6ff24242 SAAS-298: Issues with http://iqkidsradio.airtime.pro/Schedule 
potential fix
 2013-01-10 10:29:57 -05:00
James 6e7f45e615 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-08 17:32:39 -05:00
James 1263c04621 CC-4796: Listener Stat: Authentication exception happens but no warning message on UI 
- done
 2013-01-08 17:32:27 -05:00
Martin Konecny 8b8e12a234 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-08 17:23:28 -05:00
Martin Konecny e79066de55 CC-4760: Airtime fails to play out 2nd webstream upon switching from one webstream to another 
-fix attempt
 2013-01-08 17:23:21 -05:00
James adda497bbb CC-4812: Property "off_air_meta" will block airtime-liquidsoap to start 
- fixed
 2013-01-08 15:52:11 -05:00
James b580a7be73 CC-4812: Property "off_air_meta" will block airtime-liquidsoap to start 
- fixed
 2013-01-08 12:31:14 -05:00
James 6e241fd3ec CC-4512: Allow changing stream "Offline" message via Web UI 
- fixed
 2013-01-07 18:14:57 -05:00
Martin Konecny 225a5d8f48 CC-4733: Stream statistics for Shoutcast users 
-initial implementation
 2013-01-04 18:32:20 -05:00
James 5d76bb2d17 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-03 18:00:33 -05:00
James ae7b6fe092 CC-4732: Ask for admin username + password in Stream Settings page 
- done
 2013-01-03 17:58:50 -05:00
Martin Konecny 5df867d142 remove whitespace 2013-01-03 15:05:31 -05:00
James a05259bd8f CC-4771: System -> Streams: It will restart liquidsoap every time when I click "Save" button without changing anything 
- fixed
 2013-01-03 14:42:12 -05:00
James f5b6d85406 CC-3018: Automatically strip out silence from audio tracks 
- adding logging
 2013-01-03 14:30:19 -05:00
James a1837366be Merge branch 'cc-3018-silence-detection' into devel 2013-01-03 14:08:21 -05:00
James f936f510c5 CC-3018: Automatically strip out silence from audio tracks 
- adding try/catch
 2013-01-03 14:07:34 -05:00
James b8f80866cf CC-3018: Automatically strip out silence from audio tracks 
- done
 2013-01-03 14:02:06 -05:00
Martin Konecny f2322e4f76 -disable liquidsoap playability test 2013-01-03 11:48:00 -05:00
Martin Konecny 77da642996 -fix missing import 2013-01-02 17:49:06 -05:00
Martin Konecny 2589b133d9 CC-4343: Unflushed events loop in media monitor 
-fixed
 2013-01-02 16:58:24 -05:00
Martin Konecny b9d829a33c CC-4754: Replay gain modifier 
-make pypo repush song if its replay_gain changed
 2012-12-28 13:58:55 -05:00