Commit Graph

855 Commits

Author SHA1 Message Date
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 9bdb4a40e0 CC-84: Smart Playlists
-fixed playlist type spacing on UI
2012-07-20 12:32:18 -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