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

533 Commits

Author SHA1 Message Date
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 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 ae7b6fe092 CC-4732: Ask for admin username + password in Stream Settings page 
- done
 2013-01-03 17:58:50 -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
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
denise b2699fa914 merge from devel 2012-12-03 11:06:56 -05:00
Martin Konecny 4983721565 Merge branch '2.2.x' into 2.2.x-saas 
Conflicts:
	airtime_mvc/application/forms/LiveStreamingPreferences.php
 2012-11-28 16:10:33 -05:00
martin 50bdeeef26 CC-4702: Webstream: When webstream is playing, it isn't marked as 'media_item_played' in cc_schedule 2012-11-23 16:00:10 -05:00
Martin Konecny 612ac415d2 cc-4708: cue points not working 
-fixed
 2012-11-22 12:24:59 -05:00
Martin Konecny 3a1945a818 CC-4702Webstream: When webstream is playing, it isn't marked as 'media_item_played' in cc_schedule 
-fixed
 2012-11-22 11:40:44 -05:00
james 8cc162f7a9 CC-4716: Cannot hear fade in & fade out 
- fixed
 2012-11-21 17:34:07 -05:00
Martin Konecny fed39077c0 Merge branch '2.2.x' into devel 2012-11-20 11:21:29 -05:00
Martin Konecny 62b3c39c5b CC-4702: Webstream: When webstream is playing, it isn't marked as 'media_item_played' in cc_schedule 
-fixed
 2012-11-15 17:35:06 -05:00
Martin Konecny 5f534b5ef6 CC-4702Webstream: When webstream is playing, it isn't marked as 'media_item_played' in cc_schedule 2012-11-15 17:29:25 -05:00
Martin Konecny 8c73731c41 CC-4633: Use David's new method of Liquidsoap webstream switching 
-fixed
 2012-11-15 16:43:22 -05:00
Martin Konecny 2010778876 cleanup redundant code, remove whitespace 2012-11-15 13:33:27 -05:00
Rudi Grinberg 2e59eca131 moved files to pypo dir 2012-11-14 14:43:33 -05:00
Rudi Grinberg d5cacf4011 moved replay gain to pypo for better saas performance 2012-11-14 14:43:10 -05:00
James 6145f9bcad Merge branch '2.2.x' into devel 2012-11-08 17:28:23 -05:00
James f657ee4f20 Merge branch '2.2.x' into 2.2.x-saas 2012-11-08 17:27:51 -05:00
James 628e6bed37 CC-4689: Live Stream: The 1st song of a show won't play if there is another show have live stream assigned and finished right before 
- fixed
 2012-11-08 17:26:55 -05:00
Martin Konecny ed7aba83bf Merge branch 'cc-4661-listener-statistics' into 2.2.x-saas 2012-11-07 17:22:36 -05:00
James 7300b608cf Merge branch 'cc-4661-listener-statistics' into devel 
Conflicts:
	python_apps/api_clients/api_client.py
 2012-11-07 17:20:12 -05:00
Martin Konecny bb8f5e107c CC-4661: Listener Statistics 
-ability to gather stats without
admin password
 2012-11-07 17:19:47 -05:00
Martin Konecny 3f7d8a0c7f Merge branch '2.2.x' into 2.2.x-saas 2012-11-06 16:11:51 -05:00
Martin Konecny 34d0ee5954 CC-4661: Listener Statistics 
-add mount point names
 2012-11-02 18:04:32 -04:00
Martin Konecny 5bd0fe0300 clean up source file tailing whitespace 2012-11-02 17:51:02 -04:00
Martin Konecny 6438b54a5f CC-4661: Listener Statistics 
-backend part working
 2012-11-02 17:50:43 -04:00
Rudi Grinberg dfc3cf9267 removed useless tests 2012-11-02 15:05:08 -04:00
denise 135aadf16b Merge branch '2.2.x' into devel 
Conflicts:
	airtime_mvc/application/controllers/LibraryController.php
	airtime_mvc/application/views/scripts/library/library.phtml
	airtime_mvc/public/js/airtime/showbuilder/builder.js
	airtime_mvc/public/js/airtime/showbuilder/main_builder.js
 2012-11-02 12:28:21 -04:00
James b746f65304 CC-4601: Do not rewrite metadata for master source and show source streams. 
- fixed
 2012-11-01 17:24:41 -04:00
Rudi Grinberg 3b8181062c pointless refactoring of stuff that's never used 2012-10-30 17:35:10 -04:00
Martin Konecny 5f0fd0ef09 Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x 2012-10-29 16:29:20 -04:00
Martin Konecny e40d49219b add missing gstreamer.liq file 2012-10-29 16:29:10 -04:00
Rudi Grinberg 3b51c93766 Refactored pyponotify. Removed code duplication and made runner reusable by other scripts. 2012-10-29 11:25:05 -04:00
Martin Konecny e285bcfba1 update liquidsoap library scripts 
-git commit hash f776e7f4c5d3729cbcf863381f3cadd96c578a5b
 2012-10-26 12:54:10 -04:00
Martin Konecny 63e48d73bd easier maintenance of pypo containers on SaaS 2012-10-26 00:03:34 -04:00
Martin Konecny 795ffbbf63 CC-2236: Overbooked shows do not respect default fade time 
-move map_metadata after crossfade function
 2012-10-22 16:36:57 -04:00
Martin Konecny 780a05c2aa CC-2236: Overbooked shows do not respect default fade time 
-once a release we manage to break fades :) fixed.
 2012-10-22 16:23:33 -04:00
Martin Konecny ef78cefcd9 CC-4487: Webstream could not be heard unless you restart playout as well 
-cleanup of unused variables
 2012-10-19 16:49:01 -04:00
Martin Konecny bd5fef0bcd CC-4487: Webstream could not be heard unless you restart playout as well 
-fixed
 2012-10-19 16:29:31 -04:00
Martin Konecny 9dfee6aa68 CC-4564: Webstream: Book same webstream twice in Scheduler, the 2nd one doesn't get played 
-fixed
 2012-10-19 15:39:45 -04:00