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

1370 Commits

Author SHA1 Message Date
denise 402950211a CC-4735: Library: Edit metadata selection should be a popup instead of going to a new page 
-removed redundant 'Ok' button
 2012-12-05 13:23:58 -05:00
denise adb966a734 CC-4735: Library: Edit metadata selection should be a popup instead of going to a new page 
-cancel button does not reload the page anymore
 2012-12-05 13:21:18 -05:00
denise 062740ef81 CC-4735: Library: Edit metadata selection should be a popup instead of going to a new page 
-done
 2012-12-05 13:16:25 -05:00
denise 1846f17bbc CC-4731: Cannot save support feedback settings 2012-12-04 16:21:45 -05:00
denise e69bd74d6e -adding german translation files for datatables and plupload plugins 2012-12-04 12:14:35 -05:00
denise 7c046bd0cc -adding spanish translation file for plupload plugin 2012-12-04 12:14:01 -05:00
denise a10f8276db -added spanish .po, and.mo files 
-added spanish translation files for datatables and plupload
 2012-12-04 12:08:23 -05:00
denise 4515ac2aef - added french .po file 
- added french translations for datatables and plupload plugins
 2012-12-03 18:15:08 -05:00
denise 89e0458500 CC-4728: Support Feedback save action does not use ajax 
-done
 2012-12-03 17:15:47 -05:00
denise b2699fa914 merge from devel 2012-12-03 11:06:56 -05:00
denise 260c6aea59 Merge branch 'cc-1960-internationalize-airtime' of dev.sourcefabric.org:airtime into cc-1960-internationalize-airtime 2012-11-29 10:50:01 -05:00
denise 7a4e871495 Merge branch 'devel' into cc-1960-internationalize-airtime 2012-11-29 10:47:17 -05:00
James 4ad9e28e14 CC-1960: Internationalize Airtime / Support translations 
- korean lang pack
 2012-11-29 10:31:13 -05:00
denise 542434d9f0 CC-1960: Internationalize Airtime / Support translations 
-got rid of spaces at beginning of strings
-removed empty string translations
-overwrote Zend_Validate_Between object error messages
 2012-11-28 16:16:39 -05:00
denise 9689c75bed CC-1960: Internationalize Airtime / Support translations 
-added i18n to serverbrowser.js
-fixed small typo in SmartBlockCriteria.php
 2012-11-28 11:54:22 -05:00
denise 22bfc45497 CC-1960: Internationalize Airtime / Support translations 
-defined translations for show builder datatable
 2012-11-27 15:51:50 -05:00
denise 0a642fc717 CC-1960: Internationalize Airtime / Support translations 2012-11-27 12:23:16 -05:00
denise d2ed927e65 CC-1960: Internationalize Airtime / Support translations 
-playout history datatable was missing translation table
 2012-11-27 12:17:59 -05:00
denise b9b387fcd0 CC-1960: Internationalize Airtime / Support translations 
-fixed typos
 2012-11-27 11:59:55 -05:00
denise b677130a3f CC-1960Internationalize Airtime / Support translations 
-added gettext wrapper to strings missing it
-timepicker close button was not getting translated -fixed
 2012-11-23 16:39:41 -05:00
denise c6a5db4a78 CC-1960: Internationalize Airtime / Support translations 
-dashboard was missing a translation - fixed
 2012-11-23 10:48:44 -05:00
denise dd0e71efcc CC-1960: Internationalize Airtime / Support translations 
-added gettext wrapper function to all strings missing it
-i18n of jquery timepicker and datepicker
-i18n of jquery datatables columnFilter input place holder labels
 2012-11-22 17:32:24 -05:00
James da6013b523 CC-4717: Lintian warnings from devel branch 
- fixed
 2012-11-22 15:14:55 -05:00
denise 96b87d23e0 CC-1960: Internationalize Airtime / Support translations 
-added i18n for plupload
 2012-11-22 14:37:54 -05:00
Daniel James a819b20f55 Moved Flot license information into LICENSE_3RD_PARTY and debian/copyright files 2012-11-22 15:37:08 +00:00
denise 10b6dd202e Merge branch 'devel' into cc-1960-internationalize-airtime 
Conflicts:
	airtime_mvc/public/js/airtime/playlist/smart_blockbuilder.js
 2012-11-21 11:44:40 -05:00
denise 10cd31fa56 CC-1960: Internationalize Airtime / Support translations 
- channged all js strings with embedded variables to use sprintf
 2012-11-20 17:42:26 -05:00
denise 06c3dcb69e CC-1960: Internationalize Airtime / Support translations 
-added jquery.i18n library
 2012-11-20 16:43:42 -05:00
denise e9b9f63630 CC-1960: Internationalize Airtime / Support translations 
-added english translation file for datatables
 2012-11-20 16:42:06 -05:00
denise f40d1f8dd4 CC-1960: Internationalize Airtime / Support translations 
-enabled i18n for datatables, colVis, columnFilter, and fullCalendar
-fixed typos in full-calendar-functions.js
 2012-11-20 16:40:02 -05:00
James d69faef560 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-11-20 15:05:20 -05:00
James 4737232b21 CC-2401: Shuffle option in playlists 
- add delayed removing of success message
 2012-11-20 15:05:09 -05:00
denise 57fdab0ddf CC-1960: Internationalize Airtime / Support translations 
-added i18n jquery library
-created a Locale controller that returns a js dictionary of translations needed in js
-added jquery i18n wrapper function to all strings in js
 2012-11-20 11:33:37 -05:00
Martin Konecny fed39077c0 Merge branch '2.2.x' into devel 2012-11-20 11:21:29 -05:00
Martin Konecny d1a22fe7ca CC-4677: Improve Smart block repeat description 
-fixed
 2012-11-15 11:30:56 -05:00
James 2b2a1db055 CC-2401: Shuffle option in playlists 
- done
 2012-11-13 17:32:10 -05:00
denise 0a0cf70046 CC-4687: System -> Stream: Cannot expand/shrink Stream 1/2/3 settings after clicking Save 
-fixed
 2012-11-12 12:06:22 -05:00
denise ef8f8dfa75 CC-4688: System -> Preferences: Please expand the Soundcloud settings if warning for wrong settings exists 
-fixed
 2012-11-12 11:45:26 -05:00
James 7300b608cf Merge branch 'cc-4661-listener-statistics' into devel 
Conflicts:
	python_apps/api_clients/api_client.py
 2012-11-07 17:20:12 -05:00
James 9112a8d0b1 CC-4661: Listener Statistics 
- enhancement on flot
- data point reduction
 2012-11-07 16:26:31 -05:00
denise ccd6447696 - install failed due to wrong metadata key 
- wrong controller action called
 2012-11-07 12:05:20 -05:00
denise b817684972 Merge branch '2.2.x' into devel 
Conflicts:
	airtime_mvc/application/controllers/PreferenceController.php
	airtime_mvc/application/models/StoredFile.php
	airtime_mvc/public/js/bootstrap/bootstrap.js
 2012-11-07 11:21:36 -05:00
denise bf4f5fd699 CC-4607: Library: Please make the 'Add x items' following mouse's point 
-fixed
 2012-11-06 16:34:06 -05:00
James 9712e64a69 CC-4661: Listener Statistics 
- bug fix and removing unnecessary code
 2012-11-06 14:52:35 -05:00
denise a1a7396ec9 CC-4455: "Add to current smart block" context menu action should be disabled for dynamic smart blocks 
-disabled this button in the library toolbar if dynamic blocks are open
 2012-11-06 14:29:26 -05:00
James 2e79e8421c CC-4661: Listener Statistics 
- better legend for multiple series of data
- consistant number of ticks on x-axis
 2012-11-06 10:54:52 -05:00
denise 78e731f717 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-11-05 12:03:59 -05:00
denise 8fda0ba610 CC-4625: On tablet you cannot create a playlist, smart block or webstream 
-attempt #2
 2012-11-05 12:03:46 -05:00
denise c051e0671d CC-4625: On tablet you cannot create a playlist, smart block or webstream 
-attempt #2
 2012-11-05 12:00:37 -05:00
Martin Konecny d467abe509 Merge branch 'cc-4585' of https://github.com/rgrinberg/Airtime into devel 2012-11-05 11:27:34 -05:00
denise a201d6f2da CC-4666: Showbuilder page is dead 
-fixed. result of a bad merge
 2012-11-05 11:15:26 -05:00
James 74fe958cad CC-4661: Listener Statistics 
- changes for different mount names
 2012-11-02 18:25:08 -04:00
James 3af3cd5870 CC-4661: Listener Statistics 
- frontend part
 2012-11-02 17:00:38 -04:00
denise 2854dd40e0 CC-4663: Smart Blocks -> Deleting a track in smart block from library gives error 
-fixed
-tracks with undefined mime type were not handled properly
 2012-11-02 16:54:49 -04:00
denise 135aadf16b Merge branch '2.2.x' into devel 
Conflicts:
	airtime_mvc/application/controllers/LibraryController.php
	airtime_mvc/application/views/scripts/library/library.phtml
	airtime_mvc/public/js/airtime/showbuilder/builder.js
	airtime_mvc/public/js/airtime/showbuilder/main_builder.js
 2012-11-02 12:28:21 -04:00
denise 715a21acb2 CC-4625: On tablet you cannot create a playlist, smart block or webstream 
-upgraded bootstrap-dropdown.js to v2.2.1
 2012-11-02 11:59:36 -04:00
denise a937df30ad Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x 2012-11-02 10:48:16 -04:00
denise cc208da2fb CC-4536: Smart block criteria use AND logic, but additional modifiers use OR logic, without labels to show the difference 
-added labels
 2012-11-02 10:48:08 -04:00
James 575400b4c2 CC-4623: Library: Preview button for Flac does not work 
- fixed
 2012-11-01 16:44:37 -04:00
James d7a5ab4d94 CC-4622: Library: AAC file can be preview but is blocked from playlist and content menu 
- fixed
 2012-11-01 15:21:56 -04:00
denise dfd52eedf1 CC-4654: Library -> Simple search still has effects even if you are doing an advanced search 
-fixed
 2012-10-31 15:24:50 -04:00
james 2e4d5ec142 CC-4539: Advanced search: Sample rate searched on Hz, but search results 
shown in kHz

- fixed
 2012-10-31 12:32:40 -04:00
James 9d495ebc03 CC-4639: Give an option to allow smart blocks to reuse tracks if not enough tracks meet the time limit. 
- done
 2012-10-30 17:57:58 -04:00
denise 00947f9d7e CC-4640: Automatically jump to current song when loading the Now Playing page. 
-small fix
 2012-10-30 15:34:38 -04:00
denise cabe583a3b CC-4649: Library -> Disable simple search if advanced search fields are open 
-done
 2012-10-30 15:01:46 -04:00
denise 695c0fa926 CC-4607: Library: Please make the 'Add x items' following mouse's point 
-fixed
 2012-10-30 11:45:53 -04:00
denise b08f5091b5 CC-4609: Calendar -> Add/Remove contents: Please remove useless buttons: 'Jump to current playing song' and 'Cancel current show' 
-done
 2012-10-30 11:18:11 -04:00
denise d97afabaea CC-4640: Automatically jump to current song when loading the Now Playing page. 
-added check to see if a show is currently playing
 2012-10-29 15:40:58 -04:00
denise 332f9993c0 CC-4640: Automatically jump to current song when loading the Now Playing page. 
-done
 2012-10-29 15:20:16 -04:00
denise fdd889d7a8 - fixed formatting 2012-10-29 12:09:11 -04:00
Rudi Grinberg dc00528cd5 Merged baseUrl related conflicts 2012-10-29 11:56:20 -04:00
denise 3a7700eaac CC-4583: Use AJAX calls instead of refreshing entire page 
-done
 2012-10-26 18:09:30 -04:00
James e667a721ad - comment for some code 2012-10-26 16:26:48 -04:00
James 1ee228558a CC-4574: Audio preview fails with certain characters in metadata 
- fixed
 2012-10-26 16:24:17 -04:00
denise c51fb8a040 CC-4549: Tooltip for source username cannot be shared between input and output settings 
-fixed
 2012-10-22 16:37:06 -04:00
denise f30d636b17 CC-4581: Confirmation dialog for removing an item from a show refers to deletion 2012-10-19 16:19:32 -04:00
denise 7d8079f770 Merge branch '2.2.x' into devel 
Conflicts:
	airtime_mvc/application/controllers/ShowbuilderController.php
	airtime_mvc/public/js/airtime/audiopreview/preview_jplayer.js
	airtime_mvc/public/js/airtime/common/common.js
 2012-10-19 12:50:36 -04:00
Martin Konecny f5051cff3a CC-4605: Some AJAX calls are cached 
-fixed
 2012-10-19 11:22:44 -04:00
Martin Konecny d5c2c37a3e Revert "CC-4605: Some AJAX calls are cached" 
This reverts commit ffca5b42a8.
 2012-10-19 11:16:42 -04:00
denise d32495d100 CC-2184: Hardcoded CSS path should be relative path instead 2012-10-19 11:09:34 -04:00
Martin Konecny ffca5b42a8 CC-4605: Some AJAX calls are cached 2012-10-19 11:07:37 -04:00
denise e9815b617b - added comment 2012-10-18 15:21:38 -04:00
denise 67ac4340c4 CC-4596: Too many ajax calls in Calendar page 
-fixed
 2012-10-18 14:47:19 -04:00
Daniel James 7c799cd3af Fixed formatting of tooltip for smart blocks 2012-10-18 13:01:55 +01:00
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