Commit Graph

7919 Commits

Author SHA1 Message Date
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
Rudi Grinberg 45385dffce cc-4105: added docstring and comments 2012-07-18 13:43:29 -04:00
Rudi Grinberg df86fad6bf Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-07-18 12:37:32 -04:00
Rudi Grinberg 3599f32ee6 cc-4105: fixed runtime error where recorder would initialize and api client instance from a method that would not exist\n\tRefactored getDateTimeObj a little bit 2012-07-18 12:35:43 -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
Rudi Grinberg 97d8c58a1b cc-4105: added rabbit mq messge handling stubs 2012-07-18 12:17:44 -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
Rudi Grinberg 2c6e5733a0 Added basics of RabbitMQ handling 2012-07-18 11:45:58 -04:00
Rudi Grinberg d1019ec017 cc-4105: code formatting 2012-07-18 11:45:18 -04:00
Rudi Grinberg 34194e6411 cc-4105: Removed -u from running pypo and mediamonitor. Not necessary anymore. 2012-07-18 11:16:55 -04:00
Rudi Grinberg 86376cf25c cc-4105: fixed conflic 2012-07-17 16:47:52 -04:00
Rudi Grinberg 396a8465cb cc-4105: Minor formatting change 2012-07-17 16:45:27 -04:00
Rudi Grinberg 6efbf8903e cc-4105: Added a lot of comments.\nFixed encodings 2012-07-17 16:43:04 -04:00
Rudi Grinberg c23023bcd9 Removed irrelevant comment 2012-07-17 16:43:04 -04:00
Rudi Grinberg edc5e95ce4 cc-4105: added a a few tests for api_client 2012-07-17 16:43:04 -04:00
Rudi Grinberg 25d3028fb1 cc-4105: added testing support for api client and ApiController 2012-07-17 16:43:04 -04:00
Rudi Grinberg 531dfe2b5e cc-4105: fixed up python media monitor request parameter for recorded shows\n.Added more input validation in php controller 2012-07-17 16:43:04 -04:00
Rudi Grinberg 0ddc8497c3 cc-4105: small improvement in reloadMetadataGroupAction. We give more detailed responses and log bad requests in a little more detail as well 2012-07-17 16:43:04 -04:00
Rudi Grinberg f348652f0e cc-4105: reloadMetadataGroupAction seems to be ready for production.\nSet the parameter correctly after finishing the debugging from the python side 2012-07-17 16:43:04 -04:00
Rudi Grinberg fdf921bbaf cc-4105: Made reloadMetadataGroupAction safer by validating input 2012-07-17 16:43:04 -04:00
Rudi Grinberg 01448d42df cc-4105: added some comments to describe development 2012-07-17 16:43:04 -04:00