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

974 Commits

Author SHA1 Message Date
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
Rudi Grinberg 3f898bfc3a Fixed wrong function name 2012-09-06 12:33:04 -04:00
Rudi Grinberg f4591f825f Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-06 12:17:39 -04:00
Rudi Grinberg 56527e727c extra debuggin 2012-09-06 12:17:18 -04:00
denise 8d1003bbbe CC-4303: Library Tab grays out after certain scenario with normal playlist 
-fixed
 2012-09-06 11:48:00 -04:00
Rudi Grinberg bed360cd3e Formatting 2012-09-06 11:15:01 -04:00
Rudi Grinberg c1bc50c1db Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-05 16:56:14 -04:00
Rudi Grinberg 80fa090f13 Uncommented old line of code perhaps it's useful 2012-09-05 16:39:58 -04:00
denise 8ec9ccedf3 CC-4358: Calendar: Show Content: Undefined Index 
-fixed
 2012-09-05 16:07:40 -04:00
Rudi Grinberg f86fa8f945 gotten rid of annoying logging 2012-09-05 15:38:43 -04:00
Rudi Grinberg 579180301a Removed stat caching to make sure is_file is accurate 2012-09-05 15:05:50 -04:00
Martin Konecny a731fc147b CC-4348: Prepared statements - part 4 
-fixed Show.php
 2012-09-04 13:34:05 -04:00
denise 15f750eca5 CC-4248: Playlist Builder: 'Something went wrong' error message when dragging playlist into playlist 
-included webstreams in the allowance type list in the error message
 2012-09-04 11:29:23 -04:00
Martin Konecny cad0a8fbd7 CC-1665: Scheduled stream rebroadcasting and recording 
-make sure webstream length is properly updated in browser view after editing
 2012-08-31 13:01:22 -04:00
Rudi Grinberg a0a4094332 cc-4304: Small refactoring 2012-08-30 16:00:14 -04:00
Rudi Grinberg 417997e617 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-30 15:23:24 -04:00
Rudi Grinberg a11ec08154 cc-4304: Implemented default behaviour to cascade delete all the files 2012-08-30 15:23:12 -04:00
Martin Konecny 010ba63d59 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-30 14:37:08 -04:00
Martin Konecny 7eefbf3e24 CC-4311: On Air button gets greyed out few seconds after show starts 
-additional debug info
 2012-08-30 14:36:55 -04:00
Rudi Grinberg ea2595d70f Documeneted funny quirk related to creating a password 2012-08-30 12:26:36 -04:00
Martin Konecny 7f8b5ab92e Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-29 17:40:07 -04:00
Martin Konecny 859445c766 CC-3301: Add ability to switch stereo/mono stream in stream settings 
-fixed
 2012-08-29 17:39:24 -04:00
denise b75f2ab9c7 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-29 16:13:30 -04:00
denise 80258f1fb7 CC-4302: Library : Deletion of newly created Smart Block does not prevent you from editing it which leads to small hang up 
-fixed for dragging tracks into deleted blocks
 2012-08-29 16:13:18 -04:00
denise 7c79aad5f4 CC-4302: Library : Deletion of newly created Smart Block does not prevent you from editing it which leads to small hang up 
-removed unnecessary exception catch
 2012-08-29 16:04:40 -04:00
denise fe48780932 CC-4302: Library : Deletion of newly created Smart Block does not prevent you from editing it which leads to small hang up 
-fixed
 2012-08-29 16:00:58 -04:00
Rudi Grinberg f483e271f6 formatting 2012-08-29 14:50:10 -04:00
Rudi Grinberg af3cea464b Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-29 12:58:06 -04:00
denise 46a6a5fc30 CC-4312: Smart Block: Please don't save the change of title when there is any warning after click 'Save' 
-added in saving behaviour for regular playlists
 2012-08-29 12:05:41 -04:00
Rudi Grinberg e796d4c03d MM2: equal signs sexified 2012-08-29 11:39:42 -04:00
denise 5effb253bf CC-4312: Smart Block: Please don't save the change of title when there is any warning after click 'Save' 
-done
 2012-08-29 11:38:47 -04:00
Martin Konecny 8b5f94fa9f Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-29 11:05:14 -04:00
Martin Konecny 699a49a103 CC-4090: Make code style PSR compliant - part 4 
-controllers dir
 2012-08-29 10:54:36 -04:00
denise 3d20ded170 CC-4307: Add "Never show again" to the pop-up registration prompt 
-done
 2012-08-28 17:30:34 -04:00
Rudi Grinberg c67ad44699 Merge branch 'cc-4274' into devel 2012-08-28 17:25:11 -04:00
Martin Konecny 481616a0d6 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-28 17:22:57 -04:00
Martin Konecny a0ad9a91ea CC-1665: Scheduled stream rebroadcasting and recording 
-Better error logging
-convert minutes > 59 into hours
 2012-08-28 17:22:48 -04:00
Rudi Grinberg 05908d121f cc-4274: Fixed bad table name. 2012-08-28 16:23:16 -04:00
Rudi Grinberg 33bb4e600c cc-4274: implemented james' hack to fix this issue. 2012-08-28 16:23:16 -04:00
denise 7ee68c55e0 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-28 16:17:46 -04:00
denise 9d90e8c531 CC-4300: System -> Preference: Please add a option let user choose if the SMTP server requires User Authentication 
-done
 2012-08-28 16:17:37 -04:00
Martin Konecny 8249ea8816 CC-1665: Scheduled stream rebroadcasting and recording 
-small optimization for user auth
 2012-08-28 12:38:13 -04:00
Martin Konecny 219fba9bee Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-28 12:30:45 -04:00
Martin Konecny fc67d7f08d CC-1665: Scheduled stream rebroadcasting and recording 
-allow user more flexibility for entering length interval (require hours OR minutes)
 2012-08-28 12:30:33 -04:00
denise 69b61c4cfe CC-4285: Playlists-> Smart Block - displays that certain amount meets the criteria while no criteria is specified 
-fixed
 2012-08-28 12:13:58 -04:00
Rudi Grinberg 7f66bdbb66 cc-4301: Fixed bug where owner_id would be null whenever show is recorded. 2012-08-27 17:58:09 -04:00
Rudi Grinberg 583d3837be cc-3936: formattingk 2012-08-27 17:15:38 -04:00
Rudi Grinberg 57020b6e3b cc-3936: Added warning whenever files that don't exist in db are requested to be deleted. 2012-08-27 16:50:22 -04:00
Martin Konecny 3fb0fbd73f CC-4291: Adding webstreams: Need ability to parse webstreams from .m3u and .xspf urls 
-fixed
 2012-08-24 19:25:19 -04:00
denise 54db68bb26 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-24 12:40:39 -04:00
denise dc8e3da6db CC-4283: Password Reset: Please let user input username they want to reset 
-done
 2012-08-24 12:40:30 -04:00
Rudi Grinberg dcc9c58577 cc-3936: Sexified equal signs. 2012-08-24 10:20:59 -04:00
Rudi Grinberg 36b344a910 cc-3936: remove unneeded garbage. 2012-08-24 10:20:59 -04:00
Martin Konecny a9cf597f14 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-23 15:04:38 -04:00
Martin Konecny ea58ae9cc8 -remove unecessary logging 2012-08-23 15:03:59 -04:00
James a4c579f36e CC-4254: Library: advanced search on library 
- bug fix
 2012-08-23 10:59:34 -04:00
denise 38173bd3a2 - small fix 2012-08-23 10:19:00 -04:00
Martin Konecny 442c156458 CC-1665: Scheduled stream rebroadcasting and recording 
-fixed context menu for webstreams
 2012-08-22 16:08:51 -04:00
Martin Konecny fe1aa7a169 CC-1665: Scheduled stream rebroadcasting and recording 
-fixed syntax error
 2012-08-22 15:56:18 -04:00
Martin Konecny 8573dcb870 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-22 15:35:09 -04:00
Martin Konecny 91f13a6279 CC-1665: Scheduled stream rebroadcasting and recording 
-current Library session object should not be stored as a property of the Controller class.
-fixed
 2012-08-22 15:34:59 -04:00
Rudi Grinberg e9bc0074c0 cleaned up ApiController.php a little bit. 2012-08-22 14:38:48 -04:00
Martin Konecny c8c257a330 CC-1665: Scheduled stream rebroadcasting and recording 
-change behaviour so that the webstream is not saved as soon as it it created.
 2012-08-22 14:04:01 -04:00
Martin Konecny 24988616b3 CC-1665: Scheduled stream rebroadcasting and recording 
-current Library session object should not be stored as a property of the Controller class.
-fixed
 2012-08-22 14:03:11 -04:00
Martin Konecny cef3ffb07b CC-4265: Keep track of how much memory each request is taking and log if over a threshold 
-fixed
 2012-08-22 14:01:44 -04:00
Martin Konecny ea4567f373 Make user functions work more consistently 
isHost didn't work similar to isPM or isAdmin
 2012-08-22 13:59:37 -04:00
Martin Konecny 9885374d34 CC-1665: Scheduled stream rebroadcasting and recording 
-more work to make webstreams behave like playlist creator
 2012-08-21 18:55:38 -04:00
Martin Konecny 462542bf68 change Logging::log to Logging::info 2012-08-21 18:41:56 -04:00
Martin Konecny 15eae0698b Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-21 16:55:17 -04:00
Martin Konecny ecfc27431a CC-1665: Scheduled stream rebroadcasting and recording 
-verify user that is deleting has current permissions
 2012-08-21 16:54:41 -04:00
Martin Konecny a1b91aebbd CC-1665: Scheduled stream rebroadcasting and recording 
-use sessions to determine currently open object in Library
 2012-08-21 16:54:14 -04:00
denise 2cdaa186e3 CC-4257: Smart Block: Admin cannot delete DJ user's block 
-fixed
 2012-08-21 15:42:44 -04:00
Martin Konecny 51ebae3de9 Make sure we are using the Library controller for the Library page 2012-08-21 11:12:33 -04:00
Martin Konecny 47852bce2a indentation fixes 2012-08-21 10:50:24 -04:00
Martin Konecny 179aa3d739 CC-1665: Scheduled stream rebroadcasting and recording 
-Show meaningful page after webstream is deleted
 2012-08-21 10:50:18 -04:00
Martin Konecny 337e5fec8a Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-20 18:36:32 -04:00
Martin Konecny 3230f14231 CC-1665: Scheduled stream rebroadcasting and recording 
-Fixed delete button on right side of library screen not working
 2012-08-20 18:35:10 -04:00
Martin Konecny d517bf6e19 fix indentation and remove \r characters 2012-08-20 18:29:57 -04:00
James a24da9e324 CC-4256: Smart Playlist: change name to smart block and etc 
- done
 2012-08-20 17:17:48 -04:00
Martin Konecny 398fbb04db CC-1665: Scheduled stream rebroadcasting and recording 
-don't show delete button until a stream has been saved
 2012-08-17 17:29:17 -04:00
Martin Konecny 4216440670 CC-1665: Scheduled stream rebroadcasting and recording 
-previewing streams have NaN:NaN:NaN as length
 2012-08-17 16:51:23 -04:00
denise 817fe13533 CC-4248: Playlist Builder: 'Something went wrong' error message when dragging playlist into playlist 
-fixed
 2012-08-17 15:56:16 -04:00
Martin Konecny 99437147dc Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-17 15:08:10 -04:00
Martin Konecny 2a1ea33362 CC-1665: Scheduled stream rebroadcasting and recording 
-store Liquidsoap metadata in cc_schedule instead of cc_webstream
 2012-08-17 15:07:58 -04:00
Rudi Grinberg 5b134d0055 cc-4228: fixed this ticket by stomping out bugs in eventcontractor and tweaking ApiController 2012-08-17 12:37:58 -04:00
Martin Konecny e511f7cd37 CC-1665: Scheduled stream rebroadcasting and recording 
-fixed clicking save multiple times creates multiple smart playlists
 2012-08-16 17:49:07 -04:00
denise 9930ffae35 CC-4178: Smart Playlist: Cannot update the block's title 
-fixed
 2012-08-16 16:00:59 -04:00
denise b17cd2b3c9 CC-4178: Smart Playlist: Cannot update the block's title 
-fixed
 2012-08-16 15:58:03 -04:00
denise 0d21d9a9af Smart Playlists: code cleanup 2012-08-16 15:40:36 -04:00
Martin Konecny d773dcd112 CC-1665: Scheduled stream rebroadcasting and recording 
-send stream name back to Airtime: [("url","http://idobiradio.com/"), ("title","Good Charlotte - Like It's Her Birthday")]
 2012-08-15 15:12:44 -04:00
denise 4d9a31b3c1 CC-4219: Smart Playlist: Cannot preview static block 
-fixed
 2012-08-15 12:10:56 -04:00
James 9fc5411895 CC-4229: Smart Playlist: refactor code 
- done
 2012-08-15 11:36:41 -04:00
Rudi Grinberg e98eda144a cc-4105: removed naive replaygain again. added micro optimization to Insert into cc_files 2012-08-14 14:50:41 -04:00
Rudi Grinberg 6981a5cb49 cc-4105: added truncation of BPM to prevent crashes 2012-08-14 14:50:40 -04:00
Rudi Grinberg ba03447946 cc-4105: added handling for pyinotify events and create more logical events 2012-08-14 14:50:39 -04:00
Rudi Grinberg 688d22e995 cc-4105: fixed metadata formatting bug 2012-08-14 14:50:39 -04:00
Rudi Grinberg 6e9db647c1 cc-4105: Fixed metadata handling. Added more error reporting to rmq requests 2012-08-14 14:50:39 -04:00
Rudi Grinberg 5f1024bb7d cc-4105: Tweaked config params. Fixed error checking. Fixed unicode stuff. Removed redundant php 2012-08-14 14:50:39 -04:00
Rudi Grinberg 7abe882455 cc-4105-2: added retries on failed requests. added ignored files set like in the old media monitor 2012-08-14 14:50:39 -04:00
Rudi Grinberg 3422eb3cc0 cc-4105: added event packing to event objects 2012-08-14 14:50:39 -04:00
Rudi Grinberg 9964c826ab cc-4105: Added problem dir moving. Also locale config from old media monitor 2012-08-14 14:50:37 -04:00
Martin Konecny 7a5d9a0f91 CC-1665: Scheduled stream rebroadcasting and recording 
-don't require 2 digits for minutes or hours
 2012-08-13 15:26:32 -04:00
Martin Konecny c3862d69e5 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-13 14:58:20 -04:00
Martin Konecny 51e242ec7f CC-1665: Scheduled stream rebroadcasting and recording 
-remove edit menu from show builder
 2012-08-13 14:58:11 -04:00
Martin Konecny b8ea08c065 CC-1665: Scheduled stream rebroadcasting and recording 
-analyze stream mime type and report error as needed.
 2012-08-13 12:59:26 -04:00
James dad8762f4f CC-4209: Smart Playlist: 'Processing' wont disappear after clicking Generate during 'File import in progress' 
- fixed
 2012-08-13 12:31:49 -04:00
Martin Konecny 028f6636dd CC-1665: Scheduled stream rebroadcasting and recording 
-fix right clicking in playlist builder to view metadata causing exception
 2012-08-10 14:37:32 -04:00
Martin Konecny fa749c58f0 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-10 12:40:45 -04:00
Martin Konecny 35e3b3bc02 CC-1665: Scheduled stream rebroadcasting and recording 
-use mime type so that webstreams can play with invalid filenames
 2012-08-10 12:40:28 -04:00
James 4009ae741f Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-10 12:39:45 -04:00
James 8b13af2e04 fix bug on widget 2012-08-10 12:14:15 -04:00
denise bd966915ee CC-4207: Smart Playlists: Criteria is lost on 'Shuffle' click 
-fixed
 2012-08-10 11:56:01 -04:00
Martin Konecny fe3f4ea678 CC-1665: Scheduled stream rebroadcasting and recording 
-capture stream mime type and store in db.
 2012-08-10 00:57:03 -04:00
denise 5a63a284c8 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-09 18:24:32 -04:00
denise 10ea825536 CC-4201: Playlist Builder -> Smart Playlist: DJ user can edit SP created by others in particular situation 
-fixed
 2012-08-09 18:24:22 -04:00
Martin Konecny 65cb34db4a CC-1665: Scheduled stream rebroadcasting and recording 
-webstream preview on show builder working
 2012-08-09 18:14:53 -04:00
James 63a51081c1 CC-4182: Media Library -> Smart Playlist: Empty box appears after left clicking a Dynamic Smart Playlist created by other users, when login as DJ 
- fixed
 2012-08-09 17:50:43 -04:00
Martin Konecny bc72a6743b Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-09 17:42:32 -04:00
Martin Konecny 4129900858 CC-1665: Scheduled stream rebroadcasting and recording 
-step 1 of getting stream preview on show builder working
 2012-08-09 17:42:25 -04:00
denise f75cf5ffe2 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-09 17:24:00 -04:00
denise e674654cb1 CC-4192: Smart Playlist Builder: make save button save title, description, and criteria 
-done
 2012-08-09 17:23:52 -04:00
James 618813ebc1 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-09 16:59:33 -04:00
James 6c721cd68d CC-4184: Playlist Builder : Error alert for trying to add Web Stream to Smart Playlist 
- fixed
- extra fix: context menu for webstream
 2012-08-09 16:59:18 -04:00
Martin Konecny c73328e297 CC-1665: Scheduled stream rebroadcasting and recording 
-ability to preview webstreams inside of playlists
 2012-08-09 16:49:20 -04:00
Martin Konecny 952f18dc3c Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-09 14:39:42 -04:00
Martin Konecny b53bc36f4f CC-1665: Scheduled stream rebroadcasting and recording 
-ability to preview webstreams
 2012-08-09 14:39:31 -04:00
James ae5b6e58d7 CC-4144: Playlist Builder: Adding smart playlist into regular playlist will reset the Fade in/out settings to default value 
- fixed
 2012-08-09 11:03:57 -04:00
Martin Konecny c69dac7ab6 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-08 23:02:39 -04:00
Martin Konecny d0d70db391 remove useless debugging 2012-08-08 23:02:16 -04:00
James d1e6f8178b CC-4166: Playlist Builder -> Regular Playlist : clicking Fade in/out button for a empty playlist will cause PHP Fatal Error 
- fixed. Not displaying fade setting button if the playst/smartplaylist
is empty.
 2012-08-08 15:29:09 -04:00
Martin Konecny 48a1bf3f02 Merge branch '2.1.x' into devel 
Conflicts:
	airtime_mvc/application/controllers/ApiController.php
	airtime_mvc/application/models/Schedule.php
	airtime_mvc/application/models/Show.php
 2012-08-06 17:10:46 -04:00
Martin Konecny 40023d9086 CC-4152: Widget does not display current show in some modes 
-fixed
 2012-08-06 17:07:18 -04:00
Martin Konecny f901e13a84 CC-1665: Scheduled stream rebroadcasting and recording 
-Make playlist builder show creator name instead of creator id
 2012-08-03 18:06:47 -04:00
Martin Konecny 0ea66fc33f CC-1665: Scheduled stream rebroadcasting and recording 
-ability to edit playlists
 2012-08-03 15:59:34 -04:00
denise 361e681a59 CC-84: Smart Playlists 
- remove 'add to playlist' option on showbuilder screen
 2012-08-02 16:50:35 -04:00
James 028e089c82 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 
Conflicts:
	airtime_mvc/application/models/Block.php
 2012-08-02 16:37:12 -04:00
James 0d2d8218bf CC-84: Smart Playlists 
- audio preview on playlist
- cleaning up some code
 2012-08-02 16:36:12 -04:00
Martin Konecny a146fdcd37 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-02 16:27:00 -04:00
Martin Konecny 9cc152c0ae CC-1665: Scheduled stream rebroadcasting and recording 
-validate form fields of new webstream
 2012-08-02 15:45:15 -04:00
denise 997b5c31c3 CC-84: Smart Playlists 
- fixed dragging tracks into playlists (smart and dumb)
- display alert when dragging into dynamic block
- display alert when dragging playlist into block
 2012-08-02 11:52:11 -04:00