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

1665 Commits

Author SHA1 Message Date
James 6e241fd3ec CC-4512: Allow changing stream "Offline" message via Web UI 
- fixed
 2013-01-07 18:14:57 -05:00
James 51425d451f Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-07 13:49:09 -05:00
James ecbff94f11 CC-4795: Library -> Playlist: Cannot add Smart Block into Playlist 
- fixed
 2013-01-07 13:48:51 -05:00
denise 82da4dcfe8 CC-4599: Calendar: Add an icon to indicate show is not fully booked 
-done but a new icon is needed
 2013-01-07 12:41:28 -05:00
Daniel James 771b9b9412 Fixed whitespace in Preferences page between 'Timezone' and colon 2013-01-07 11:41:29 +00:00
James 63c847080f CC-4732: Ask for admin username + password in Stream Settings page 
- CRLF
 2013-01-03 18:02:19 -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
denise e2c87ed8b6 CC-4781: Store localization settings on a per-user basis 
-done
 2013-01-03 16:19:02 -05:00
James a1837366be Merge branch 'cc-3018-silence-detection' into devel 2013-01-03 14:08:21 -05:00
James b8f80866cf CC-3018: Automatically strip out silence from audio tracks 
- done
 2013-01-03 14:02:06 -05:00
Martin Konecny d6eb043899 CC-4765: Webstream of AAC type can't be previewed 
-fixed
 2013-01-02 16:09:32 -05:00
James dcdbc3160d CC-4769: Duplicate Playlist: Fade in/out setting doesn't get copied correctly 
- fixed
 2013-01-02 11:41:33 -05:00
Martin Konecny 0596d1c391 Merge branch 'cc-4759-add-aac-stream-in-support' into devel 
Conflicts:
	python_apps/media-monitor2/media/monitor/pure.py
 2012-12-27 17:29:25 -05:00
Martin Konecny ee8dde07c8 add support for AAC input streams 2012-12-27 17:18:47 -05:00
james c0665e4748 CC-4754: Replay gain modifier 
- Initial commit
 2012-12-27 00:36:11 -05:00
denise 127d0187b7 CC-4706: Calendar -> Context menu -> Show content does not work 
-fixed
 2012-12-03 11:45:06 -05:00
denise b2699fa914 merge from devel 2012-12-03 11:06:56 -05:00
denise 2f0c6b702a CC-1960: Internationalize Airtime / Support translations 
- created locale table
- create locale model
- set default locale in pref table
 2012-11-29 18:21:03 -05:00
denise 542434d9f0 CC-1960: Internationalize Airtime / Support translations 
-got rid of spaces at beginning of strings
-removed empty string translations
-overwrote Zend_Validate_Between object error messages
 2012-11-28 16:16:39 -05:00
denise 9acfb6c181 CC-1960: Internationalize Airtime / Support translations 
- overwrote default zend form error messages
 2012-11-27 17:11:29 -05:00
denise 42d535a922 CC-1960: Internationalize Airtime / Support translations 
-unlocalized some strings
 2012-11-27 12:33:43 -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 b677130a3f CC-1960Internationalize Airtime / Support translations 
-added gettext wrapper to strings missing it
-timepicker close button was not getting translated -fixed
 2012-11-23 16:39:41 -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
denise dd0e71efcc CC-1960: Internationalize Airtime / Support translations 
-added gettext wrapper function to all strings missing it
-i18n of jquery timepicker and datepicker
-i18n of jquery datatables columnFilter input place holder labels
 2012-11-22 17:32:24 -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 c0e49b69e2 Merge branch 'devel' into cc-1960-internationalize-airtime 2012-11-21 17:17:53 -05:00
denise 2172ee82d3 Merge branch '2.2.x' into devel 2012-11-21 17:17:32 -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 25ddd083bc CC-1960: Internationalize Airtime / Support translations 
-added language option in preferences
 2012-11-21 12:44:50 -05:00
denise 10b6dd202e Merge branch 'devel' into cc-1960-internationalize-airtime 
Conflicts:
	airtime_mvc/public/js/airtime/playlist/smart_blockbuilder.js
 2012-11-21 11:44:40 -05:00
denise f88a7bdb31 Merge branch '2.2.x' into devel 2012-11-21 10:54:17 -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
Rudi Grinberg 3a682aeada cc-4585: fixed + added logging 2012-11-20 15:25:41 -05:00
Rudi Grinberg 7124cbe04d fixed bug where hidden files would be shown in library 2012-11-20 15:18:41 -05:00
Rudi Grinberg 20855c73b5 refactoring + fix typo 2012-11-20 15:10:38 -05:00
denise a76b9b305f CC-1960: Internationalize Airtime / Support translations 
-added gettext wrapper to all strings in models
 2012-11-20 11:33:37 -05:00
Martin Konecny fed39077c0 Merge branch '2.2.x' into devel 2012-11-20 11:21:29 -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 2b2a1db055 CC-2401: Shuffle option in playlists 
- done
 2012-11-13 17:32:10 -05:00
James 6145f9bcad Merge branch '2.2.x' into devel 2012-11-08 17:28:23 -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
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
James 9112a8d0b1 CC-4661: Listener Statistics 
- enhancement on flot
- data point reduction
 2012-11-07 16:26:31 -05:00
denise ccd6447696 - install failed due to wrong metadata key 
- wrong controller action called
 2012-11-07 12:05:20 -05:00
denise b817684972 Merge branch '2.2.x' into devel 
Conflicts:
	airtime_mvc/application/controllers/PreferenceController.php
	airtime_mvc/application/models/StoredFile.php
	airtime_mvc/public/js/bootstrap/bootstrap.js
 2012-11-07 11:21:36 -05:00
Martin Konecny fd3305bc4c SAAS-289: Remove all isSaaS checks 
-done
 2012-11-06 17:10:47 -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
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
Martin Konecny d467abe509 Merge branch 'cc-4585' of https://github.com/rgrinberg/Airtime into devel 2012-11-05 11:27:34 -05:00
Rudi Grinberg bd3cf543bf made param useless in listAllFiles since its now safe to pass all files to MM 2012-11-05 11:11:05 -05:00
Rudi Grinberg 1c628bd831 renamed displayable to visible 2012-11-05 10:57:18 -05:00
Rudi Grinberg acf954f637 changed hidden check to displayable check 2012-11-05 10:55:54 -05:00
Rudi Grinberg 6e89fdab30 changed file existence checks to displayable 2012-11-05 10:14:49 -05:00
Rudi Grinberg b6341e44b3 removed pointless code duplication 2012-11-05 10:12:03 -05:00
Rudi Grinberg 34248921fc refactored code to use displayable 2012-11-05 10:09:34 -05:00
Rudi Grinberg aa9a6691f2 added a single test for checking if a file should be shown or not 2012-11-05 10:08:29 -05:00
Rudi Grinberg 311c88a8a2 added check for hidden in buildEntry 2012-11-05 09:54:00 -05:00
Rudi Grinberg a62e64969d Removed commented method 2012-11-05 09:49:49 -05:00
Rudi Grinberg 00a4e45491 added check for hidden in buildEntry 2012-11-05 09:47:16 -05:00
Rudi Grinberg 800f8b9ded added criteria to remmove hidden files in blocks 2012-11-05 09:40:58 -05:00
Rudi Grinberg 4522fa94b2 added clause to exclude hidden files from getShowListContent 2012-11-05 09:30:21 -05:00
Rudi Grinberg e01a61208d Merge remote-tracking branch 'sf/2.2.x' into cc-4585 2012-11-05 09:19:20 -05:00
Rudi Grinberg 7e03333496 changed deletion by the user to be setting the file to be hidden instead 2012-11-03 01:33:13 -04:00
Rudi Grinberg 9c4f2e3298 refactored addWatchedDir to use early return style 2012-11-03 01:16:57 -04:00
Rudi Grinberg 5d3aa68c72 written method to unhide all files in a music dir 2012-11-03 01:09:36 -04: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
Rudi Grinberg 5cb83909d8 Merge remote-tracking branch 'sf/2.2.x' into cc-4585 2012-11-02 16:00:09 -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
Rudi Grinberg aec11feba5 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-11-02 14:59:02 -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
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
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
Rudi Grinberg 270eb97128 Merge branch '2.2.x' of dev.sourcefabric.org:airtime into cc-4585 2012-11-01 15:14:53 -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
Rudi Grinberg 4cca80fe44 Added schema changes 2012-10-31 16:23:12 -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