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

9834 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 858f03c9ad -remove rebroadcast code 2012-11-29 15:58:29 -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
denise 3b124e6f5d CC-4668: Blocks/Playlists: Length includes deleted tracks 
-saving block length was including files that do not exist
 2012-11-26 15:05:27 -05:00
denise ddb6289c87 Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x 2012-11-23 16:54:39 -05:00
denise 04f6ae5c1a CC-4607: Library: Please make the 'Add x items' following mouse's point 
-fixed
 2012-11-23 16:53:51 -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 5ba964c783 Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x 2012-11-23 14:03:51 -05:00
martin 75adf9b6a1 CC-4701: same webstream played twice in a row does not work. 
-fixed
 2012-11-23 14:03:31 -05:00
James 87d0383533 CC-4703: Now Playing duration column ignores any cue point set 
- fixed
 2012-11-22 14:37:57 -05:00
Martin Konecny 612ac415d2 cc-4708: cue points not working 
-fixed
 2012-11-22 12:24:59 -05:00
Martin Konecny 2fa8f05c3c Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x 2012-11-22 11:40:55 -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 acf2ffc9d5 CC-4707: Webstream: Preview for Webstream in Scheduler is forbidden 
- fixed
 2012-11-22 11:18:42 -05:00
James 8483439551 CC-4709: 
Exception happens when DJ try to click a Webstream not belongs to himself

- fixed
 2012-11-22 10:29:40 -05:00
James dcc9a192d1 Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x 2012-11-22 10:15:35 -05:00
james 8cc162f7a9 CC-4716: Cannot hear fade in & fade out 
- fixed
 2012-11-21 17:34:07 -05:00
denise 2a4e4c6405 CC-4710: Preferences -> Default Fade in/out: Cannot add songs into schedule if the default fade value is set to int value, for instance, 5 secs. 
-fixed
 2012-11-21 14:17:46 -05:00
denise 48253b8d14 CC-4710: Preferences -> Default Fade in/out: Cannot add songs into schedule if the default fade value is set to int value, for instance, 5 secs. 
-fixed
 2012-11-21 10:19:21 -05:00
James 4242fecd34 CC-4615: Now Playing page: Fail to get soundcloud file id in Schedule 
- fixed
 2012-11-20 18:03:13 -05:00
James f246a09b1a CC-4662: Media Monitor: Unable to add watched folder because it's read only, by airtime-import command 
- fixed
 2012-11-20 17:35:18 -05:00
James 0870b1f018 CC-4697: airtime-import script fails silently on FLAC files 
- fixed
 2012-11-20 17:21:13 -05:00
James 8d9fa1976e Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x 2012-11-20 16:39:04 -05:00
James 3c1f80de68 CC-4658: Smart Block: Unable to drag songs into block directly 
- fixed
 2012-11-20 16:38:43 -05:00
Martin Konecny fe44d23b74 CC-4715: Better management of tracks that are shorter than they claim to be. 2012-11-20 16:31:27 -05:00
Martin Konecny 9c612d17a3 CC-4694: Apache/Zend error only specific to some users 2012-11-19 18:41:31 -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 7efa7169ca CC-4700: Return mime type of streams instead of null 
-fixed
 2012-11-15 16:41:46 -05:00
Martin Konecny 2010778876 cleanup redundant code, remove whitespace 2012-11-15 13:33:27 -05:00
Martin Konecny d1a22fe7ca CC-4677: Improve Smart block repeat description 
-fixed
 2012-11-15 11:30:56 -05:00
Martin Konecny 9518769738 Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x 2012-11-15 11:23:04 -05:00
Martin Konecny cfad1079bb CC-4626: Airtime installation on Wheezy 2012-11-15 11:22:31 -05:00
James d8165cbf44 - haproxy support subdomain name with '.' 2012-11-13 16:32:36 -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 0f2d5bc844 files should not be independent events 2012-11-12 17:45:20 -05:00
Martin Konecny a0a9fc71f1 disable unlimited attempts for pushing stats data 2012-11-12 17:44:26 -05:00
denise a727f2bb1e CC-4638: Stream Settings -> Apache error when setting master source port to same port Airtime is running on 
-fixed
 2012-11-12 14:28:50 -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 2ee6ff030e Merge branch '2.2.x-saas' of dev.sourcefabric.org:airtime into 2.2.x-saas 2012-11-07 17:22:49 -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 034ea49d01 Merge branch 'cc-4661-listener-statistics' of dev.sourcefabric.org:airtime into cc-4661-listener-statistics 2012-11-07 17:20:05 -05:00
Martin Konecny bb8f5e107c CC-4661: Listener Statistics 
-ability to gather stats without
admin password
 2012-11-07 17:19:47 -05:00
James 39f765d658 Merge branch '2.2.x-saas' of dev.sourcefabric.org:airtime into 2.2.x-saas 2012-11-07 16:27:48 -05:00