Commit Graph

1386 Commits

Author SHA1 Message Date
James 96da822bc7 CC-4574: Audio preview fails with Zend errors on file with question mark in the title
- fixed
2012-10-16 14:38:24 -04:00
James 67ca0db4c8 CC-4542: Playlists containing dynamic smart blocks cannot be previewed
- fixed
2012-10-16 14:09:34 -04:00
James 7796b23a58 CC-4506: Audio Preview in Playlist doesn't work
- fixed
2012-10-16 12:06:47 -04:00
James 03b32ea986 CC-4563
Library: Exception is found when remove a block by context menu

- fixed
2012-10-16 10:37:42 -04:00
Daniel James a103c76378 CC-4558: Make button in Now Playing consistent with same action in Calendar 2012-10-15 12:27:16 +01:00
denise 5f35336fd0 CC-2295 Improvements to playlist builder beha...CC-2303 Cue-in Cue-out inconsistency with time values:
-fixed
2012-10-11 11:49:04 -04:00
Daniel James 395d25158f CC-4545: Fix tooltip for Auto Switch On feature 2012-10-10 16:26:32 +01:00
denise c9ac675a10 CC-4529: Playlist Builder: The panel of 'Adding n items' will be bigger than usual if there is a item in Playlist has expanded cue in/out setting
-fixed
2012-10-09 14:39:29 -04:00
Daniel James b4fee4321c CC-4537: Bit rate hint should be in kbps to match actual search 2012-10-09 16:46:51 +01:00
denise 0d35056cd4 CC-4486: Library -> Advanced Search: Alignment is off sometimes
-added placeholders to input tags for format examples
2012-10-04 12:16:57 -04:00
denise eadde1c498 CC-4519: Advanced Search Option: Please use text search instead of scope search from Mime's type
-fixed
2012-10-03 11:29:16 -04:00
denise 3dd7e9767b CC-4481: Library -> Advanced Search -> Validation icon does not show up sometimes
-validation was missing for Encoded By filter
2012-10-02 13:57:36 -04:00
Martin Konecny 9df90414fc Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-19 17:22:13 -04:00
Martin Konecny 5a8510b909 remove gap on right side of show builder: part 3 2012-09-19 17:22:04 -04:00
denise e926b62915 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-19 17:00:15 -04:00
denise f909ab9da2 CC-4490: Calendar: Empty show icon should have a tooltip
-done
2012-09-19 16:59:45 -04:00
Martin Konecny 40c122fafa Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-19 16:56:04 -04:00
Martin Konecny 84ed03ffac remove gap on right side of show builder: part 2 2012-09-19 16:55:44 -04:00
denise f2e495cbd8 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-19 16:40:05 -04:00
denise 2afc4183bb CC-4496: Library -> Contents-feed does not work if advanced search data is invalid
-fixed
2012-09-19 16:39:56 -04:00
Martin Konecny a3b53ee3d3 remove gap on right side of show builder 2012-09-19 16:19:02 -04:00
denise b4277f1f17 CC-4495: Library -> Advanced Search: Some fields with ranges do not get validated
-fixed
2012-09-19 15:46:03 -04:00
denise 4b2d6caf0e CC-4485: Library -> Advanced Search -> Tooltip needed for invalid input
-done
2012-09-19 15:35:45 -04:00
Martin Konecny f717efd7fb Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-19 13:23:14 -04:00
Martin Konecny ca0fb969b7 fix jplayer errors for mp3 and firefox (flash) 2012-09-19 13:23:06 -04:00
denise 81620d4f94 CC-4481: Library -> Advanced Search -> Validation icon does not show up sometimes
-fixed
2012-09-19 12:41:54 -04:00
denise dc95ab1d00 CC-4155: Playlist Builder: Style static/dynamic expansion blocks in playlist contents
-changed null values to empty strings
2012-09-19 11:05:17 -04:00
Martin Konecny ddc0e8d2ba remove console.log from javascript library :/ 2012-09-19 11:04:01 -04:00
denise 281e7d1092 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-19 10:49:52 -04:00
denise 0c823af660 CC-4155: Playlist Builder: Style static/dynamic expansion blocks in playlist contents
-done
2012-09-19 10:49:17 -04:00
Martin Konecny 7036036a86 CC-4476: Make all green notification boxes fade out after 5 seconds
-fixed
2012-09-18 21:29:02 -04:00
denise 5003e86eac - changed smart block qtip text 2012-09-18 17:37:38 -04:00
denise f9778f2da4 -removed windows CRLF 2012-09-18 17:26:34 -04:00
denise 1d699fe0b8 CC-4479: Buttons in dialog windows are not styled
-done
2012-09-18 17:22:24 -04:00
denise b77429164b CC-4465: Calendar: Remove warning icon on empty shows if show is in the past
-removed setInterval function
2012-09-18 16:55:46 -04:00
denise 54ab58a9c7 CC-4465: Calendar: Remove warning icon on empty shows if show is in the past
-removed (commented out) code for this ticket
-postponing for now
2012-09-18 16:49:45 -04:00
denise 8cae11d588 CC-4478: Library: audio preview check should be skipped if file does not exist
-fixed
2012-09-18 15:52:11 -04:00
denise 09b117999e CC-4475: Register form button doesn't have any styling
-fixed
2012-09-18 15:28:38 -04:00
denise e676cf856f -remove console.log 2012-09-18 15:16:54 -04:00
denise 0386f8a9cb Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-18 15:14:57 -04:00
denise 7bbd10556b CC-4465: Calendar: Remove warning icon on empty shows if show is in the past
-done
2012-09-18 15:14:46 -04:00
James 98f0692b8d CC-4457: Media Library: The background of 'Adding items' is minimize to a point
- fixed
2012-09-18 14:40:18 -04:00
denise e00ff6367d CC-4458: Now Playing -> "+ Add to current playlist text" might be replaced by something more appropriate
-fixed
2012-09-18 11:22:37 -04:00
denise 9c721f202f -small UI improvement 2012-09-18 11:05:13 -04:00
denise 1698aae251 CC-4466: Buttons on Now Playing page are clickable even though they are disabled
-fixed
2012-09-18 10:53:19 -04:00
Naomi Aro bb3ffce071 CC-3944 : Now Playing -> Time Line view: Cannot cancel record show, cancel button is disabled 2012-09-17 16:28:28 -07:00
denise 9b39ff93b4 -removed console.log 2012-09-17 15:49:22 -04:00
denise 43c336eb6d CC-4155: Playlist Builder: Style static/dynamic expansion blocks in playlist contents
-implemented css changes
-formatted playlist_builder.css
2012-09-17 15:41:22 -04:00
James 5d60a599a6 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-17 12:42:11 -04:00
James 5e514b3b60 -UI alignment of input text element 2012-09-17 12:41:58 -04:00
denise f840a9b24a CC-4451: (Firefox) Now Playing -> Can't cancel Current Show
-fixed
2012-09-17 12:30:43 -04:00
denise f02bf04a25 CC-4449: (Firefox) Now Playing -> Cancel currently playing track does not work
-fixed
2012-09-17 12:27:17 -04:00
denise b8b3bfb495 CC-4450: Now Playing -> Can't remove overbooked tracks
-fixed
2012-09-17 12:23:49 -04:00
denise e30d3b770c -removed unused code 2012-09-17 12:19:02 -04:00
denise 3c3b39796d CC-4445: Timeline: 'Select' dropdown menu should be disabled if the button is disabled
-fixed
2012-09-17 12:10:23 -04:00
Rudi Grinberg 990bcebfe8 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-17 11:58:18 -04:00
Rudi Grinberg b913b067c2 Added setColumnFilter(oTable) 2012-09-17 11:58:08 -04:00
denise 99969ff19d CC-4445: Timeline: 'Select' dropdown menu should be disabled if the button is disabled
-fixed
2012-09-17 11:58:05 -04:00
James b3420984e2 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-17 11:27:52 -04:00
James 396b529162 - UI interation of advanced search 2012-09-17 11:23:38 -04:00
Rudi Grinberg fab7042ce6 cc-4419: Added quick hack for now -- actual fix 2012-09-17 11:18:18 -04:00
Rudi Grinberg d4443da626 Removed debugging statement 2012-09-17 11:12:52 -04:00
Rudi Grinberg 6118cd63d7 cc-4419: Added quick hack for now 2012-09-17 10:52:37 -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
denise 84deda99c5 CC-4440: System -> Streams: Update and Save 'Stream 1/2/3' will make it invisible
-fixed
2012-09-14 17:35:14 -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
denise 8ffaaaef25 -skip playable test if item is a smart block 2012-09-14 16:38:26 -04:00
denise 0524e4e5d2 -implemented UI changes for playlist/block/webstream builder 2012-09-14 15:49:39 -04:00
denise c7f4ede766 -implemented UI changes for library page 2012-09-14 12:08:51 -04:00
denise f581b0536e -fixed formatting 2012-09-14 11:18:13 -04:00
denise bb38512bae -fixed formatting 2012-09-14 10:52:50 -04:00
denise 97a0a82dc3 -renamed AIRTIME_DEV_README to AIRTIME_DEV_README_COLUMN_FILTER
-added new diff file for dataTables.ColVis.js
2012-09-13 17:19:08 -04:00
denise c35c76351b Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-13 17:11:10 -04:00
denise 8f48544bb7 -implemented UI changes for Now Playing page 2012-09-13 17:10:38 -04:00
James d93fcec490 CC-4424: Clicking "edit" on playlist allows you to preview tracks that should be disabled
- fixed
2012-09-13 17:09:10 -04:00
Martin Konecny 14db5053b1 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-13 14:56:10 -04:00
Martin Konecny b04afaec2c CC-4393: Please ignore Flac items for Playlist Preview and disable to preview it as a single track
-detect flash fallback
2012-09-13 14:55:17 -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
Martin Konecny 4fd9993108 CC-1710FLAC, BWF, AAC support
-Enable browser preview for new filetypes
2012-09-13 12:30:26 -04:00
Martin Konecny 09d587e262 CC-4393: Please ignore Flac items for Playlist Preview and disable to preview it as a single track
-better file type detection
2012-09-13 12:28:10 -04:00
Martin Konecny e95933525b Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-13 12:25:03 -04:00
Martin Konecny 983bbc5fc5 CC-4393: Please ignore Flac items for Playlist Preview and disable to preview it as a single track
-better file type detection
2012-09-13 12:24:53 -04:00
Rudi Grinberg e2f8d8e0e7 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-13 11:10:43 -04:00
James 5067a304d9 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-13 10:49:33 -04:00
James b6b93618e6 CC-4353: Numeric search fields in Library would benefit from format labels
- bug fix
2012-09-13 10:49:24 -04:00
Rudi Grinberg 52882ef938 Added mp4 removed aac. 2012-09-13 10:35:13 -04:00
Martin Konecny 4998a63a6a Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-12 17:34:32 -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
denise 32b1ee95b7 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-12 16:29:35 -04:00
denise 5ac6877e60 CC-4362: Smart Block: error for multiple criteria
-fixed
2012-09-12 16:29:26 -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 a418f5777c CC-4393: Please ignore AAC and Flac items for Playlist Preview and disable to preview it as a single track
-initial commit
2012-09-12 15:43:50 -04:00
Vladimir 77824afdd3 Added Bootstrap CSS, images and JS for new buttons and dropdown menues 2012-09-12 21:23:25 +02:00
Rudi Grinberg d1b4ce3de6 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-12 15:19:57 -04:00
denise 07ac651f71 - move title and creator to top of library column view 2012-09-12 15:09:07 -04:00
Rudi Grinberg 92532cb708 cc-4394: Added m4a 2012-09-12 14:54:11 -04:00
denise ceccb547c2 CC-4355: Smart block criteria do not match library columns or metadata editor
-put library column filter in alphabetical order to match smart block criteria order
2012-09-11 17:39:47 -04:00
denise f1b8ada1e6 - removed logging 2012-09-11 17:19:02 -04:00
denise 58d39d74d4 CC-4355: Smart block criteria do not match library columns or metadata editor
-fixed
2012-09-11 17:18:17 -04:00
James b692abb9ae Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-11 15:10:17 -04:00
James 1ba24a8d0b CC-4353: Numeric search fields in Library would benefit from format labels
- done
2012-09-11 15:09:57 -04:00
denise 49f2a31be1 - added advanced search validation for owner and last played time 2012-09-11 11:22:12 -04:00
denise ba89982b17 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-10 18:09:19 -04:00
denise 4239a49d58 - advanced search validation UI cleanup 2012-09-10 18:09:13 -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
denise c536169fb3 -original dataTables.columnFilter.js 2012-09-10 17:58:31 -04:00
denise 2474d50e9f CC-4379: Playlist Builder: Click Save will cause playlist disappear from right side
-fixed
2012-09-10 17:53:55 -04:00
denise bba001c0db -diff between original dataTables.columnFilter.js and our modified version 2012-09-10 17:41:54 -04:00
denise def513d200 -fixed commit problem 2012-09-10 17:38:05 -04:00
denise fe0b6cd32b -changed windows line endings to unix 2012-09-10 17:36:51 -04:00
denise bca7fbf50e Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-10 17:17:19 -04:00
denise 8520141240 CC-4282: Library ->"Uploaded From" -> Submitting data in wrong format causes "Processing ..." message pop up for a while
-implemented advanced search validation
-data only gets sent to server if all fields are valid
2012-09-10 17:17:09 -04:00
James 67b295a553 CC-4367: Media Library -> Search: Please enable searching Bit Rate by Kbps
- done
2012-09-10 15:37:22 -04:00
James 4d3c624607 CC-4380: Show ReplayGain value in the Library page
- temp commit
2012-09-10 12:35:32 -04:00
James 0f1cb61a13 CC-4330: Media Library - > Search: Please change the way to search by owner
- fixed
2012-09-06 17:46:45 -04:00
denise 8125d6b553 CC-4344: Conductor column not available in library view
-done
2012-09-06 14:30:09 -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
denise d9baddeba0 CC-4349: Encoded search in library should be labelled 'Encoded by'
-fixed
2012-09-05 16:38:55 -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 886888a958 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-31 17:21:48 -04:00
Rudi Grinberg 59f527c14c cc-4288: added owner column. 2012-08-31 13:31:14 -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 3571e2c691 cc-1710: switched bwf to wav 2012-08-30 16:50:10 -04:00
Rudi Grinberg 3911662cff Remove unused function 2012-08-30 16:30:49 -04:00
Rudi Grinberg c09ebce1f0 cc-1710: Removed verbosity 2012-08-30 11:43:11 -04:00
Rudi Grinberg bed9989d2a cc-1710: Added more supported extensions to the allowed upload list 2012-08-30 11:40:05 -04:00
Rudi Grinberg 2b8bd2ffe9 cc-1710 removed ^M 2012-08-30 11:37:22 -04:00
denise 3ff80fae14 CC-4314: Library: Add playlist to playlist shows wrong error message
-fixed
2012-08-29 16:47:20 -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
denise 3d20ded170 CC-4307: Add "Never show again" to the pop-up registration prompt
-done
2012-08-28 17:30:34 -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
denise 7c5765ccb9 CC-4298: Smart Block: Sometimes criteria value text box doesn't resize properly
-fixed
2012-08-27 16:46:05 -04:00
denise d4dbca5de3 CC-4296: Media Library: Dragging Smart Block gives wrong item number
-fixed
2012-08-27 12:33:57 -04:00
denise 53418e475d CC-4286: Library: Alert pops up when double clicking any item in Library when nothing is opened in right side
-fixed
2012-08-24 17:37:13 -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
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 462e73d93b CC-4245: Playlists: Can only rearrange, by dragging and dropping, tracks once
-fixed
2012-08-22 13:58:13 -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
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
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 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 764316a36c CC-4247: Smart Playlist: Lost modifier when delete one from multiple modifiers
-fixed
2012-08-17 15:30:30 -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
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
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
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 45f08e41d1 Smart playlists: fixed shuffle button activation clause 2012-08-16 15:47:31 -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 4ca290320d CC-4236: Smart Playlists: Deactivate shuffle button when playlist contents is empty
-done
-refactor code
2012-08-16 11:26: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
denise 3e80781308 Smart playlist:
- fixed modifier selection onchange function
2012-08-15 15:36:06 -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 5ece15c1e8 CC-4206: Smart Playlist: Edit cue in/out setting will lost all contents
- fixed
2012-08-14 17:10:31 -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 cfc5587043 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-13 14:41:59 -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 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
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
denise 7911761017 CC-4208: Smart Playlists: Cannot see error messages sometimes after clicking 'Save'
-fixed
2012-08-10 12:22:59 -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 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
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 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 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
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
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 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 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
Martin Konecny f33485f8ea Merge branch '2.1.x' into devel 2012-08-08 00:09:13 -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 1dddaa0ba2 CC-1665: Scheduled stream rebroadcasting and recording
-refresh library to show new stream after save
2012-08-07 19:49:26 -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
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 550c97a2dc CC-4154L: Indicate whether a show has scheduled content on the calendar page
-done
2012-08-07 14:57:04 -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 b23b9a0cbd CC-1665: Scheduled stream rebroadcasting and recording
-allow to filter by webstream only
2012-08-03 16:33:58 -04:00
Martin Konecny 0ea66fc33f CC-1665: Scheduled stream rebroadcasting and recording
-ability to edit playlists
2012-08-03 15:59:34 -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 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
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 7d788c51b2 CC-84: Smart Playlists
- added scrolling on qtip
2012-08-01 14:43:52 -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
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
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 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 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
denise f91be9468f CC-84: Smart Playlists
-UI cleanup
2012-07-30 16:42:37 -04:00
denise 2083d04107 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-07-27 14:32:39 -04:00
denise d7cf50b2f4 CC-84: Smart Playlists
- changed error handling and criteria saving to handle same criteria rows
2012-07-27 14:32:31 -04:00
Martin Konecny ebed110429 CC-1665: Scheduled stream rebroadcasting and recording
-code cleanup
2012-07-26 17:51:47 -04:00
James 7cde4ba2ba CC-84: Smart Playlists
- merging code
2012-07-26 16:16:07 -04:00
Martin Konecny eb4c23b0b6 CC-1665: Scheduled stream rebroadcasting and recording
-Fix scheduled streams mixed with scheduled files
2012-07-26 14:49:32 -04:00
Martin Konecny c90495d2d3 CC-1665: Scheduled stream rebroadcasting and recording
-getting closer to being able to schedule a webstream
2012-07-26 14:49:32 -04:00
Martin Konecny 8b2facaa96 CC-1665: Scheduled stream rebroadcasting and recording
-playlists load contents now correctly identify tracks vs streams
2012-07-26 14:49:32 -04:00
Martin Konecny a16a1f5033 CC-1665: Scheduled stream rebroadcasting and recording
-Webstreams now appearing in the library
2012-07-26 14:49:31 -04:00
Martin Konecny 31176f525e CC-1665: Scheduled stream rebroadcasting and recording
-started working on UI
2012-07-26 14:41:40 -04:00
denise a828c46d32 CC-84: Smart Playlists
- changed name of 'block' to 'smart playlist' on UI only
2012-07-26 13:16:29 -04:00
denise bef9ba1eea CC-84: Smart Playlists
- added 'Smart Block' filter in datatable
- added block files to library datatable
2012-07-25 17:08:22 -04:00
James 1f3cbd8aba CC-84: Smart Playlists
- introducing smart-block
2012-07-25 12:44:37 -04:00
denise 722e470f6f CC-84: Smart Playlists
- changed playlist controller to also handle Blocks
- created new view for smart blocks
2012-07-25 11:00:46 -04:00
denise c82ea30809 CC-84: Smart Playlists
- removed criteria subform and reverted back to original criteria options design
2012-07-24 12:12:47 -04:00
denise 64185dac95 CC-84: Smart Playlists
- subforms now open and close on the click event
- fixed add and remove criteria to work with new subforms
2012-07-23 12:42:00 -04:00
denise a67b2fa300 CC-84: Smart Playlists
- removed soundcloud_id criteria
- added last_played criteria
2012-07-20 11:25:54 -04:00
denise 9fcc851523 CC-84: Smart Playlists
-hides playlist content if dynamic instead of disabling
-show the user how many files match specified criteria
2012-07-19 14:52:39 -04:00
denise 2d8a9188eb CC-84: Smart Playlists
- qtip wasn't showing up on 'new' and 'edit' events
- changed 'Artist' to 'Creator' to be consistent with library
2012-07-18 15:48:15 -04:00
James 9516771099 Merge branch 'cc-84-smart-playlist' into devel
Conflicts:
	airtime_mvc/application/controllers/PlaylistController.php
	airtime_mvc/application/models/Scheduler.php
2012-07-18 12:23:57 -04:00
denise 7c5291fe0c CC-84: Smart Playlists
- ui cleanup
2012-07-18 11:55:29 -04:00
James 2a38527161 CC-84: Smart Playlists
- propel usage chage
- cleaning up code
- some js changes
2012-07-18 11:52:09 -04:00
denise 0aae7c75ae CC-84: Smart Playlists
- added shuffle button
- moved all callbacks into one function
2012-07-17 15:32:26 -04:00
denise a8ca9accdb CC-84: Smart Playlists
- added remove button to all rows unless only one row is enabled
- disabled playlist contents if type switches from static to dynamic
  and vice versa
2012-07-17 14:40:52 -04:00
James 7c07bf146c Merge branch 'cc-84-smart-playlist' of dev.sourcefabric.org:airtime into cc-84-smart-playlist 2012-07-17 11:07:38 -04:00
James a4ba776b0f CC-84: Smart Playlists
- save playlist type to db
- on edit type is loaded
2012-07-17 11:07:16 -04:00
denise e0a674a96c CC-84: Smart Playlists
-added save button for static playlists
2012-07-16 18:24:46 -04:00
James fc09baacd7 CC-84: Smart Playlists
- static playlist is done.
2012-07-16 17:18:37 -04:00
denise 1bb97c8603 CC-84: Smart Playlists
- ui clean-up
2012-07-16 14:44:50 -04:00
Martin Konecny 4ebcb1b1f9 Merge branch '2.1.x' into devel
Conflicts:
	airtime_mvc/application/controllers/ApiController.php
	airtime_mvc/application/controllers/LibraryController.php
	airtime_mvc/application/controllers/PlaylistController.php
	airtime_mvc/application/models/Playlist.php
	python_apps/media-monitor/airtimefilemonitor/airtimemediamonitorbootstrap.py
	python_apps/media-monitor/airtimefilemonitor/airtimemetadata.py
2012-07-16 14:31:03 -04:00
denise 2dae5f30f7 CC-84: Smart Playlists
- code cleanup
- adds 'Add' button to last row, always
2012-07-16 11:01:34 -04:00
James 46294c3f40 Merge branch 'cc-84-smart-playlist' of dev.sourcefabric.org:airtime into cc-84-smart-playlist
Conflicts:
	airtime_mvc/application/forms/SmartPlaylistCriteria.php
2012-07-13 16:00:02 -04:00
James ae9442d7f5 CC-84: Smart Playlists
- editing playlist
2012-07-13 15:58:23 -04:00
denise b48fb49947 CC-84: Smart Playlists
-fixed add/remove behaviour
2012-07-13 15:15:11 -04:00
James 207582eb7e CC-84: Smart Playlists
- temp commit
2012-07-13 14:23:30 -04:00
Martin Konecny 8dcb1f8f3d CC-4101Calendar displays white on white for certain show names, making shows invisible 2012-07-13 10:28:50 -04:00
denise 7dc0229770 CC-84: Smart Playlists
- error msgs were not deleting from a removed row
- fixed
2012-07-12 17:33:40 -04:00
denise d81253cccc CC-84: Smart Playlists
- send playlist id on generate/save action
- fixed some small UI bugs
2012-07-12 17:19:53 -04:00
denise 31bb07b4f0 CC-84: Smart Playlists
- removed modifier array list from form and populate in javascript
- fixed remove functionality to handle the extra criteria value used
  for 'is in the range' modifier
- moved 'add' button to last row
2012-07-12 13:02:02 -04:00
denise e8a2f23856 CC-84: Smart Playlists
- dynamically change modifier list depending on criteria type
- added extra text box for 'is in the range' modifier
2012-07-11 18:53:28 -04:00
denise c27b886817 CC-84: Smart Playlists
-0-indexed form elements
2012-07-11 16:15:44 -04:00
denise 7358b00c81 CC-84: Smart Playlists
-disabled non-visible form elements
2012-07-11 15:18:47 -04:00
denise 5fb0364f2d CC-84: Smart Playlists
-switched action names for static/dynamic
2012-07-11 11:57:13 -04:00
denise 1afe1e4d32 CC-84: Smart Playlists
-added in save/generate functionality in the UI
2012-07-11 11:50:40 -04:00
denise 4bed5e647e CC-84: Smart Playlists
-moved smart_playlistbuilder.js into playlist folder
2012-07-11 10:45:24 -04:00
denise 4301a221b7 CC-84: Smart Playlists
-added in 'Add' and 'Remove' form elements functionality on the UI
2012-07-10 18:20:23 -04:00
denise 72dd48e33e CC-84: Smart Playlists
-created form and view script
2012-07-10 15:25:29 -04:00
denise 0171212e9b Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x 2012-07-10 13:19:19 -04:00
denise 81eb751c9f - shortened height on Add/Remove content dialog window 2012-07-10 13:19:03 -04:00
James 78acd4f805 CC-4093: Timeline -> Alert for deleting track(s) appears twice by clicking
context menu

- fixed
2012-07-10 13:08:36 -04:00
denise e4fb42cbd0 CC-4027: In the Calendar view, please have a little play icon indicating the currently playing show.
-done
2012-07-06 15:26:51 -04:00
James 31f1d5879e CC-4076: Library: make doubleclick trigger adding files to playlist/timeline
- done
2012-07-05 18:24:07 -04:00
James f3fbaf89f5 CC-4076: Library: make doubleclick trigger adding files to playlist/timeline
- done
2012-07-05 18:23:34 -04:00
denise bc93119adc Merge branch '2.1.x' into devel 2012-07-04 09:46:30 -04:00
denise 87afea63bf CC-4065: Timeline -> Cursor will disappear after a track is finished sometimes
-fixed
2012-07-03 18:22:48 -04:00
denise 598bf8942c Merge branch '2.1.x' into devel 2012-07-03 14:57:16 -04:00
denise f6d79b1f54 CC-4063: Timeline -> Add a track to a show will cause another show's cursor to be selected
-fixed
2012-07-03 14:52:27 -04:00
denise 2bf6d0e54e Merge branch '2.1.x' into devel 2012-07-03 12:57:25 -04:00
denise e11fe8a2b8 CC-4058: Timeline -> Cannot add song twice if last cursor is selected
-fixed
2012-07-03 12:42:53 -04:00
denise bc569462ee CC-4057: Calendar -> Add/Remove contents: Lost cursor after add contents to a show
-fixed
2012-07-03 11:48:57 -04:00
denise 3e75b28c9d Merge branch '2.1.x' into devel
Conflicts:
	airtime_mvc/application/controllers/ApiController.php
2012-07-03 10:42:29 -04:00
denise 46604fdf59 CC-4046: Timeline -> cannot drag and drog song into the posion between song's name and "show empty"
-fixed
2012-06-29 16:59:03 -04:00
denise 68420a898f CC-4044: Timeline -> Cursor keeps highlight even if the song is played
-fixed
2012-06-29 15:49:22 -04:00
denise 335dd1516b Merge branch '2.1.x' into devel
Conflicts:
	python_apps/pypo/liquidsoap_scripts/ls_script.liq
2012-06-29 10:57:14 -04:00
denise 38cb439f53 CC-4036: Timeline -> A new Cursor will be selected when there are 2 shows and we add/delete items in timeline view
-fixed
2012-06-28 17:55:17 -04:00
denise 79513de1ba CC-4035: Timeline -> Filter by show: please let the setting automatically takes effect without clicking the button out of the 'box'
-also added this functionality for the 'All my shows' checkbox
2012-06-28 17:07:01 -04:00
denise 61fc269b13 CC-4035: Timeline -> Filter by show: please let the setting automatically takes effect without clicking the button out of the 'box'
-done
2012-06-28 16:55:43 -04:00
denise a603d67397 fixed indentation on schedule.js 2012-06-28 15:44:55 -04:00
denise 69eb80c5ac CC-4000: Calendar -> Add/remove content -> Show / hide columns: the selector window will pop up at background sometimes
-fixed
2012-06-28 15:43:48 -04:00
denise 5427fbc083 CC-4033: Record show icon gets covered with soundcloud icons (soundcloud, progress, and error)
-done
2012-06-28 15:23:21 -04:00
denise abc5b04045 fixed indentation 2012-06-28 14:02:57 -04:00
denise 0bc825947e CC-3995: Media Library -> it takes too long time to switch page or select all from this page if set as displaying 100 item in Media Library.
-done
2012-06-28 11:44:30 -04:00
james c4480a46b1 CC-4025: Suggest show colour in calendar automatically, based on show name
- done
2012-06-27 23:03:50 -04:00
denise 9fb9fb3219 CC-4021: Media Library -> "+" button wont take effect if uncheck one and check another
-fixed
2012-06-27 17:19:55 -04:00
denise 12bf42d2f1 CC-4031: Timeline cursor vanishes when every once in a while
-fixed
2012-06-27 15:50:56 -04:00
Martin Konecny 0a0e873ef9 CC-4019: Library: When "Add content" is clicked, "Proccessing" image …
-fix small comment typo
2012-06-27 11:50:31 -04:00
James 31d643cee1 CC-3997: Now Playing -> Time Line: different behaviour between 'delete'
button and 'delete' menu items

- added confirm box on clicking delete button on now playing table
- also added confirm box on library delete button as well
2012-06-26 17:43:15 -04:00
James 576c13963d CC-3998: Now Playing -> Time Line: confirm message for user 'delete'
track by context menu is misleading

- fixed
2012-06-26 17:35:07 -04:00
James c2cc4253b3 Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x 2012-06-26 16:56:01 -04:00
James 9a14051f0b CC-4019: Library: When "Add content" is clicked, "Proccessing" image is keep
flickering

- fixed
2012-06-26 16:55:43 -04:00
denise d892a4b5ae CC-4009: Calendar icon cannot be clicked twice without clicking another icon first
-fixed
2012-06-26 16:43:36 -04:00
denise ca3d554c07 CC-3983: Timeline cursor in Now Playing vanishes after adding a file to a show
-empty cursorId array after every callback
2012-06-26 15:49:17 -04:00
denise 05fa673e42 CC-3983: Timeline cursor in Now Playing vanishes after adding a file to a show
-done
2012-06-26 15:36:45 -04:00
James c669d3cb47 CC-3969: Reset Password: specifying wrong e-mail keeps you on the same page
without possibility to navigate back gracefully

- done
2012-06-20 18:02:46 -04:00
James 2480639e58 CC-3980: Excel export button in Playout History does not really export
Excel format

- removed xls option
2012-06-20 17:42:49 -04:00
James 5c43fa5a7b CC-3978: Playout History table says Artist when it should say Creator
- fixed
2012-06-20 16:51:34 -04:00
James 3a32e7240a CC-3984: Now Playing scissor and trashcan buttons are incorrectly labelled in
tooltips

- fixed
2012-06-20 16:49:41 -04:00
James e40d9731a2 CC-3979: Playout History export should include date range in file and/or
filename

- fix
2012-06-20 16:47:11 -04:00
James 6a75fd6c76 CC-3979: Playout History export should include date range in file and/or
filename

- done
2012-06-20 16:35:34 -04:00
denise b0e93005e5 Merge branch '2.1.x' into devel 2012-06-15 15:04:18 -04:00
denise d02607ed94 CC-3561: Add button to automatically rescan watched folders.
-done
2012-06-15 12:16:19 -04:00
James 73a7a76078 Merge branch 'CC-3963' into 2.1.x
Conflicts:
	airtime_mvc/public/js/airtime/preferences/streamsetting.js
2012-06-14 16:06:53 -04:00
denise 6b990f8712 Merge branch '2.1.x' of dev.sourcefabric.org:airtime into devel 2012-06-14 13:45:14 -04:00
denise 295a8ea5fe CC-3561: Add button to automatically rescan watched folders.
-done
2012-06-14 13:44:56 -04:00
denise 9cabd4d32c CC-3921: Add mobile phone number field to user record
-done
2012-06-13 13:39:54 -04:00
James 4077858c8e CC-3927: Should automatically switch back to Master/Show stream if there
is a connection interruption

- chaning label and description text
2012-06-13 12:46:26 -04:00
James 032637049d CC-3952: Calendar: Create/Edit Show's End time manually and keep date picker
open, the change will not take effect

- fixed
2012-06-12 17:07:24 -04:00
denise 8b2353ede0 Merge branch '2.1.x' into devel 2012-06-12 15:49:18 -04:00
James 57397312f2 CC-3963: If DJ is scheduled to broadcast for show, then automatically
enable source when DJ connects.

- done
2012-06-12 15:38:03 -04:00
denise df518fb03f Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x 2012-06-12 14:58:51 -04:00
denise 8a63478c73 CC-3972: it is not possible to select tracks in Now Playing tab
-fixed
2012-06-12 14:58:33 -04:00
Martin Konecny 22453f3820 CC-3968: Cannot preview file as * .MP3
-fixed
2012-06-12 11:31:10 -04:00
denise d66ba4074c Merge branch '2.1.x' into devel 2012-06-11 18:11:09 -04:00
denise 81c7eb7763 CC-3941: Overridden connection url in stream settings gets reverted back to default when 'Save' is clicked
-fixed
2012-06-11 18:08:36 -04:00
denise 1b057c8954 Merge branch '2.1.x' into devel 2012-06-11 16:49:03 -04:00
denise ebaff793be CC-3940: Calendar displays highlighting with regards to date and time of server instead of adjusting to the Timezone settings
-fixed (had to apply custom changes to new version of fullcalendar.js)
2012-06-11 16:43:24 -04:00
denise 5b9add360c CC-3718: Please enable user to input the mail server settings
-fixed soundcloud settings from collapsing if there are form input errors
2012-06-11 15:18:12 -04:00
denise d498c51814 Merge branch '2.1.x' into devel 2012-06-11 15:10:33 -04:00
denise d348d21c10 CC-3960: Day of week text is missing from monthly Calendar view
-fixed
2012-06-11 15:08:02 -04:00
denise 16b6f09420 CC-3959: Make default username "source" for master and show inputs
-done (just added tooltip)
2012-06-11 14:55:26 -04:00
denise ca8187c9c2 CC-3718: Please enable user to input the mail server settings
-done
2012-06-11 12:53:09 -04:00
denise cf32096d9c CC-3942: Canceling a storage folder change does not blank the Import Folder field
-fixed
2012-06-08 12:14:16 -04:00
denise 33f77c8c28 CC-3923: Show Timefilter - Even If the time filter is scheduled for yesterday it displays the Show played today
-fixed
2012-06-08 12:03:23 -04:00
denise 76c598c05b CC-3940: Calendar displays highlighting with regards to date and time of server instead of adjusting to the Timezone settings
-committing diff between original fullcalendar.js and changes made to it
2012-06-08 10:55:13 -04:00
denise 8fae454db6 CC-3901: DJ not assigned to Show, Guest: selection dialog populated upon clicking on "Select All" button in Now Playing
-fixed
2012-06-07 17:04:31 -04:00
denise 24f4e589a4 Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x 2012-06-07 16:10:04 -04:00
denise da7e44a78c CC-3940: Calendar displays highlighting with regards to date and time of server instead of adjusting to the Timezone settings
-fixed
2012-06-07 16:09:51 -04:00
James dc4597e526 CC-3910: NowPlaying-> preview dialog is greyed for files uploaded to Soundcloud
- fixed
2012-06-07 11:26:35 -04:00
denise a0a078db2b CC-3925: Media Library: Please keep staying current page after editing or searching items instead of switching to first page.
-fixed to keep current page after deleting an item
2012-06-07 10:33:00 -04:00
denise fda04295a6 CC-3941: Overridden connection url in stream settings gets reverted back to default when 'Save' is clicked
-fixed
2012-06-06 17:06:46 -04:00
denise 532b2710f0 CC-3932: Master/Source Source Connection URL should be in non-editable box
-done
2012-06-06 13:10:57 -04:00
denise 8e0c886350 CC-3896: Playlist Builder: Using "select this page" to add songs to playlist, those songs will be added in by opposite order, like a stack
-fixed whitespace in library.js
2012-06-06 10:45:27 -04:00
James b23e3d0a54 CC-3927: Should automatically switch back to Master/Show stream if there is a
connection interruption

- done
2012-06-05 16:41:41 -04:00
denise af71a03982 CC-3925: Media Library: Please keep staying current page after editing or searching items instead of switching to first page.
-maintains current page after edit metadata
2012-06-05 11:27:17 -04:00
denise a3754be31a CC-3850: Use qTip instead of custom tooltips
-done
2012-06-05 11:24:40 -04:00
denise 9c89d263db CC-3880: NowPlaying-> there is no tooltip for the removed files available
-done
2012-06-05 11:20:00 -04:00
denise c554190faf -fixed indentation 2012-06-05 11:20:00 -04:00
denise c18704aa4d CC-3900: Show Builder boxes remain checked even when the item is no longer visible
-fixed playlist builder "Dragging <x> items" message so <x> is amount of visible items only
2012-06-05 11:20:00 -04:00
denise 1b540626ed CC-3900: Show Builder boxes remain checked even when the item is no longer visible
-only visible tracks can be added/deleted
2012-06-05 11:20:00 -04:00
denise 5e894f7351 CC-3893: Add Media: Red underline appears on the bottom
-fixed
2012-06-05 11:19:59 -04:00
denise 05378f52d3 CC-3896: Playlist Builder: Using "select this page" to add songs to playlist, those songs will be added in by opposite order, like a stack
-fixed
2012-06-05 11:19:59 -04:00
denise 3566480999 CC-3888: Record Show: ON AIR light and scheduled Play will ON for several seconds when a record show starts
-fixed
2012-06-05 11:19:59 -04:00
Martin Konecny 54d741972a CC-3903: Help -> Getting Started: the link "user manual" is different from the menu item "Help -> User Manual"
-fixed
2012-06-03 22:51:23 -04:00
James e1a86d50f6 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-05-30 12:46:30 -04:00
James e48b2f2a84 CC-3913: Live Stream: When master switch is turned on, it turns off show switch
- fixed
2012-05-30 12:46:05 -04:00
Naomi Aro 1a49173d2f CC-3860 : Timeline: Can knock a current playing song out of place with drag and drop if current playing song has checkbox selected 2012-05-30 17:46:24 +02:00
denise 3277a81221 - moved calcAdditionalShowData call before currentShow and nextShow get assigned 2012-05-29 14:19:31 -04:00
Naomi Aro d91850b1ca CC-3877 : Now Playing-> Show manipulation buttons should be disabled for guest user and DJ's who are not assigned to the show 2012-05-24 18:10:36 +02:00
Naomi Aro 1b115178d3 CC-3877 : Now Playing-> Show manipulation buttons should be disabled for guest user and DJ's who are not assigned to the show 2012-05-24 15:50:29 +02:00
James a6dc2adb78 CC-3874: after 3 unsuccessful attempts to login no RE-CAPTCHA is shown and
you can't even login as admin user

- fixed
2012-05-23 17:14:59 -04:00
Naomi Aro bf614dd729 CC-3870 : Now playing -> "Add n items" displays wrong "n" when drag and drop tracks to Time Line 2012-05-23 17:40:56 +02:00
Naomi Aro 0c233c3346 CC-3860 : Timeline: Can knock a current playing song out of place with drag and drop if current playing song has checkbox selected 2012-05-23 17:06:04 +02:00
Naomi Aro 0b84dec86f CC-3862 : Now playing -> Time Line: Left clicking and "Select cursor" won't enable to add current selected track from Media Library 2012-05-23 12:18:51 +02:00
denise 773693f636 - fixed spelling mistake on variable 'songElapsedTime' in dashboard.js 2012-05-22 17:47:46 -04:00
Martin Konecny 8720aabc27 CC-3857: Chmod fixes for files which should not be executable
-fixed
2012-05-22 11:22:43 -04:00
Naomi Aro 438bc93133 CC-3851 : Preview Player: does not expand on Chrome, too big on Firefox 2012-05-22 15:03:34 +02:00
Naomi Aro 4fe80194b6 CC-3845 : General UI cleanup 2012-05-21 17:07:34 +02:00
Naomi Aro 466e30895c CC-3845 : General UI cleanup 2012-05-18 16:00:36 +02:00
Naomi Aro ff1327881a CC-3845 : General UI cleanup 2012-05-18 15:40:22 +02:00
denise 3ba4551ed3 - increased amount of time is allowed to pass before ON-AIR light is turned off 2012-05-17 18:49:06 -04:00
denise 9967f5451c CC-3737: ON AIR turns to grey from time to time, while the stream keeps playing
- fixed
- added a 'type' key to distinguish between tracks and shows
2012-05-17 18:21:58 -04:00
Naomi Aro fd0d82a873 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-05-17 17:53:23 +02:00
Naomi Aro 45ef2af142 CC-3420 : Custom UI for jplayer from CC-3395 2012-05-17 17:53:01 +02:00
denise 8abb57c402 CC-3842: Next scheduled show gets registered as next scheduled song
- removed case where light stays on for first 5 seconds of track
- also removed function calls no longer in use (notifySongStart(), and notifyShowStart())
- removed nowplayingdatagrid.js since it is no longer in use
2012-05-17 11:23:24 -04:00
Naomi Aro ccbe4f1998 CC-3420 : Custom UI for jplayer from CC-3395
creating new stylesheet for our audio previews based from jplayer blue monday.
2012-05-17 16:20:40 +02:00
denise 1629f41a8d CC-3737: ON AIR turns to grey from time to time, while the stream keeps playing
-fixed
2012-05-16 12:54:02 -04:00
Paul Baranowski c5b1e23486 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-05-15 17:13:20 -04:00
Paul Baranowski 2856d379b5 Fixed bug with upgrade notifications - it was always saying that your version
is obsolete if the version was greater than 1 minor version.
2012-05-15 17:13:01 -04:00
Naomi Aro 07d029b8cc CC-3777 : Decide on what should happen with canceling recorded show 2012-05-15 14:56:31 +02:00
denise ea5c5c8586 CC-3795: Schedule Play's line is all OFF after Master source is ON
-fixed
2012-05-14 12:16:11 -04:00
Naomi Aro 71c279a2f9 CC-3820 : when using reupload to soundcloud on calendar, progress icon never goes away unless you refresh the page 2012-05-14 16:30:18 +02:00
Naomi Aro 803c44611a CC-3819 : Add View on Soundcloud context menu option on calendar page 2012-05-14 15:48:09 +02:00
Naomi Aro ff5aebfd6b CC-3817 : Should use soundcloud icon for recorded & uploaded shows in timeline for past shows to match calendar 2012-05-14 15:06:56 +02:00
Naomi Aro 2b55002532 CC-3809 : Metadata popup keeps loading by right clicking the preview button of a playlist, only in Firefox 2012-05-11 11:27:53 +02:00
Naomi Aro 4e2aee83fd CC-3806 : "n" of Add n items increases unexpectly 2012-05-11 11:04:16 +02:00
Naomi Aro e61924de37 CC-3799 : Dragging and dropping a track from the library causes the track in the library to be selected 2012-05-10 14:19:36 +02:00
Martin Konecny 6c4bb1ef9e -rename playlists.js to dashboard.js 2012-05-08 20:41:09 -04:00
Martin Konecny 55312e9538 -add missing semicolons 2012-05-08 20:37:45 -04:00
denise 9203e8c5d6 CC-3768: Reduce number of columns selected by default on the Playlist Builder screen
-fixed
2012-05-07 16:24:59 -04:00
denise b4d8c72869 CC-3765: When master resource and schedule source are all ON, the current playing area only shows scheduled resource's name
-fixed
2012-05-07 16:08:26 -04:00
Naomi Aro df4cdfb07e CC-3687 : Remove context menus from recorded shows since they are blank. 2012-05-07 17:48:56 +02:00
Naomi Aro a79514c8ee CC-3687 : Remove context menus from recorded shows since they are blank. 2012-05-07 15:24:06 +02:00
Naomi Aro a4b949cc2f CC-3753 : Cannot cancel record show on Timeline view 2012-05-07 14:28:21 +02:00
Naomi Aro f78e6eaeca CC-3763 : Don't call window.resize callbacks multiple time during continuous events 2012-05-04 18:16:10 +02:00
Naomi Aro 025822ce35 CC-3763 : Don't call window.resize callbacks multiple time during continuous events 2012-05-04 18:13:01 +02:00
Naomi Aro 96d2f657f7 CC-3741 : Timeline's cursors looks a little bit far from timeline 2012-05-04 15:49:05 +02:00
Naomi Aro edaec54a5d CC-3724 : Now Playing -> Timeline view: to drag and drop single file very fast will block adding the same file
using jquery.blockUI.js on timeline/playlist builder pages.
2012-05-04 15:00:18 +02:00
Naomi Aro 12a5f17ff5 CC-3724 : Now Playing -> Timeline view: to drag and drop single file very fast will block adding the same file 2012-05-04 11:50:51 +02:00
Naomi Aro 0a17b34885 CC-3735 : Now Playing: Browser(Firefox) Mem usage goes high when play a show with hundreds of songs more than 3 hours 2012-05-03 18:00:10 +02:00
Naomi Aro 9b52115abc Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-05-03 15:04:56 +02:00
Naomi Aro c2c6e1b114 CC-3735 : Now Playing: Browser(Firefox) Mem usage goes high when play a show with hundreds of songs more than 3 hours
updating datatables to stable 1.9.1 release.

optimizing javascript, using jquery to add/remove nodes to avoid JQuery.cache issues.
2012-05-03 15:04:23 +02:00
denise 37190c25c6 CC-3737: ON AIR turns to grey from time to time, while the stream keeps playing
-reverting previous commit
2012-05-02 17:02:05 -04:00
denise 0d5b9ebada CC-3734: Library/Timeline: Use horizontal scrollbar when there isnt enough room for column data
-fixed
2012-05-02 11:26:39 -04:00
Naomi Aro 08d939d736 CC-3742 : Library: could be confused by carrying over selected state betwee pages 2012-05-02 14:40:27 +02:00
Naomi Aro c5f9288aab Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-05-02 11:15:20 +02:00
Naomi Aro b5b24ae8f1 CC-3735 : Now Playing: Browser(Firefox) Mem usage goes high when play a show with hundreds of songs more than 3 hours 2012-05-02 11:14:53 +02:00
denise 3c53d5c7e6 CC-3737: ON AIR turns to grey from time to time, while the stream keeps playing
-fixed
2012-05-01 10:51:28 -04:00
denise 4477ac02e7 CC-3677: Tooltips improvements
-done
2012-04-30 16:20:23 -04:00
Naomi Aro f6ff289506 CC-3677 : Tooltips improvements 2012-04-27 15:53:37 +02:00
Naomi Aro e6b724c45a CC-3729 : Create same UI for timeline to select checkboxes. 2012-04-27 15:44:40 +02:00
Naomi Aro d7dcd03de5 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-27 14:42:21 +02:00
Naomi Aro c42aebe5e9 CC-3715 : Library- carry over selected state between pages, be like gmail include select all/none 2012-04-27 14:41:52 +02:00
Naomi Aro b9e13d3b08 CC-3715 : Library- carry over selected state between pages, be like gmail include select all/none 2012-04-27 11:22:44 +02:00
Martin Konecny 88100e79ad CC-3725: Make it so that ON-AIR light never goes off between tracks.
-fixed
2012-04-26 15:26:07 -04:00
James c9df8e8b15 CC-3722: Create loading indicator for AJAX call when calculating Show length
- done
2012-04-26 11:56:14 -04:00
Martin Konecny a9d125bc4d Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-26 10:15:40 -04:00
Martin Konecny 9c9abfab8d CC-3704: No default checked day when creating repeat show
better validation of user input
2012-04-26 10:15:30 -04:00
Naomi Aro 2c84420424 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-26 12:15:31 +02:00
Naomi Aro b5863d3d7a CC-3522 : Now Playing Screen-> Periodical message pops up 2012-04-26 12:14:41 +02:00
James b5a65ae7e4 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-25 17:22:05 -04:00
James fe71487fa2 CC-3478: Calendar->Show has some inconsistencies on special Days (e.g.
switching to Daylight Saving Time)

- fixed
2012-04-25 17:21:25 -04:00
Martin Konecny e12bd35ee2 CC-3671: add show on week/day view doesn't get start time/end time filled in
-use str formatter for padding
2012-04-25 16:39:58 -04:00
Martin Konecny 517013ffc3 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-25 16:21:15 -04:00
Martin Konecny d04e053814 CC-3704: No default checked day when creating repeat show
-fixed
2012-04-25 16:21:03 -04:00
James 5c401cb472 CC-3671: add show on week/day view doesn't get start time/end time filled in
- fixed
- moved pad function into common.js
2012-04-25 16:04:36 -04:00
Naomi Aro 7e0e631740 CC-3616 : ShowBuilder-> A tooltip remains in the Showbuilder frame permanently 2012-04-25 15:52:11 +02:00
James 957b750d6a CC-3711: Verify Propel hasn't broken anything with its different handling
of boolean columns compared to Pear

- fixed
2012-04-24 16:49:14 -04:00
James 3c4d01aa93 CC-3675: Playlist -> the files from Disconnected Mediafolder can still
be previewed (played)

- done
2012-04-24 12:59:07 -04:00
James a41f100545 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-24 11:26:39 -04:00
James 2cb17a3b08 CC-3660: Cannot click Airtime Manual link on override info popup
- replaced the popup with qtip
2012-04-24 11:26:22 -04:00
Naomi Aro 8020ae0a29 CC-3688 : Make sure timeline knows to refresh itself when a rebroadcast file has been scheduled
forgot I commented out the check when fixing something in the past....
2012-04-24 17:21:59 +02:00
Martin Konecny b9ab11ce28 CC-3702: System -> Status: No difference between a service is failed vs a service is not monitor
-fixed
2012-04-23 17:18:34 -04:00
denise 558d2e5d9a CC-3330: Regression in library behavior: left click anywhere in a row should bring up menu, right click anywhere in row should bring up metadata 2012-04-20 13:01:47 -04:00
Martin Konecny 7d6e251adf Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-20 11:31:37 -04:00
Martin Konecny da8a5296b0 CC-3590: Calendar GUI->DJ user should not be able to invoke "Add Show" window
-add user type into javascript as a variable so we can check permissions on js side
2012-04-20 11:31:24 -04:00