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

1463 Commits

Author SHA1 Message Date
Martin Konecny fc09e8cd74 Merge branch '2.2.x' into 2.2.x-saas 2012-12-03 17:08:49 -05:00
Martin Konecny 735ad30483 CC-4726: Sometimes mm doesn't start after a fresh install 
-fixed
 2012-12-03 16:56:11 -05:00
Martin Konecny e3761bd8d6 -make sure lsof works for files with spaces 2012-12-03 16:33:24 -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 Konecny 7249e36081 -2.2.1 upgrade scripts 2012-11-27 12:13:16 -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 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
Martin Konecny dfede98b82 Merge branch '2.2.x-saas' of dev.sourcefabric.org:airtime into 2.2.x-saas 
Conflicts:
	airtime_mvc/application/models/Schedule.php
 2012-11-12 17:46:22 -05:00
Martin Konecny a0a9fc71f1 disable unlimited attempts for pushing stats data 2012-11-12 17:44:26 -05:00
James f657ee4f20 Merge branch '2.2.x' into 2.2.x-saas 2012-11-08 17:27:51 -05:00
James 33b2520c14 Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x 2012-11-08 17:27:28 -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
Martin Konecny bb8f5e107c CC-4661: Listener Statistics 
-ability to gather stats without
admin password
 2012-11-07 17:19:47 -05:00
Martin Konecny 272e428fa7 Merge branch '2.2.x' into 2.2.x-saas 
Conflicts:
	airtime_mvc/application/controllers/PreferenceController.php
	airtime_mvc/application/controllers/ScheduleController.php
	airtime_mvc/application/forms/EmailServerPreferences.php
	airtime_mvc/application/forms/GeneralPreferences.php
	airtime_mvc/application/forms/LiveStreamingPreferences.php
	airtime_mvc/application/forms/Preferences.php
	airtime_mvc/application/forms/SupportSettings.php
	airtime_mvc/application/models/Schedule.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_livestream.phtml
	airtime_mvc/application/views/scripts/form/support-setting.phtml
	airtime_mvc/application/views/scripts/menu.phtml
	airtime_mvc/application/views/scripts/schedule/add-
show-form.phtml
 2012-11-06 17:23:32 -05:00
Rudi Grinberg b3c9472bcb cc-4672: added dirty workaround to fix this issue 2012-11-06 16:16:37 -05:00
Martin Konecny 3f7d8a0c7f Merge branch '2.2.x' into 2.2.x-saas 2012-11-06 16:11:51 -05:00
Rudi Grinberg 1762e418c0 added better logging 2012-11-06 14:57:53 -05:00
Rudi Grinberg b4555e9845 docstring formatting 2012-11-06 13:51:04 -05:00
Martin Konecny f6ee2afb88 CC-4665: ReplayGain does not work for FLAC files 
-fixed
 2012-11-05 12:03:25 -05:00
Martin Konecny fffaf7788a Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x 2012-11-05 11:53:52 -05:00
Martin Konecny af7e94a44d don't break 80 character line limit 2012-11-05 11:53:37 -05:00
Martin Konecny d89166e2ff CC-4665: ReplayGain does not work for FLAC files 
-fixed
 2012-11-05 11:53:20 -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 a1d5037e04 cc-4584: fixxxed 2012-11-02 12:42:24 -04:00
Rudi Grinberg e9524c8615 Merge remote-tracking branch 'rudi/cc-4652' into 2.2.x 2012-11-02 11:30:04 -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 bf363dcdde cc-4652: Added code to create the stor/ structure before adding any watched 2012-11-01 15:48:26 -04:00
Rudi Grinberg 176f2c45ba Added information message when media monitor is restarted 2012-11-01 15:42:58 -04:00
Rudi Grinberg c0dc38be62 cc-4652: added logging for when watch fails on startup 2012-11-01 15:16:23 -04:00
James 3e60ac4393 remove \r line endings 2012-10-30 13:23:09 -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 bf5bc3a116 Changed APC to new-style classes 2012-10-29 11:43:39 -04:00
Rudi Grinberg 3cec987d10 Added todo 2012-10-29 11:42:24 -04:00
Rudi Grinberg 31a7b8f943 Removed usesless try catch from send_media_monitor_requests. 2012-10-29 11:40:41 -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 5ab183e01e Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x 2012-10-26 18:23:36 -04:00
Rudi Grinberg 0a396378e5 cc-4635: Fix 2012-10-26 17:15:28 -04:00
Rudi Grinberg c4f0491ff6 cc-4635: Fix 2012-10-26 17:04:42 -04:00
Rudi Grinberg 72928bb5e6 cc-4635: Fix 2012-10-26 16:59:32 -04:00
Rudi Grinberg e10f81aec8 cc-4635: Fix 2012-10-26 16:48:03 -04:00