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

2585 Commits

Author SHA1 Message Date
James c1cc1c8fba CC-4184: Playlist Builder : Error alert for trying to add Web Stream to Smart Playlist 
- fixed
 2012-08-17 10:55:42 -04:00
denise 1e1398739f Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-16 18:17:54 -04:00
denise e57885c934 CC-4191: Password Reset: Reset link should be updated after default port is changed 
-done
 2012-08-16 18:17:43 -04:00
Martin Konecny 0cbd6165c4 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-16 17:49:23 -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 6b841a0fc4 CC-4239: Playlist: need to improve error msg "Something went wrong" 
-fixed
 2012-08-16 17:11:48 -04:00
Martin Konecny 12ddf30049 CC-1665: Scheduled stream rebroadcasting and recording 
-fixed preview icon in context menu doesn't work
 2012-08-16 16:52:38 -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 45f08e41d1 Smart playlists: fixed shuffle button activation clause 2012-08-16 15:47:31 -04:00
denise 0d21d9a9af Smart Playlists: code cleanup 2012-08-16 15:40:36 -04:00
denise ae0d5d8598 CC-4238: Playlists: Fade in/out is in wrong format 
-added comment
 2012-08-16 14:45:51 -04:00
denise 5e6a94edb9 CC-4238: Playlists: Fade in/out is in wrong format 
-fixed
 2012-08-16 14:37:10 -04:00
denise 6b54440b7e CC-4238: Playlists: Fade in/out is in wrong format 
-fixed
 2012-08-16 14:35:24 -04:00
denise 73ec580316 Playlists: set cue/fade in/out were not saving when editing a playlist 2012-08-16 13:02:48 -04:00
denise 1b7d174509 CC-4233: Smart Playlist: Cannot save the change of Fade in/out 
-fixed
 2012-08-16 12:33:25 -04:00
denise 09c66f9f94 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-16 11:26:11 -04:00
denise 4ca290320d CC-4236: Smart Playlists: Deactivate shuffle button when playlist contents is empty 
-done
-refactor code
 2012-08-16 11:26:04 -04:00
Martin Konecny 45a4c8d896 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-15 18:31:07 -04:00
Martin Konecny 4ee0c368ac CC-1665: Scheduled stream rebroadcasting and recording 
-pre buffer streams part 2
 2012-08-15 17:03:14 -04:00
Martin Konecny 1e57c12ce7 CC-1665: Scheduled stream rebroadcasting and recording 
-pre buffer streams part 1
 2012-08-15 16:43:01 -04:00
denise ea621fd9dc CC-4223: Smart playlists: BPM criteria should have numeric modifiers 
-done
 2012-08-15 16:40:04 -04:00
James 4783bf121a Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-15 16:23:15 -04:00
James 2d80131351 CC-4229: Smart Playlist: refactor code 
- bug fixes
 2012-08-15 16:22:56 -04:00
Rudi Grinberg c58e2e7ff9 Revert "Revert "cc-4232: changed bit formatter to give empty string when bitrate is set to 0"" 
This reverts commit 340e5deb51c11c2dd3445cc1483b21c533d5bdef.
 2012-08-15 15:56:24 -04:00
Rudi Grinberg a2dfcd6bc2 Revert "cc-4232: changed bit formatter to give empty string when bitrate is set to 0" 
This reverts commit 4e25a5ff442258c13f366a4557ca22181cdfac02.
 2012-08-15 15:56:24 -04:00
Rudi Grinberg 7fe45a5bbc cc-4232: changed bit formatter to give empty string when bitrate is set to 0 2012-08-15 15:56:24 -04:00
denise 3e80781308 Smart playlist: 
- fixed modifier selection onchange function
 2012-08-15 15:36:06 -04:00
denise ceba380127 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-15 15:13:15 -04:00
denise 3947b6d033 CC-4113: Smart Playlist: Filename contains '\' cannot be searched 
-fixed
 2012-08-15 15:13:07 -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 7225345541 CC-4231: Library: Prevent audio preview popup for dynamic blocks 
- done
 2012-08-15 12:51:53 -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
James 92568db01f Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-14 17:11:10 -04:00
James 5ece15c1e8 CC-4206: Smart Playlist: Edit cue in/out setting will lost all contents 
- fixed
 2012-08-14 17:10:31 -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
denise 09f1fe6775 CC-4220: Smart Playlists: Change indexing of criteria elements 
-code refactoring
 2012-08-14 10:05:13 -04:00
denise c62d89d5da CC-4220: Smart Playlists: Change indexing of criteria elements 
-changed indexing on UI
 2012-08-14 10:02:36 -04:00
denise 0a05db1230 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-14 09:26:59 -04:00
denise 83085220e2 CC-4220: Smart Playlists: Change indexing of criteria elements 
-changed Block model to reflect index changes
 2012-08-14 09:26:49 -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
denise fa87393ba9 CC-4216: Playlist: 'Close' button for fade in/out is out of the border when it's empty 
-fixed
 2012-08-13 14:53:21 -04:00
denise cfc5587043 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-13 14:41:59 -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
denise 0203c3f0c5 CC-4206: Smart Playlist: Edit cue in/out setting will lost all contents 
-fixed event bubbling
 2012-08-13 12:46:17 -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
James db3a9357f9 CC-4211: Smart Playlist: length of dynamic block wont be convert to hh:mm:ss if set limit as float number, such as 23.999 
- fixed
 2012-08-13 11:59:28 -04:00
James 1e36d77857 CC-4213: Smart Playlist -> Criteria Bpm: Cannot find track by 'is in the range' 
- changed BPM to string type
 2012-08-13 11:51:25 -04:00
James 19c90e6688 CC-4204: Dynamic Smart Playlist: Set limit to 500 minutes and click Save will froze the Browser 
- fixed
 2012-08-13 11:42:48 -04:00
James 1bd94a0757 CC-4212: Smart Playlist: The formats of 'Bit Rate' are not matched between Media Library and Criteria 
- fixed
 2012-08-13 11:32:06 -04:00
James 8055a9c80b CC-4214: Smart Playlist -> Criteria about datetime: Please convert the searched value from local time to UTC 
- fixed
 2012-08-13 11:18:15 -04:00
James 09897064c6 CC-4215: Smart Playlist: Exception happens when generate with criteria Length is 2012-08-10 14:00:00 
- fixed
 2012-08-13 10:59:21 -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 d84ad78984 CC-1665: Scheduled stream rebroadcasting and recording 
-remove warning icons from playlists with streams
-play icons are now white, not orange
 2012-08-10 12:53:22 -04:00
Martin Konecny 41320d0e5d CC-1665: Scheduled stream rebroadcasting and recording 
-remove warning icons from playlists with streams
 2012-08-10 12:52:36 -04:00
Martin Konecny 27025c8ca2 CC-1665: Scheduled stream rebroadcasting and recording 
-relax domain validator so we can use names like "localhost"
 2012-08-10 12:42:56 -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 7acd4b362f bug fix 
- Length display was wrong
 2012-08-10 12:39:33 -04:00
denise 5e1d8eabb3 Smart Playlists: moved Save button from right side to left side 2012-08-10 12:34:45 -04:00
denise 7911761017 CC-4208: Smart Playlists: Cannot see error messages sometimes after clicking 'Save' 
-fixed
 2012-08-10 12:22:59 -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
denise 7d73f0996c CC-4205: Smart Playlist Builder: Change text on button mouseovers 
-done
 2012-08-10 10:54:13 -04:00
denise c774e3b9bd Smart Playlists: got rid of horitzontal scrolling 2012-08-10 10:42: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
Martin Konecny 8eea34dc39 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-09 18:27:53 -04:00
Martin Konecny 037e78730b CC-4203: Smart Playlist: Please support limit as 0.5 hour 
-fixed
 2012-08-09 18:27:46 -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 200eec37f6 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-09 18:15:03 -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
denise 321e6c6524 CC-4197: Media Library -> Regular Playlist: Some character get cut off in context view 
-fixed
 2012-08-09 17:55:08 -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
denise 00a484d595 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-09 17:43:22 -04:00
denise 23683ccccb Smart Playlists: changed positioning of error message on click 'Save' 2012-08-09 17:43:12 -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 ac295243d4 Smart Playlists: changed success message for 'Save' button 2012-08-09 17:34:47 -04:00
denise e6ee29f57c Smart Playlist Options: changed width of fieldset 2012-08-09 17:28:35 -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 1367bde728 CC-4185: Playlist Builder -> Smart Playlist: Able to create Smart Playlist more than 24 hours 
- fixed
 2012-08-09 14:18:15 -04:00
James ef0e800c92 CC-4186: Playlist Builder -> Smart Playlist : The static Smart Playlist's length value will be empty if no file meet the criteria. 
- fixed
 2012-08-09 14:12:30 -04:00
James 825abca61b Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-09 11:44:43 -04:00
James 685354e000 CC-4189: Playlist Builder -> Smart Playlist: Cannot change the position of manually added tracks 
- fixed
 2012-08-09 11:44:27 -04:00
denise bad418062e Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-09 11:21:01 -04:00
denise 677d523ef4 CC-4187: Media Library -> Regular Playlist : Use legend instead of label for different elements in context view 
-done
 2012-08-09 11:20:49 -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
James d959e4ff11 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-09 10:47:59 -04:00
James cf1178522a CC-4166: Playlist Builder -> Regular Playlist : clicking Fade in/out button for a empty playlist will cause PHP Fatal Error 
- changes made on phtml were cause some errors. fixed.
 2012-08-09 10:47:43 -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
Martin Konecny 8f3037c3e4 CC-1665: Scheduled stream rebroadcasting and recording 
-remove incorrect "no items" warning when a show only contained a webstream
 2012-08-08 23:02:08 -04:00
denise 90ec046854 CC-4188: Playlist Builder -> Smart Playlist : sometimes elements do not index properly when add a new criteria row 
-fixed
 2012-08-08 16:27:03 -04:00
denise b2d3ee0aa4 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-08 15:35:44 -04:00
denise 791989faf7 Smart Playlists: changed label 'block' to 'playlist' type 2012-08-08 15:35:28 -04:00
James ab19d6f511 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-08 15:29:28 -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
denise 3a4a827f1f CC-4180: Smart Playlist Builder: modifier select boxes do not change when criteria changes 
-fixed
 2012-08-08 15:24:47 -04:00
denise 50f9582b95 CC-4179: Media Library -> In brief view of Dynamic Smart Playlist, 'does not contain' will be broken to 2 lines 
-fixed
 2012-08-08 13:24:53 -04:00
denise 67a8457889 Smart Playlists: modifier buttons appear incorrectly when editing 2012-08-08 13:16:02 -04:00
denise 5c3701c064 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-08 13:07:12 -04:00
denise 85259e5bba CC-4170: Smart Playlist Builder: elements don't organize properly after deleting a row 
-fixed
 2012-08-08 13:07:00 -04:00
James 83917ed894 CC-4166: Playlist Builder -> Regular Playlist : clicking Fade in/out button for a empty playlist will cause PHP Fatal Error 
- fixed
 2012-08-08 12:23:07 -04:00
James fd1628f971 CC-4117: Smart Playlist: radio_station_name criteria doesnot take effect 
- removing radio_station_name from criteria list
 2012-08-08 12:01:10 -04:00
James 61e38381af CC-4176: Smart Playlist: Set implicit item limit when user uses time as a limit 
- done
 2012-08-08 11:46:48 -04:00
Martin Konecny f33485f8ea Merge branch '2.1.x' into devel 2012-08-08 00:09:13 -04:00
Martin Konecny 333c8ec211 slightly improved PHP logging format 2012-08-08 00:08:46 -04:00
Martin Konecny 18ca6b22cb CC-1665: Scheduled stream rebroadcasting and recording 
-add placeholder icons for smart playlists/webstreams
 2012-08-07 23:44:21 -04:00
Martin Konecny 230c3399ef CC-1665: Scheduled stream rebroadcasting and recording 
-fix newlines appearing in playlist/webstream title
-disable autosave of playlist/webstream title
 2012-08-07 20:48:58 -04:00
Martin Konecny db36870aec CC-1665: Scheduled stream rebroadcasting and recording 
-fix creator id on another SQL query
 2012-08-07 20:38:36 -04:00
Martin Konecny 8876b312fb CC-4167: Create new playlist doesn't work 
-fixed
 2012-08-07 19:49:59 -04:00
Martin Konecny 1dddaa0ba2 CC-1665: Scheduled stream rebroadcasting and recording 
-refresh library to show new stream after save
 2012-08-07 19:49:26 -04:00
Martin Konecny 47ae223a1c CC-1665: Scheduled stream rebroadcasting and recording 
-fix SQL error
 2012-08-07 19:23:42 -04:00
denise 9b805f0a01 CC-4159: Playlist Builder -> Smart Playlist : "+" for modifier disappears if 3 or more Criteria 
-fixed
 2012-08-07 17:40:47 -04:00
denise 4ee232944d CC-4169: Playlist Builder: Smart Playlist time validates even if time isn't given 
-fixed
 2012-08-07 16:27:18 -04:00
denise 9c678c0429 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-07 16:18:00 -04:00
denise 97943a6af8 CC-4157: Playlist Builder -> Smart Playlist -> Wrong warning msg if trying to input 0000-00-00 into Upload criteria 
-fixed
 2012-08-07 16:17:24 -04:00
James 0fe501508e Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-07 15:54:42 -04:00
James 171825e19a CC-4148: Playlist Builder: Please add a 'Processing' for generating Smart playlist 
- added processing box
 2012-08-07 15:54:16 -04:00
denise f6dffc95c8 CC-4158: Playlist Builder -> Smart Playlist: Warning msg field is a little bit longer 
-fixed
 2012-08-07 15:22:32 -04:00
denise 152a97917d Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-07 15:20:32 -04:00
denise 823ab1dd41 CC-4162: Smart Playlist Builder: extra space in between limit and error message 
-fixed
 2012-08-07 15:20:12 -04:00
denise 550c97a2dc CC-4154L: Indicate whether a show has scheduled content on the calendar page 
-done
 2012-08-07 14:57:04 -04:00
James 2f8d0b77fa CC-4149: Playlist Builder: Fail to generate Smart Playlist with 5000 items 
- set the items limit to 500
 2012-08-07 14:53:07 -04:00
denise d05661afff Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-07 11:08:34 -04:00
denise 2c0f7bf03b CC-4145: Playlist Builder: Alert pops up when clicking 'Add to playlist' in context menu of Smart Playlist to add it into regular playlist 
-fixed
 2012-08-07 11:08:00 -04:00
Martin Konecny e20289e5cf Merge branch '2.1.x' into devel 2012-08-06 17:17:05 -04:00
Martin Konecny 975abbaf10 Remove unecessary information being sent from API 2012-08-06 17:16:43 -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 688051b59e CC-1665: Scheduled stream rebroadcasting and recording 
-Remove sX_name from being inserted into DB
 2012-08-03 18:45:43 -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 b23b9a0cbd CC-1665: Scheduled stream rebroadcasting and recording 
-allow to filter by webstream only
 2012-08-03 16:33:58 -04:00
Martin Konecny 183937b8e9 CC-1665: Scheduled stream rebroadcasting and recording 
-when editing string should hav 00h 00m format.
 2012-08-03 16:18:45 -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 d18acfdc75 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-02 17:17:52 -04:00
denise 2a7c5eef64 CC-84: Smart Playlists 
- added no-wrap class to qtip
 2012-08-02 17:17:44 -04:00
denise 8e67ecff0a CC-84: Smart Playlists 
- added a no-wrap class to qtip
 2012-08-02 17:17:13 -04:00
James 82970c6e73 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-02 17:04:49 -04:00
James af939469d3 CC-84: Smart Playlists 
- fixed bug on expanding block
- fixed text bug
 2012-08-02 17:03:54 -04:00
denise 361e681a59 CC-84: Smart Playlists 
- remove 'add to playlist' option on showbuilder screen
 2012-08-02 16:50:35 -04:00
denise ef994aa449 CC-84: Smart Playlists 
- block options scroll for small screens
 2012-08-02 16:40:32 -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 4fca33c5fc CC-84: Smart Playlists 
- removed block from right side if it gets deleted from context menu
 2012-08-02 12:59:00 -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
James 6e71a6bb92 CC-84: Smart Playlists 
- dynamic block length display
 2012-08-02 11:17:10 -04:00
denise 9479aeb3dd CC-84: Smart Playlists 
- fixed db column mapping for radio station name and track title
 2012-08-01 17:10:56 -04:00
denise ddd6016b28 CC-84: Smart Playlists 
- qtip cleanup
 2012-08-01 16:36:12 -04:00
denise bf0dcc9035 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-01 16:26:14 -04:00
denise 483ffdf6af CC-84: Smart Playlists 
- increased size of criteria column
- it was too smallf for some fields
 2012-08-01 16:25:59 -04:00
Martin Konecny 2ef4fd314c Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-01 15:37:58 -04:00
Martin Konecny b9bb87f69d CC-1665: Scheduled stream rebroadcasting and recording 
-clicking save now show's webstream save was successful
 2012-08-01 15:37:50 -04:00
denise bcab41cb86 - 'New User' button text was wrapping onto two lines 2012-08-01 15:30:35 -04:00
denise 40ebeb7fb4 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-01 15:00:54 -04:00
denise 13bb036bad CC-84: Smart Playlists 
-on criteria qtip limit was displaying more than once
-fixed
 2012-08-01 15:00:41 -04:00
Martin Konecny e6a3877c1e Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-01 14:52:29 -04:00
Martin Konecny 63b89043b6 CC-1665: Scheduled stream rebroadcasting and recording 
on-air light works with streams now
 2012-08-01 14:51:56 -04:00
denise 7d788c51b2 CC-84: Smart Playlists 
- added scrolling on qtip
 2012-08-01 14:43:52 -04:00
denise 0f681d7c25 CC-84: Smart Playlists 
-fixed undefined offset apache warnings
 2012-08-01 14:07:38 -04:00
denise 8f063367cc CC-84: Smart Playlists 
- qtip cleanup for dynamic playlists
 2012-08-01 13:49:16 -04:00
denise c9afac239a CC-84: Smart Playlists 
- add qtip for smart playlists
- modified qtip content for regular playlists that contain smart playlists
 2012-08-01 12:04:48 -04:00
James 9d51222dae CC-84: Smart Playlists 
- Length calculation for dynamic blocks and playlist that contains
dynamic blocks
 2012-07-31 17:46:37 -04:00
James 1b0cd6b01b Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-07-31 11:01:34 -04:00
James b312b2bd45 CC-84: Smart Playlists 
- fixed db query part for static smart playlist generate
 2012-07-31 11:01:19 -04:00
Martin Konecny 45a77e90a8 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-07-31 11:00:26 -04:00
Martin Konecny 92e34b12f7 CC-1665: Scheduled stream rebroadcasting and recording 
-cancel button has effect now :)
 2012-07-31 11:00:15 -04:00
Martin Konecny b83be1a922 CC-1665: Scheduled stream rebroadcasting and recording 
-fix incorrectly named column
 2012-07-31 11:00:01 -04:00
denise eb2a8c1009 CC-84: Smart Playlists 
- renamed Smart Blocks to Smart Playlists in library filter
 2012-07-31 10:17:48 -04:00
Martin Konecny 527b43e8ba CC-1665: Scheduled stream rebroadcasting and recording 
-fix incorrectly named column
 2012-07-31 10:13:41 -04:00
denise cbbdd5a1fd Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-07-31 10:05:50 -04:00
denise 1b1b7e11d0 CC-84: Smart Playlists 
-fixed spacing of modifier '+' button
 2012-07-31 10:05:38 -04:00
Martin Konecny ab85ab59d9 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-07-30 21:48:25 -04:00
Martin Konecny 7e433b61fb CC-1665: Scheduled stream rebroadcasting and recording 
-improve working with "webstreams"
 2012-07-30 21:48:04 -04:00
denise ecd926ae90 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-07-30 18:53:57 -04:00
denise ff62769d6c CC-84: Smart Playlists 
-UI cleanup
 2012-07-30 18:53:50 -04:00
James 27017c7903 CC-84: Smart Playlists 
- fixed getCriteria() to non static function
 2012-07-30 18:21:27 -04:00
James b9739b022d Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-07-30 17:55:39 -04:00
James 019d13b4c9 CC-84: Smart Playlists 
- backend implementation
- UI for blocks within playlist
 2012-07-30 17:55:22 -04:00