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

1313 Commits

Author SHA1 Message Date
denise 74bc485b4b XSS exploit prevention 
- Calendar - Show Contents
- Playlist tooltip in Library page
- Adding track to a show
- Widgets
- Playlist/Webstream title and description
- Smart block expansion
 2013-02-05 10:56:38 -05:00
Martin Konecny e2472f1f5d CC-4913: System -> Media Folder: Exception happens when media folder's path contains '<' 2013-02-04 16:21:56 -05:00
denise 20a3f674b4 CC-4897: XSS exploit on library page 
-fixed where this was happening on Calendar - show content
 2013-02-04 12:12:57 -05:00
denise d63865625d Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x 2013-02-04 11:06:53 -05:00
denise 1f0b9fa5dc CC-4897: XSS exploit on library page 2013-02-04 11:06:46 -05:00
Martin Konecny 93ec4c001b Merge branch '2.3.x' into devel 
Conflicts:
	airtime_mvc/application/controllers/LibraryController.php
	airtime_mvc/application/models/StoredFile.php
 2013-02-02 21:07:34 -05:00
denise 8309593a0f CC-4904: Library -> Sort by status doesn't work 
- added 2 columns to cc_files (is_scheduled, is_playlist)
- split library status column into two columns (scheduled, playlist)
- is_scheduled gets updated when a track plays out, or when a file gets added/removed from/to a show
- is_playlist gets updated when a file gets added/removed from/to a playlist/block, when a playlist/block gets deleted, or when a playlist/block's contents is cleared
 2013-02-01 17:47:07 -05:00
denise 384298f680 CC-4109: Playlist Builder: Add a button to remove all the items in the current editing playlist 2013-02-01 12:06:01 -05:00
denise d4e89df94e CC-4895: Remove all json die() statements from code 2013-01-31 14:06:45 -05:00
denise 4f5d7869d8 Removed html from Library/contents-feed and StoredFile model 
Added new Library column to indicate if a file is scheduled in the future or belongs to a playlist/smart block
 2013-01-30 15:38:25 -05:00
Martin Konecny 216b580395 Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x 2013-01-30 14:40:47 -05:00
Martin Konecny 52d96241da CC-4754: Replay gain modifier 
-fix regression
 2013-01-30 14:40:29 -05:00
denise 595429e6e5 CC-4897: XSS exploit on library page 
-fixed
 2013-01-30 11:51:27 -05:00
Martin Konecny b15c4569eb CC-4894: Need to filter output for potential XSS exploits 
-fixed few areas
 2013-01-29 15:17:29 -05:00
denise d0a4141ae4 Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x 2013-01-25 12:44:37 -05:00
denise a6f4805e1a CC-4879: Pop-up HTML Audio Player still seems to be changing spaces to %20 and so on... 
-fixed
 2013-01-25 12:44:20 -05:00
Martin Konecny a16e8d05aa -don't push new schedule until end of request 2013-01-25 12:33:27 -05:00
denise 1873022a13 CC-4876: Default interface language setting does not appear to affect text or drop-down menu on login page? 
-fixed
 2013-01-25 11:21:34 -05:00
Martin Konecny c3f2bf57de CC-4873: Airtime takes 7 seconds to load 32K (very small) from db 
-further optimization by looking at the preferred time scale
 2013-01-24 14:02:50 -05:00
Martin Konecny 2f3a30b580 CC-4873: Airtime takes 7 seconds to load 32K (very small) from db 
-we know what month will be the initial view for the user.
-Provide this data ahead of time via ajax request
 2013-01-24 12:52:24 -05:00
Martin Konecny 091f5ff49f CC-4873: Airtime takes 7 seconds to load 32K (very small) from db 
-we know what month will be the initial view for the user.
-Provide this data ahead of time.
 2013-01-24 12:13:55 -05:00
Martin Konecny 548b73db42 CC-4873: Airtime takes 7 seconds to load 32K (very small) from db 
-remove an unnecessary roundtrip to server
 2013-01-23 18:31:45 -05:00
Martin Konecny 5d56341757 baseUrl is set incorrectly for previewing tracks 2013-01-21 19:32:00 -05:00
James dfa392d914 CC-4868: Replay gain modifier is not setting the correct value 
- fixed
 2013-01-18 17:29:38 -05:00
denise e0efaea0c9 CC-4867: Library -> Audio preview doesnt work with airtime in subdirectory 
-fixed
 2013-01-18 17:10:52 -05:00
James ed7b22118c Merge branch 'silan-script' into devel 2013-01-18 11:54:10 -05:00
James f70ca93b53 CC-4841: Silan script 
done
 2013-01-18 11:53:26 -05:00
denise 94a87a0b2e Smart block tooltip content breaks when language setting is not english 2013-01-17 16:19:35 -05:00
denise 796099b413 CC-4860: Library -> Context Menu -> Can't download files 
-fixed
 2013-01-17 13:37:32 -05:00
denise f7e8fd33fd CC-4848: Streaming server passwords should be hidden with dots, once entered 
-fixed
 2013-01-16 14:36:56 -05:00
denise a85b394d63 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-14 17:02:05 -05:00
denise 692c1a1c9e CC-4838: I18N: HTML contents of Print preview for Playout History need to be translated 
-fixed
 2013-01-14 17:01:50 -05:00
James 9ae3559305 Merge branch 'cc-4384-remove-table-calling-with-cc-config' into devel 
Conflicts:
	airtime_mvc/application/Bootstrap.php
 2013-01-14 16:19:51 -05:00
James 5a97fb69f2 CC-4384: Remove annoying usage of $CC_CONFIG 
- done
 2013-01-14 16:16:14 -05:00
Martin Konecny 0dfd8acf7a Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-14 16:00:46 -05:00
Martin Konecny fae3f3a03f CC-2184: Hardcoded CSS path should be relative path instead 
-Make '/' the default root
 2013-01-14 16:00:38 -05:00
denise 8ea3aca3a0 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-14 14:07:55 -05:00
James cf09175ff1 CC-4796: Listener Stat: Authentication exception happens but no warning message on UI. 
- done
 2013-01-14 13:57:32 -05:00
James 891e993cd1 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-14 13:56:24 -05:00
James d4124f916d CC-4796: Listener Stat: Authentication exception happens but no warning message on UI. 
- done
 2013-01-14 13:56:00 -05:00
denise 2c3e79e842 CC-4832: I18N: Tool tip for show is partially filled in Calendar page is not translated 
-fixed
 2013-01-14 13:53:27 -05:00
denise 1e6b0fe6ae CC-4833: I18N: Alert message "Please select a cursor posion from timeline." in Now playing page is not translated 
-fixed
 2013-01-14 13:47:41 -05:00
denise 83be01d0d0 CC-4835: I18N: "Copy of ..." from Duplicating playlist would better be translated 
-fixed
 2013-01-14 13:42:17 -05:00
James 1666a04451 CC-4826: Please re-push the liquidsoap queue if updating Replay Gain settings 
- done
 2013-01-14 11:28:48 -05:00
denise 8362860904 Block expansion ajax url was missing baseUrl 2013-01-11 14:11:01 -05:00
James dcf3526000 CC-4384: Remove annoying usage of $CC_CONFIG 
- done
 2013-01-10 18:09:00 -05:00
James 55fa8b8dc1 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-10 14:52:45 -05:00
denise 9f857433fa CC-4817: I18N: "Playlist Shuffled" is not listed for translation 
-fixed
 2013-01-10 14:22:25 -05:00
denise a0be1c647e CC-4786: Refresh page when language setting changes 
-configure localization and reinitiliaze edit user form after the user locale is set
 2013-01-10 14:01:03 -05:00
denise 2797809c74 CC-4786: Refresh page when language setting changes 
-done
 2013-01-10 13:55:52 -05:00
James 048ee05030 CC-4821: Add option to disable ReplayGain 
- done
 2013-01-10 13:49:41 -05:00
denise 0aeea61006 CC-4822: Cannot preview playlist 
-fixed
 2013-01-10 10:52:39 -05:00
denise 1572955d07 CC-4810: Add language setting to login page 
-done
 2013-01-09 18:03:23 -05:00
denise db62b538dd CC-4816: Timezones should be a user preference 
-done
 2013-01-09 13:38:38 -05:00
denise f887ca3d8d CC-4813: Users -> Do not save username on User Management page 
-fixed
 2013-01-09 13:25:18 -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
denise 9755ea6a20 CC-4814: System->Streams: Tool tips' content of output stream's admin user field is not listed in airtime.po file 
-fixed
 2013-01-08 16:47:00 -05:00
denise 87bfc81ca0 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-08 15:53:33 -05:00
denise 6097196dd7 CC-4813: Users -> Do not save username on User Management page 
-fixed
 2013-01-08 15:52:56 -05:00
Martin Konecny 1ee90ed9b9 CC-4790: Media Monitor: Re-added files won't show up in Library 
-fixed
 2013-01-08 15:42:35 -05:00
Martin Konecny 178abcfada CC-4785: Zend errors on page not found 
-partially fixed
 2013-01-08 15:14:33 -05:00
denise f308305df8 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-07 18:18:59 -05:00
denise a65e72941f CC-4805: Localization -> Changing default language changes datatables and add media language setting 
-fixed
 2013-01-07 18:18:40 -05:00
James 6e241fd3ec CC-4512: Allow changing stream "Offline" message via Web UI 
- fixed
 2013-01-07 18:14:57 -05:00
James 0542e713ed CC-4794: Library: Please disable "Duplicate playlist" option for Smart Block's context menu 
- fixed
 2013-01-07 12:20:07 -05:00
denise 32fd92c892 CC-4787: Edit User: Don't save username field 
-fixed
 2013-01-04 11:38:49 -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 25df87d2e5 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-02 16:09:39 -05:00
Martin Konecny d6eb043899 CC-4765: Webstream of AAC type can't be previewed 
-fixed
 2013-01-02 16:09:32 -05:00
denise 88f2f1e4a7 CC-4773: L10N: Some strings is not listed in airtime.po 
-fixed
 2013-01-02 16:04:19 -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
James f26778ee72 CC-4757: Duplicate playlist 
- done
- we still need a icon for context menu
 2012-12-28 16:17:58 -05:00
james cf38e2c596 CC-4754: Replay gain modifier 
- done
 2012-12-27 22:58:41 -05:00
james c0665e4748 CC-4754: Replay gain modifier 
- Initial commit
 2012-12-27 00:36:11 -05:00
denise 274b1f7562 CC-4743: Make user rights description localizable 2012-12-17 16:53:43 -05:00
denise dd5882984e CC-4736: Let non-admin users update their user info 
-done but needs design
 2012-12-10 16:55:44 -05:00
denise 062740ef81 CC-4735: Library: Edit metadata selection should be a popup instead of going to a new page 
-done
 2012-12-05 13:16:25 -05:00
denise 1846f17bbc CC-4731: Cannot save support feedback settings 2012-12-04 16:21:45 -05:00
denise ee086fe43a CC-4730: Support Feedback: Errors are displayed when they shouldn't be 2012-12-04 14:46:06 -05:00
denise 89e0458500 CC-4728: Support Feedback save action does not use ajax 
-done
 2012-12-03 17:15:47 -05:00
denise b2699fa914 merge from devel 2012-12-03 11:06:56 -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 9689c75bed CC-1960: Internationalize Airtime / Support translations 
-added i18n to serverbrowser.js
-fixed small typo in SmartBlockCriteria.php
 2012-11-28 11:54:22 -05:00
denise c4062f7770 CC-1960: Internationalize Airtime / Support translations 
-fixed javascript strings
 2012-11-27 12:31:21 -05:00
denise c6a5db4a78 CC-1960: Internationalize Airtime / Support translations 
-dashboard was missing a translation - fixed
 2012-11-23 10:48:44 -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
denise 96b87d23e0 CC-1960: Internationalize Airtime / Support translations 
-added i18n for plupload
 2012-11-22 14:37:54 -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 10cd31fa56 CC-1960: Internationalize Airtime / Support translations 
- channged all js strings with embedded variables to use sprintf
 2012-11-20 17:42:26 -05:00
denise 9762511693 Merge branch 'cc-1960-internationalize-airtime' of dev.sourcefabric.org:airtime into cc-1960-internationalize-airtime 
Conflicts:
	airtime_mvc/application/Bootstrap.php
	airtime_mvc/application/controllers/LocaleController.php
	airtime_mvc/application/views/scripts/library/library.phtml
	airtime_mvc/application/views/scripts/playlist/playlist.phtml
	airtime_mvc/public/js/airtime/schedule/full-calendar-functions.js
 2012-11-20 16:56:18 -05:00
denise f40d1f8dd4 CC-1960: Internationalize Airtime / Support translations 
-enabled i18n for datatables, colVis, columnFilter, and fullCalendar
-fixed typos in full-calendar-functions.js
 2012-11-20 16:40:02 -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 57fdab0ddf CC-1960: Internationalize Airtime / Support translations 
-added i18n jquery library
-created a Locale controller that returns a js dictionary of translations needed in js
-added jquery i18n wrapper function to all strings in js
 2012-11-20 11:33:37 -05:00
denise 2ce530c5bd CC-1960: Internationalize Airtime / Support translations 
- fix to some controller strings
 2012-11-20 11:33:37 -05:00
denise 5adadc2e91 CC-1960: Internationalize Airtime / Support translations 
- added gettext wrapper function to all strings in controllers
 2012-11-20 11:33:37 -05:00
denise 8c49540d3d CC-1960: Internationalize Airtime / Support translations 
-added i18n jquery library
-created a Locale controller that returns a js dictionary of translations needed in js
-added jquery i18n wrapper function to all strings in js
 2012-11-20 11:16:10 -05:00
denise d7495c6937 CC-1960: Internationalize Airtime / Support translations 
- fix to some controller strings
 2012-11-15 14:05:36 -05:00
denise 105325994f CC-1960: Internationalize Airtime / Support translations 
- added gettext wrapper function to all strings in controllers
 2012-11-15 12:55:45 -05:00
James 2b2a1db055 CC-2401: Shuffle option in playlists 
- done
 2012-11-13 17:32:10 -05:00
denise c0e54c64cd CC-4685: System -> User: Unique username error 
-fixed
 2012-11-12 12:29:07 -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 bd482a0a75 CC-4583: Use AJAX calls instead of refreshing entire page 
-fixed
 2012-11-07 15:17:47 -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
James 9712e64a69 CC-4661: Listener Statistics 
- bug fix and removing unnecessary code
 2012-11-06 14:52:35 -05:00
denise c605c97268 CC-4455: "Add to current smart block" context menu action should be disabled for dynamic smart blocks 
-disabled this option from context menu
 2012-11-06 14:33:34 -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 e01a61208d Merge remote-tracking branch 'sf/2.2.x' into cc-4585 2012-11-05 09:19:20 -05:00
Rudi Grinberg 5d3aa68c72 written method to unhide all files in a music dir 2012-11-03 01:09:36 -04:00
Martin Konecny 9609a4e220 Merge branch 'cc-4652' of https://github.com/rgrinberg/Airtime into devel 
Conflicts:
	airtime_mvc/application/controllers/LibraryController.php
	airtime_mvc/application/views/scripts/library/library.phtml
	airtime_mvc/public/js/airtime/showbuilder/main_builder.js
 2012-11-02 20:16:54 -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 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 3af3cd5870 CC-4661: Listener Statistics 
- frontend part
 2012-11-02 17:00:38 -04:00
Rudi Grinberg 2ae3c0ac03 Line wrapping 2012-11-02 16:06:12 -04:00
Rudi Grinberg 1111fd8163 align 2012-11-02 16:04:47 -04:00
Rudi Grinberg ac9b47f5e2 made rescanWatchDirectoryAction more concise 2012-11-02 16:02:05 -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
Rudi Grinberg 226bdbf738 added todo 2012-10-31 17:41:50 -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
james 9293a26738 CC-4639: Give an option to allow smart blocks to reuse tracks if not enough 
tracks meet the time limit

- code optimazation
 2012-10-31 12:05:17 -04:00
James 9d495ebc03 CC-4639: Give an option to allow smart blocks to reuse tracks if not enough tracks meet the time limit. 
- done
 2012-10-30 17:57:58 -04:00
Rudi Grinberg dc00528cd5 Merged baseUrl related conflicts 2012-10-29 11:56:20 -04:00
denise 3a7700eaac CC-4583: Use AJAX calls instead of refreshing entire page 
-done
 2012-10-26 18:09:30 -04:00
James 58535bef88 CC-4580: No contents in rebroadcast show 
- fixed
 2012-10-19 16:40:32 -04:00
denise 2527fa2e1a CC-2184: Hardcoded CSS path should be relative path instead 2012-10-19 14:42:01 -04:00
denise 7d8079f770 Merge branch '2.2.x' into devel 
Conflicts:
	airtime_mvc/application/controllers/ShowbuilderController.php
	airtime_mvc/public/js/airtime/audiopreview/preview_jplayer.js
	airtime_mvc/public/js/airtime/common/common.js
 2012-10-19 12:50:36 -04:00
denise 3b5ec6fbe0 CC-2184: Hardcoded CSS path should be relative path instead 2012-10-19 11:46:18 -04:00
denise d32495d100 CC-2184: Hardcoded CSS path should be relative path instead 2012-10-19 11:09:34 -04:00
James 45801e5dc4 - fix spelling of some function name 2012-10-17 15:16:03 -04:00
denise 2b1db835dd CC-4571: Now Playing delete action does not delete, should be labelled 'Remove from show' 
-done
 2012-10-16 16:01:05 -04:00
James 8a93717415 CC-4568: Show preview broken in Now Playing page 
- fixed
 2012-10-16 11:06:01 -04:00
denise 9d3271c03d CC-4562: Calendar: Add Show button is removed after editing a show from regular show to repeating show 
-fixed
 2012-10-15 15:36:38 -04:00
denise c95050c04c CC-4546: Library->Context view for playlist: It only displays "..." instead of Static smart block's name 
-fixed
 2012-10-10 15:06:30 -04:00
Rudi Grinberg 89ed6925df removed benchmarking 2012-09-19 16:36:04 -04:00
Rudi Grinberg 20b79374e2 Removed empty method 2012-09-19 10:25:29 -04:00
Rudi Grinberg 33be48e9e3 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-18 18:21:00 -04:00
Rudi Grinberg a9eefe21fa cc-4304: Add call to save after each file reassignment 2012-09-18 18:20:33 -04:00
denise 92b40bea0c CC-4484: Some js files do not have the airtime version appended 
-fixed
 2012-09-18 17:43:13 -04:00
Martin Konecny b69f3288d3 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-18 17:22:22 -04:00
Martin Konecny 6420e6a830 remove trailing whitespace 2012-09-18 17:22:14 -04:00
James be214ac126 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-18 15:47:48 -04:00
James eecc90547d CC-4461: Now Playing: Timeline does not reflect the changes on Show start time (which is changed from Calendar->Edit Show) 
- fixed
 2012-09-18 15:47:37 -04:00
Rudi Grinberg 72e6ee35fa cc-4304: Temporarily fixed 2012-09-18 15:26:43 -04:00
Martin Konecny 09bc686d99 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-18 12:41:30 -04:00
Martin Konecny b0f2176329 fix some TODO's in webstream.php 2012-09-18 12:40:44 -04:00
Rudi Grinberg 6fc0d50c9f lined up 2012-09-18 11:46:35 -04:00
Rudi Grinberg 018b50d316 added better logging 2012-09-18 11:45:10 -04:00
Rudi Grinberg 0a83b33a5a Removed extra logging statements 2012-09-18 11:10:54 -04:00
Rudi Grinberg 49e1b29bc9 Removed instances of getLine and getFile 2012-09-18 11:04:33 -04:00
Rudi Grinberg 2e0e0849c5 More clean up 2012-09-18 11:03:34 -04:00
Rudi Grinberg d90559fdf8 Cleaned up ShowbuilderController 2012-09-18 11:02:41 -04:00
Rudi Grinberg 9c5ebdc4c0 Removed old commented code 2012-09-17 17:02:59 -04:00
Martin Konecny 0e82083ba1 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-17 15:55:53 -04:00
Rudi Grinberg 1a29499bb8 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-17 15:48:09 -04:00
James 54b6b12ec0 CC-4094: Dashboard -> Source Info panel: DJ assigned to current show can turn off the Master Resouce but cannot disconnect it. 
- fixed
 2012-09-17 15:41:27 -04:00
Rudi Grinberg 4f576afc00 cc-4396. Initial fix problem was a module was not being included in the soundcloud upload script. 2012-09-17 15:24:02 -04:00
Martin Konecny 54bb414500 CC-4318: Widgets: Weekly show cannot show the schedule 
-fixed
 2012-09-17 14:56:34 -04:00
Rudi Grinberg 92a5bf51a6 Added warning for uploading unknown file types 2012-09-17 12:45:33 -04:00
Rudi Grinberg 048da282fa Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-17 12:36:57 -04:00
Rudi Grinberg 2337078dd8 Cleaned up unused variables. Formatted some lines. 2012-09-17 12:35:12 -04:00
Martin Konecny 5d0592c729 CC-4454: Show deleting: if you do 'delete this instance and all following', it doesn't remove entries from cc_schedule table 
-fixed
 2012-09-17 12:32:39 -04:00
Martin Konecny ab99e64e8a Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-17 11:13:44 -04:00
Rudi Grinberg f6967ac575 Added Martin's fix 2012-09-17 11:03:36 -04:00
Martin Konecny 7fed5bcd18 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-17 10:57:19 -04:00
Rudi Grinberg a664e7f74a Removed extra comments 2012-09-17 10:30:55 -04:00
Rudi Grinberg 1c2cebf5a8 Removed comment 2012-09-17 10:27:12 -04:00
Rudi Grinberg f809a17c02 Formatting 2012-09-14 19:05:30 -04:00
Martin Konecny be80eeb5fd CC-4404: restart airtime-liquidsoap will interrupt the output stream and never resume until restart playout engine 
-fixed
 2012-09-14 18:20:46 -04:00
Rudi Grinberg 2faf299c73 Removed code duplication 2012-09-14 17:28:50 -04:00
Rudi Grinberg 092595eb9f Removed profane logging message 2012-09-14 17:10:10 -04:00
Rudi Grinberg f2b07e4a83 alignment 2012-09-14 17:02:38 -04:00
Rudi Grinberg 67483f8bb2 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-14 17:01:45 -04:00
Rudi Grinberg 81dadb7f85 Removed annoying logging 2012-09-14 17:01:35 -04:00
Martin Konecny 39903be69a Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-14 16:51:48 -04:00
Martin Konecny 3ced92db7a CC-4415: Smart Block audio preview doesn't work 2012-09-14 16:51:14 -04:00
Rudi Grinberg bf651a96aa cc-4431: Fixed isUserType 2012-09-14 16:47:55 -04:00
Rudi Grinberg ba08355c38 quick fix 2012-09-14 16:16:52 -04:00
Rudi Grinberg 76ba4bb6f0 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-14 16:03:03 -04:00
Rudi Grinberg 05916a4d26 Code cleanup 2012-09-14 15:13:08 -04:00
Martin Konecny 198d15adc8 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-14 14:53:32 -04:00
Martin Konecny 78460703a2 CC-4434: Make Application_Model_Preference::getValue and setValue private methods 
-done
 2012-09-14 14:53:25 -04:00
Rudi Grinberg 79ce7b572c cc-4202: Fixed 2012-09-14 14:51:50 -04:00
Martin Konecny 239a228175 CC-4434: Make Application_Model_Preference::getValue and setValue private methods 
-small fix
 2012-09-14 14:36:31 -04:00
Martin Konecny e3c1a3ac0e CC-4434: Make Application_Model_Preference::getValue and setValue private methods 
-initial commit
 2012-09-14 12:09:40 -04:00
Martin Konecny d534f22ce4 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-13 16:11:15 -04:00
Martin Konecny 505b53fa16 cc-1665: fix broken checkin for webstream 2012-09-13 16:11:06 -04:00
Rudi Grinberg 410a3406af Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-13 15:05:48 -04:00
Rudi Grinberg 8d08aa888b cc-4421: Added special handling for files that mutagen returns None for. 2012-09-13 14:54:52 -04:00
James b2d61f2402 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-13 14:22:27 -04:00
James 2293fcda01 CC-4393: Please ignore Flac items for Playlist Preview and disable to preview it as a single track 
- fixed
 2012-09-13 14:22:13 -04:00
Rudi Grinberg 4137602116 Cleaned up API controller 2012-09-13 14:21:15 -04:00
Rudi Grinberg 8a2703c50d Made method static 2012-09-13 12:33:15 -04:00
Rudi Grinberg 2b9e6081a4 Added log for exception 2012-09-13 12:27:04 -04:00
Rudi Grinberg e043816bf4 Removed superfluous logging 2012-09-13 12:23:48 -04:00
Rudi Grinberg 3fb7526fbb Shortened logging 2012-09-13 12:15:51 -04:00
Rudi Grinberg b28116f622 removed empty space 2012-09-13 11:34:00 -04:00
Rudi Grinberg d564b85e7c Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-13 11:12:32 -04:00
denise a779142a08 -fix commenting error 2012-09-13 11:12:39 -04:00
Rudi Grinberg e2f8d8e0e7 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-13 11:10:43 -04:00
Rudi Grinberg d409af2876 shortened logging 2012-09-13 11:07:29 -04:00
Rudi Grinberg dced49c425 Removed unused variable 2012-09-13 10:52:58 -04:00
Rudi Grinberg 55993352bf Removed unused variables. 2012-09-13 10:35:24 -04:00
denise e1403d45bd CC-4368: Unused local variables in Airtime Controllers. Should be removed. 
-done
 2012-09-13 10:32:33 -04:00
Martin Konecny 1f3bab2458 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-12 23:06:19 -04:00
Rudi Grinberg cc88a9a8e3 Fixed a lot of unused variables 2012-09-12 18:36:27 -04:00
Martin Konecny 1c293839da CC-4393: Please ignore AAC and Flac items for Playlist Preview and disable to preview it as a single track 
-disable preview icon
 2012-09-12 17:32:19 -04:00
Martin Konecny 20f5fe6480 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 
Conflicts:
	airtime_mvc/application/models/Block.php
	airtime_mvc/public/css/styles.css
 2012-09-12 15:55:43 -04:00
Martin Konecny 87fb9998dd increase mem warning limit to 30MB 2012-09-12 15:44:26 -04:00
Rudi Grinberg 975830ff90 Removed wrong comments 2012-09-11 18:22:24 -04:00
Rudi Grinberg e2d69df4a6 Removed unused code 2012-09-11 17:51:39 -04:00
Rudi Grinberg dc91db1f46 formatting 2012-09-11 17:48:08 -04:00
Rudi Grinberg bc5718ec09 logging removed 2012-09-11 17:39:28 -04:00
Rudi Grinberg cc3ba90ec3 added debugging 2012-09-11 17:32:26 -04:00
Rudi Grinberg b8db419717 All hands for America. Added robust debugging 2012-09-11 17:23:07 -04:00
Rudi Grinberg fc8b2096af Added debugging for Clifford 2012-09-11 17:21:20 -04:00
Rudi Grinberg 728a0dd736 Added todo documenting slight inefficiency 2012-09-11 16:24:59 -04:00
Rudi Grinberg e664707076 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-11 16:03:01 -04:00
Rudi Grinberg 355b0ad35d cc-4292: Initial fix of the MD5 issue. Now MD5's are only collected not really used for anything. Moves are handled completely 
through paths.
 2012-09-11 16:02:39 -04:00
denise bc355fe7a7 - webstream controller wasn't assigning webstream object properly 2012-09-11 15:10:30 -04:00
denise 8af91f3901 -webstream controller wasn't setting webstream object properly 2012-09-11 15:02:12 -04:00
Martin Konecny 1635842b81 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-11 00:51:08 -04:00
Martin Konecny 8db4c94af1 CC-4389: Convert all PHP errors to throw exceptions instead 
-echo to stdout as well
 2012-09-11 00:50:56 -04:00
James 585ee579d6 CC-4005: Tag files with Last Played date and number of times played 
- fixed CRLF
 2012-09-10 18:07:12 -04:00
James 645593f954 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 
Conflicts:
	airtime_mvc/application/controllers/ApiController.php
	airtime_mvc/application/models/Webstream.php
 2012-09-10 18:04:35 -04:00
James ba37bb4327 CC-4005: Tag files with Last Played date and number of times played 
- done for files and webstreams
 2012-09-10 18:01:36 -04:00
Martin Konecny 87ac1744f7 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-10 16:54:51 -04:00
Martin Konecny 5292137430 -return json as data type for schedule action 2012-09-10 16:54:42 -04:00
Rudi Grinberg 43bef4939e Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-10 16:30:38 -04:00
Rudi Grinberg 4fe8407659 Adde configurable value for list_all_files 2012-09-10 16:29:17 -04:00
Rudi Grinberg c90ead9ef2 cc-4359: fixed at the cost of other issues that will be fixed later (restarting media monitor). 2012-09-10 16:08:08 -04:00
James dfb1ffed79 CC-4319: Calendar: Remove all contents doesn't work 
- fixed
 2012-09-10 15:42:05 -04:00
Martin Konecny 33035a4212 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-07 17:38:35 -04:00
Martin Konecny d20c450226 CC-4370: Transitioning between two webstreams a hiccup in the stream is audible 
-some major refactoring before fixing this problem
 2012-09-07 17:38:24 -04:00
Rudi Grinberg a8e7cb392a Sexification 2 2012-09-07 16:59:35 -04:00
Martin Konecny 3c0541f138 fix function camelcase 2012-09-07 16:50:33 -04:00
Rudi Grinberg 87787081ce Removed unused optional argument. 2012-09-07 16:26:05 -04:00
Martin Konecny 089e896552 fix camelCase of function 2012-09-07 14:34:58 -04:00
denise 33fe2f3467 CC-4351: Library->Deletion of Smart Block and saving it leads to "Processing" message being displayed for a while 
-fixed
 2012-09-06 14:10:50 -04:00
Rudi Grinberg 744577a8b5 Removed bad line break 2012-09-06 12:38:55 -04:00