Commit Graph

1354 Commits

Author SHA1 Message Date
Daniel James b4fee4321c CC-4537: Bit rate hint should be in kbps to match actual search 2012-10-09 16:46:51 +01:00
Daniel James c6dc5a818f CC-4172: Fix alignment of 'is in the range' boxes 2012-10-09 16:24:03 +01:00
Daniel James 456d9ba99a CC-4172: Shrink width of table to fit 1280 pixel wide display 2012-10-08 15:33:57 +01:00
Daniel James 44a3f85636 CC-4507: Tweak CSS to make more room for metadata in Master Panel 2012-10-08 12:49:54 +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 968c719fa1 CC-4172: Smart Playlist creator requires full HD monitor to avoid buttons being hidden
-done
2012-10-02 14:12:22 -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
Daniel James 7d00631150 Set min-width value for source info block in Master Panel (CC-4510) 2012-10-01 12:11:36 +01: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 29347527cf CC-4471: Library -> Remove extra top margin in playlist builder
-done
2012-09-19 17:14:22 -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 182bdd0cf6 -added border to smart block expansion 2012-09-17 15:57:41 -04: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
denise 3329c36d0c - changed smart block range text boxes to align with new UI 2012-09-17 15:23:47 -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 fd72e20d83 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-17 12:30:56 -04:00
denise f840a9b24a CC-4451: (Firefox) Now Playing -> Can't cancel Current Show
-fixed
2012-09-17 12:30:43 -04:00
James 54c3c13754 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-17 12:29:07 -04:00
James d089d3fbf3 - putting scroll bar on library left pane 2012-09-17 12:28:46 -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
Vladimir c19030e8fb CC-4155: additional styling 2012-09-17 17:39:40 +02: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 1d46110f36 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-17 10:52:47 -04:00
Rudi Grinberg 6118cd63d7 cc-4419: Added quick hack for now 2012-09-17 10:52:37 -04:00
Vladimir 207fe29560 CC-4155: Style static/dynamic expansion blocks in playlist contents 2012-09-17 16:50:34 +02:00
Rudi Grinberg 1c2cebf5a8 Removed comment 2012-09-17 10:27:12 -04:00
Rudi Grinberg 44f3020709 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-17 10:21:34 -04:00
Vladimir f6d8e4b957 CC-4078: Calendar -> Need better 'now-playing' icon 2012-09-17 16:17:05 +02:00
Vladimir 465de07ae0 Minor cosmetic change of the liquidsoap status 2012-09-17 15:32:33 +02:00
Vladimir d888d1cb1c CC-4443: Context menu is not displayed correctly 2012-09-17 15:27:13 +02:00
Vladimir 9776da8bf4 Fixed playlist item width 2012-09-17 14:39:57 +02:00
Rudi Grinberg f809a17c02 Formatting 2012-09-14 19:05:30 -04:00
denise a75a12a198 -smart block criteria UI change for small screen resolution 2012-09-14 18:02:40 -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 c84a608747 CC-4438: Station Time is always UTC time no matter what the time zone setting is
-fixed
2012-09-14 16:51:39 -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
Martin Konecny a396136600 bootstrap.css file 2012-09-13 10:42:53 -04:00
Rudi Grinberg 52882ef938 Added mp4 removed aac. 2012-09-13 10:35:13 -04:00
Martin Konecny 54d7f496d9 add bootstrap.js to bootstrap.php 2012-09-12 23:06:05 -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
Vladimir 8938eaa637 Added missind Bootstrap CSS (bootstrap_custom.css) 2012-09-12 23:18:37 +02: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
Rudi Grinberg f47593575c switch defaults for verbose stack trace 2012-09-12 11:51:11 -04:00
Rudi Grinberg 8b433de006 Made verbose trace opt out. 2012-09-12 11:45:08 -04:00
Rudi Grinberg 6b8cb52572 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-11 18:23:01 -04:00
Rudi Grinberg 77215d175c More verbose exceptions 2012-09-11 18:22:12 -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
Martin Konecny bcc095e924 CC-4389: Convert all PHP errors to throw exceptions instead
-don't throw exception for suppressed errors.
2012-09-11 12:03:52 -04:00
denise 49f2a31be1 - added advanced search validation for owner and last played time 2012-09-11 11:22:12 -04:00
Martin Konecny 245d9a95d0 CC-4389: Convert all PHP errors to throw exceptions instead
-don't throw exception for suppressed errors.
2012-09-11 11:12:58 -04:00
Martin Konecny 1635842b81 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-11 00:51:08 -04:00
Martin Konecny 8db4c94af1 CC-4389: Convert all PHP errors to throw exceptions instead
-echo to stdout as well
2012-09-11 00:50:56 -04:00
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 fb7de88a30 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-10 17:54:45 -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
Martin Konecny e275e286cb Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-10 17:43:40 -04:00
Martin Konecny 8bbc0bff94 CC-4389: Convert all PHP errors to throw exceptions instead
-echo to stdout as well
2012-09-10 17:43:29 -04:00
denise bba001c0db -diff between original dataTables.columnFilter.js and our modified version 2012-09-10 17:41:54 -04:00
Martin Konecny 726cadf5ce Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-10 17:40:19 -04:00
denise def513d200 -fixed commit problem 2012-09-10 17:38:05 -04:00
Martin Konecny ade4bcf958 CC-4389: Convert all PHP errors to throw exceptions instead
-fixed
2012-09-10 17:36:55 -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
Martin Konecny acf06e289f Try catching more errors into zendphp.log 2012-09-06 14:01:54 -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
Martin Konecny b6b4e25a37 allow Airtime environment to be accessed from CLI
-fixed
2012-09-05 17:34:12 -04:00
Martin Konecny dad1cf32c9 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-05 17:29:55 -04:00
Martin Konecny 7cbfb5d40d allow Airtime environment to be accessed from CLI 2012-09-05 17:29:34 -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 8e40137b7d CC-4316: Missing image file
-fixed
2012-09-04 11:58:54 -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 ef5427d0bc CC-4197: Media Library -> Regular Playlist: Some character get cut off in context view
-fixed
2012-08-22 14:18:48 -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 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
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 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
denise c774e3b9bd Smart Playlists: got rid of horitzontal scrolling 2012-08-10 10:42:01 -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
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
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
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 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 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 0fe501508e Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-07 15:54:42 -04:00