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

1561 commits

Author SHA1 Message Date
Martin Konecny
17e66f5537 Merge branch 'cc-4759-add-aac-stream-in-support' into 2.2.x-saas 2012-12-27 17:30:10 -05:00
Martin Konecny
ee8dde07c8 add support for AAC input streams 2012-12-27 17:18:47 -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
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
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
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
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
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
7efa7169ca CC-4700: Return mime type of streams instead of null 
-fixed
 2012-11-15 16:41:46 -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
James
9112a8d0b1 CC-4661: Listener Statistics 
- enhancement on flot
- data point reduction
 2012-11-07 16:26:31 -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
Martin Konecny
fd3305bc4c SAAS-289: Remove all isSaaS checks 
-done
 2012-11-06 17:10:47 -05:00
Martin Konecny
38d28d3346 SAAS-289: Remove all isSaaS checks 2012-11-06 16:48:34 -05:00
James
504d9968f1 CC-4639: 
Give an option to allow smart blocks to reuse tracks if not enough tracks meet the time limit

- fixed the bug where airtime hangs when repeat is checked but 0 files that
meet criteria
- fixed dynamic block bug where it didn't generate correct list
 2012-11-06 16:32:00 -05:00
Martin Konecny
3f7d8a0c7f Merge branch '2.2.x' into 2.2.x-saas 2012-11-06 16:11:51 -05:00
denise
a99191f4bd CC-4669: Smart Blocks: Dynamic length of less than 1 hour shows 0.0 
-fixed
 2012-11-06 11:14:40 -05:00
James
8e69e50eea Merge branch 'cc-4661-listener-statistics' of dev.sourcefabric.org:airtime into cc-4661-listener-statistics 
Conflicts:
	airtime_mvc/application/models/ListenerStat.php
 2012-11-06 11:06:58 -05:00
denise
6ef646124e CC-4668: Blocks/Playlists: Length includes deleted tracks 
-fixed
 2012-11-06 10:58:25 -05:00
James
2e79e8421c CC-4661: Listener Statistics 
- better legend for multiple series of data
- consistant number of ticks on x-axis
 2012-11-06 10:54:52 -05:00
Martin Konecny
4218a7f30d CC-4661: Listener Statistics 
-factor out mountname into it's own table
 2012-11-05 15:48:56 -05:00
Martin Konecny
080c3ec944 CC-4661: Listener Statistics 
-factor out mountname into it's own table
 2012-11-05 15:38:35 -05:00
denise
90a93e9a6c CC-4664: Playlist/Block preview: Tracks deleted from library still get played 
-fixed
 2012-11-05 13:58:11 -05:00
James
a93b588a09 Merge branch 'cc-4661-listener-statistics' of dev.sourcefabric.org:airtime into cc-4661-listener-statistics 2012-11-02 18:25:23 -04:00
James
74fe958cad CC-4661: Listener Statistics 
- changes for different mount names
 2012-11-02 18:25:08 -04:00
Martin Konecny
34d0ee5954 CC-4661: Listener Statistics 
-add mount point names
 2012-11-02 18:04:32 -04:00
Martin Konecny
6438b54a5f CC-4661: Listener Statistics 
-backend part working
 2012-11-02 17:50:43 -04:00
denise
106b18bf30 CC-4637: Media Library: Item will be removed from Playlist if it's removed from Library 
-fixed
 2012-11-02 17:49:32 -04:00
James
8b70136dd6 CC-4661: Listener Statistics 
- db change commit
 2012-11-02 17:44:06 -04:00
James
7f27e5ff3f - ListenerStat Model 2012-11-02 16:28:13 -04:00
denise
796274e4ef CC-4642: Default Fade preference should be in seconds and tenths, rather than millionths 
-fixed
 2012-11-02 15:51:36 -04:00
denise
ba1f6ed054 CC-4374: Nowplayling page: Cannot remove tracks from recording show 
-fixed by disallowing dragging into recording shows
 2012-11-02 13:24:47 -04:00
Martin Konecny
3478797744 cc-4661: new database tables for listener stats 2012-11-02 11:32:02 -04:00
James
feb6c9d6f5 CC-4636: Exception happens when trying to remove user that have created some smart block 
- doing delete cascade on cc_block on deleting users
 2012-11-01 17:45:28 -04:00
James
575400b4c2 CC-4623: Library: Preview button for Flac does not work 
- fixed
 2012-11-01 16:44:37 -04:00
denise
5b14c4fe88 CC-4656: Library -> No error message when a dj tries to delete smart blocks and webstreams they do not own 
-fixed
 2012-10-31 17:19:27 -04:00
denise
2507e0f8a4 CC-4655: DJ's can delete files that they do not own 
-fixed
 2012-10-31 16:51:29 -04:00
denise
fc613aa597 CC-4604: Edit Metadata: DJ's cannot edit metadata on their own files 
-fixed
 2012-10-31 16:01:17 -04:00
denise
cc40dfdf4e CC-4641: Now Playing: Extending show's length won't change the overbooked track's style 
-added comment
 2012-10-31 14:16:16 -04:00
denise
71be2b2bd1 Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x 2012-10-31 12:36:56 -04:00
denise
fd0e1c3c95 CC-4641: Now Playing: Extending show's length won't change the overbooked track's style 
-fixed
 2012-10-31 12:36:45 -04:00