Commit Graph

2699 Commits

Author SHA1 Message Date
James baf5460e14 CC-4284: Calendar: AddContentToShow -> "Processing..." message pops up and never goes away
- fixed
2012-08-24 15:26:12 -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 bc078b790d Merge branch 'cc-3936-2' into devel 2012-08-24 12:39:05 -04:00
Rudi Grinberg 7284770226 cc-3936: Changed setting of owner when modifying/inserting metadata. 2012-08-24 12:38:33 -04:00
Rudi Grinberg 5841cb7066 cc-3936:
Made it so that identifer file is written before the file itself so that media monitor always
has the identifier file before the song itself.
2012-08-24 12:37:16 -04:00
Rudi Grinberg e53c20bbcd cc-3936: added method to make it easier to get users of a certain type. 2012-08-24 12:36:20 -04:00
denise ffa4c131ee CC-4246: Smart Playlist: Click shuffle button will shuffle the contents multiple times
-code refactor
2012-08-24 11:50:02 -04:00
denise 2e505ee970 CC-4246: Smart Playlist: Click shuffle button will shuffle the contents multiple times
-small code fix
2012-08-24 11:47:32 -04:00
denise b8571be827 CC-4246: Smart Playlist: Click shuffle button will shuffle the contents multiple times
- small code fix
2012-08-24 11:45:56 -04:00
denise 5f1c6453a5 CC-4246: Smart Playlist: Click shuffle button will shuffle the contents multiple times
-fixed
-disabled shuffle button
2012-08-24 11:44:18 -04:00
denise 82f2b2e7c3 CC-4249: Playlist: Playlist's length doesn't update if it contains a smart playlist which the length is changed
-fixed
2012-08-24 11:12:31 -04:00
Rudi Grinberg 4efdf71aea cc-3936: Made phpName of foreign key conform to Fk prefix convention. 2012-08-24 11:10:05 -04:00
Rudi Grinberg 857be6b702 cc-3936: Removed manual path concatenation. Fixed setting owner of file. 2012-08-24 11:09:38 -04:00
denise 1f7a6fdc63 CC-4262: Smart Block: Characters do not get escaped properly
-fixed
2012-08-24 10:29:28 -04:00
Rudi Grinberg 19a5a8f992 cc-3936: fixed wrong argument order bug. 2012-08-24 10:20:59 -04:00
Rudi Grinberg 4ad983f63c cc-3936: applied schema changes 2012-08-24 10:20:59 -04:00
Rudi Grinberg c83fad2546 cc-3936: added owner to every file insert 2012-08-24 10:20:59 -04:00
Rudi Grinberg 60803e5146 cc-3936:
Name of foreign key was given for easier access through propel. Also renamed phpName for ownerId
to fit the existing convention.
2012-08-24 10:20:59 -04:00
Rudi Grinberg b0a61fc291 cc-3936: Added setting default owner_id for inserted files. 2012-08-24 10:20:59 -04:00
Rudi Grinberg 43ca0d21e6 cc-3936: removed unnecessary object creation 2012-08-24 10:20:59 -04:00
Rudi Grinberg dcc9c58577 cc-3936: Sexified equal signs. 2012-08-24 10:20:59 -04:00
Rudi Grinberg 50de229258 cc-3936:
Refactored getUsers not to take multiple types of arguments.
2012-08-24 10:20:59 -04:00
Rudi Grinberg 996dcfd35f cc-3936: Ran propgen to generate schema changes 2012-08-24 10:20:59 -04:00
Rudi Grinberg e2d9f220f8 cc-3936:
Changed schema so that owner_id is not required for every file.
2012-08-24 10:20:59 -04:00
Rudi Grinberg 36b344a910 cc-3936: remove unneeded garbage. 2012-08-24 10:20:59 -04:00
Rudi Grinberg dcfa865f7d cc-3936:
Ran propel-gen to commit schema changes.
2012-08-24 10:20:58 -04:00
Rudi Grinberg 4f88543de2 cc-3936:
Updated schema so that every file has an owner.
2012-08-24 10:20:58 -04:00
Rudi Grinberg f940c20701 cc-3936:
Added success logging when identifier file has been written.
2012-08-24 10:20:58 -04:00
Rudi Grinberg 23e3f6137d cc-3936:
Sexified code. Added section for user handling.
2012-08-24 10:20:58 -04:00
Martin Konecny 9893282e43 CC-4275: Enable debug mode where all Propel queries are displayed in raw SQL
-add enablePropelLogging and disablePropelLogging functions
2012-08-23 22:27:24 -04:00
Martin Konecny 7cbe037c7e Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-23 21:58:39 -04:00
Martin Konecny 628bb6de1f CC-4275: Enable debug mode where all Propel queries are displayed in raw SQL
-done
2012-08-23 21:58:21 -04:00
Martin Konecny d06fda0329 fix indentation 2012-08-23 21:43:55 -04:00
denise 17d030a3f9 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-23 17:41:20 -04:00
denise 0a851f3c96 CC-4263: Calendar: Can create one show contains another show (overlapping)
-fixed
2012-08-23 17:41:05 -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
denise 9dfbd90e0f CC-4270: Media Library: Sample Rate is broken to 2 lines in context view
-fixed
2012-08-23 13:50:46 -04:00
denise 2f9ea4dc0b Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-23 11:53:56 -04:00
denise bf69f23343 CC-4249: Playlist: Playlist's length doesn't update if it contains a smart playlist which the length is changed
-fixed
2012-08-23 11:53:44 -04:00
James a94039a0c6 CC-4268: Playlist: No "preview" button if a track of the playlist does not exist any more
- fixed
2012-08-23 11:32:37 -04:00
James a4c579f36e CC-4254: Library: advanced search on library
- bug fix
2012-08-23 10:59:34 -04:00
James c2d475e6d8 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
Conflicts:
	airtime_mvc/application/controllers/PlaylistController.php
2012-08-23 10:43:28 -04:00
James de0aeee594 CC-4254: Library: advanced search on library
- initial commit
2012-08-23 10:41:40 -04:00
denise 38173bd3a2 - small fix 2012-08-23 10:19:00 -04:00
denise e987f7a0aa Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-22 16:29:53 -04:00
denise f47e32d9de CC-4266: Smart Block: Bit rate with 'is in the range' modifier -> 2nd range value doesn't get multiplied by 1000
-fixed
2012-08-22 16:29:17 -04:00
Rudi Grinberg a3b6d0259c Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-22 16:09:14 -04:00
Rudi Grinberg e7689e5355 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-22 16:09:03 -04:00
Martin Konecny b506c37341 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-22 16:08:58 -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
Rudi Grinberg d1e7341046 cc-3936: Refactored php code to upload files 2012-08-22 16:08:46 -04:00
denise 6fec9b0301 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-22 16:02:02 -04:00
denise 7e50a11195 CC-4225: Smart playlists: Sample and bit rate ranges should include entered values
-fixed
2012-08-22 16:01:50 -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
denise 9b3890ad19 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-22 15:22:13 -04:00
denise 0071caf94d CC-4080: Calendar -> Cannot create show because there was a repeating show at same time before
-fixed
2012-08-22 15:22:01 -04:00
Rudi Grinberg 6a16cf0084 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-22 14:39:45 -04:00
Rudi Grinberg e9bc0074c0 cleaned up ApiController.php a little bit. 2012-08-22 14:38:48 -04:00
denise ef5427d0bc CC-4197: Media Library -> Regular Playlist: Some character get cut off in context view
-fixed
2012-08-22 14:18: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
denise 462e73d93b CC-4245: Playlists: Can only rearrange, by dragging and dropping, tracks once
-fixed
2012-08-22 13:58:13 -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 9b7413dafa CC-1665: Scheduled stream rebroadcasting and recording
-use sessions to determine currently open object in Library
-forgot to check in these files
2012-08-21 16:55:10 -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 316afaf2a1 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-21 16:37:41 -04:00
denise ffbdba6f6b CC-4260: Add-user: Undefined index: ftype
-fixed
2012-08-21 16:37:33 -04:00
Rudi Grinberg 64a36ea21a cc-4240: fixed 2012-08-21 16:33:37 -04:00
denise 2cdaa186e3 CC-4257: Smart Block: Admin cannot delete DJ user's block
-fixed
2012-08-21 15:42:44 -04:00
denise d06f02f1f5 CC-4244: Playlist Builder: Original Length should not be changed after setting Cue in/out value
-fixed
2012-08-21 14:08:30 -04:00
denise 167881c903 CC-4253: Smart Playlist: Please support filter tracks by date
-code refactor
2012-08-21 12:01:48 -04:00
denise d23bd2d85b Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-21 11:58:46 -04:00
denise 0c381d4692 CC-4253: Smart Playlist: Please support filter tracks by date
-fixed
2012-08-21 11:58:39 -04:00
Martin Konecny 0ce4c1000b replace tabs with spaces
-also remove \r characters
2012-08-21 11:16:07 -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 d2eca0faaf Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-21 10:50: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
denise 025656be1c CC-4205: Smart Playlist Builder: Change text on button mouseovers
-changed generate success msg
2012-08-21 10:46:25 -04:00
denise c60198722d Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-21 10:42:37 -04:00
denise 4cd5dbb926 CC-4205: Smart Playlist Builder: Change text on button mouseovers
-changed save button text
2012-08-21 10:42:10 -04:00
Martin Konecny cba717dc4b CC-1665: Scheduled stream rebroadcasting and recording
-Fixed regressions introduced by changing HTML element id
2012-08-21 10:33:36 -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 734be21269 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-20 17:18:00 -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 4d8dc01638 don't crash js if a backend service is not running 2012-08-20 17:09:59 -04:00
Martin Konecny f3f9ef80ff CC-4119: zendphp.log is not rotated
-fixed
2012-08-20 16:05:25 -04:00
Martin Konecny f6a4732e87 CC-4119: zendphp.log is not rotated
-fixed
2012-08-20 15:54:10 -04:00
Martin Konecny 69f150ac7f more detailed error message 2012-08-20 14:41:43 -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 284b028521 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-17 16:51:45 -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 76833344d6 CC-4250: Smart Playlists: Remove save button from form
-done
2012-08-17 16:24:11 -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
denise 764316a36c CC-4247: Smart Playlist: Lost modifier when delete one from multiple modifiers
-fixed
2012-08-17 15:30:30 -04:00
denise 854e3ec75e Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-17 15:11:52 -04:00
denise 92408612f6 CC-4246: Smart Playlist: Click shuffle button will shuffle the contents multiple times
-fixed
2012-08-17 15:11:43 -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
denise 36a080ac13 CC-4243: Playlist Builder: Remove main fade block if there are no fades to set
-fixed
2012-08-17 14:30:46 -04:00
denise 3e879f390a Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-17 12:56:52 -04:00
denise e2fe6d4284 CC-4243: Playlist Builder: Remove main fade block if there are no fades to set
-fixed
2012-08-17 12:56:45 -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
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