Commit Graph

8040 Commits

Author SHA1 Message Date
Martin Konecny b283b5b55e CC-1665: Scheduled stream rebroadcasting and recording
-remove unused function
2012-07-26 14:49:32 -04:00
Martin Konecny be8262b67c CC-1665: Scheduled stream rebroadcasting and recording
-fixed web stream length not showing up correctly
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 cf2f96ecf1 remove commented code 2012-07-26 14:49:31 -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 d0e4ad1334 script to regenerate database schema 2012-07-26 14:41:40 -04:00
Martin Konecny 31176f525e CC-1665: Scheduled stream rebroadcasting and recording
-started working on UI
2012-07-26 14:41:40 -04:00
Martin Konecny 2ad7e78e10 CC-1665: Scheduled stream rebroadcasting and recording
-initial prototype
2012-07-26 14:41:39 -04:00
Martin Konecny ed54e882a3 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-07-26 14:41:22 -04:00
Martin Konecny 3f41835e12 re-add getCurrentShowAction 2012-07-26 14:36:21 -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 3df0f2d26e CC-84: Smart Playlists
- added 'add' option to smart playlist context menu
2012-07-26 12:45:31 -04:00
James 40bd33df11 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-07-26 10:49:38 -04:00
James 9bd823ee2c CC-84: Smart Playlists
- fixed the issue where block length wasn't updated on spl section
2012-07-26 10:49:23 -04:00
Martin Konecny 077cc735d7 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-07-25 18:42:59 -04:00
Martin Konecny 275efb254a fix improperly renamed functions 2012-07-25 18:42:46 -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 c79110644d Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-07-24 12:14:02 -04:00
denise 754187a2b7 CC-84: Smart Playlists
- remove subform and combined back into one form
2012-07-24 12:13:51 -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
James 32f431c584 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
Conflicts:
	airtime_mvc/application/models/Playlist.php
2012-07-23 11:03:29 -04:00
denise 952a584f10 CC-84: Smart Playlists
- form cleanup
2012-07-23 10:45:17 -04:00
denise 30b64f81fd Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-07-23 10:41:09 -04:00
denise c99e1b892c CC-84: Smart Playlists
-divided criteria into sub form to handle multiple sets
2012-07-23 10:40:53 -04:00
Martin Konecny 255866d240 Merge branch '2.1.x' into devel
Conflicts:
	airtime_mvc/application/controllers/ScheduleController.php
	airtime_mvc/application/models/Show.php
2012-07-22 19:18:53 -04:00
Martin Konecny aaa0c01e01 CC-4120: memory optimizations for calendar page.
-can now fetch over a year of data at a time
2012-07-22 19:14:29 -04:00
James ef64ce2b73 CC-4112: Smart Playlist: Cannot search Long string
- added length validator
- extra fix: Due to lazy loading, aggregated field on playlist was not
updated properly.
2012-07-20 15:32:46 -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 d801139a12 CC-84: Smart Playlists
- utime and mtime in library were displaying in UTC
2012-07-19 19:11:42 -04:00
denise 14712d4d78 CC-84: Smart Playlists
- fixed undefined index warnings
2012-07-19 19:09:51 -04:00
denise 624986e973 - removed unnecessary logging line 2012-07-19 18:11:31 -04:00
denise 8e60aec601 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-07-19 18:07:55 -04:00
denise 647de9ed39 CC-84: Smart Playlists
- started storing last played time in cc_files
- db column (lptime) already existed but was not being used before this
- will use this as a criteria for smart playlists
2012-07-19 18:07:39 -04:00
James 2e7cf68777 CC-4110: Smart Playlist: some search criteria don't work
- added bunch of validation
- fixed a bug with range modifier not working correctly
2012-07-19 16:57:24 -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
James 0322e6b0c6 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-07-19 14:45:34 -04:00
James 82f087c84d CC-84: Smart Playlists
- changed db query so it's lazy loading
2012-07-19 14:45:15 -04:00
Rudi Grinberg 1f603bb75b cc-4105 : merge devel into my branch 2012-07-19 10:51:04 -04:00
Rudi Grinberg 1d85c65b74 cc-4105: Added more tests. 2012-07-19 10:37:18 -04:00
Rudi Grinberg 12aa76b0a8 cc-4105: Made config object persist data after being garbage collected. Added more tests 2012-07-18 16:13:30 -04:00
James 6fc41ee4bf Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-07-18 16:12:20 -04:00
James 266d86d9e4 CC-84: Smart Playlists
- fixed a bug
- change LIKE to ILIKE
2012-07-18 16:12:06 -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
Martin Konecny 8828961246 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-07-18 14:55:39 -04:00
Martin Konecny b64b84b9ce re-add replay gain to old media-monitor 2012-07-18 14:55:29 -04:00
Rudi Grinberg 76cac68fe7 cc-4105: Added exceptions classes. Created config wrapper class 2012-07-18 14:27:36 -04:00