Commit Graph

8040 Commits

Author SHA1 Message Date
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
Rudi Grinberg b0f5b722db cc-4105: fixed typo.\nadded some error checking in case bad parameters are given to dispatchMetadataAction 2012-07-17 16:43:04 -04:00
Rudi Grinberg b021c3e925 Added todo comment 2012-07-17 16:43:04 -04:00
Rudi Grinberg 98b4e3c47b cc-4105: Tweaked php method to have more consistent return values 2012-07-17 16:43:04 -04:00
Rudi Grinberg 68a218d277 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-17 16:43:04 -04:00
Rudi Grinberg aa298453b7 cc-4105: removed useless comments 2012-07-17 16:43:04 -04:00
Rudi Grinberg eb00b5cbb3 cc-4105: renamed controller action and method to correct name 2012-07-17 16:43:04 -04:00
Rudi Grinberg daee78a3bb cc-4105: Added a lot of comments.\nFixed encodings 2012-07-17 16:42:12 -04:00
Rudi Grinberg 151251dc6e Removed irrelevant comment 2012-07-17 16:17:54 -04:00
Rudi Grinberg e2881efe1e cc-4105: added a a few tests for api_client 2012-07-17 16:16:51 -04:00
Rudi Grinberg 1f66ccb26f cc-4105: added testing support for api client and ApiController 2012-07-17 16:16:06 -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
Martin Konecny 1bd07eeaca Merge branch '2.1.x' into devel
Conflicts:
	airtime_mvc/application/models/ServiceRegister.php
2012-07-17 15:00:53 -04:00
Rudi Grinberg 883e792083 cc-4105: fixed up python media monitor request parameter for recorded shows\n.Added more input validation in php controller 2012-07-17 14:50:18 -04:00
Martin Konecny eba4b688c4 User Patch: If a callback is not given, then just provide the raw JSON.
Submitted by Ross Masters <ross@rossmasters.com>
2012-07-17 14:47:13 -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
Rudi Grinberg 919f89f747 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 14:24:45 -04:00
Rudi Grinberg f6e76b79a4 cc-4105: reloadMetadataGroupAction seems to be ready for production.\nSet the parameter correctly after finishing the debugging from the python side 2012-07-17 14:19:22 -04:00
Rudi Grinberg e7daa67628 cc-4105: Made reloadMetadataGroupAction safer by validating input 2012-07-17 13:52:24 -04:00
Vladimir 1e76845e9c more sophisticated remote_addr determining 2012-07-17 13:34:48 -04:00
Rudi Grinberg e0ba52644f cc-4105: added some comments to describe development 2012-07-17 12:03:57 -04:00
Rudi Grinberg 93276f64fc cc-4105: fixed typo.\nadded some error checking in case bad parameters are given to dispatchMetadataAction 2012-07-17 12:01:50 -04:00
Rudi Grinberg aa8b107ab9 Added todo comment 2012-07-17 11:48:05 -04:00
Rudi Grinberg 166e2cfc2d cc-4105: Tweaked php method to have more consistent return values 2012-07-17 11:20:58 -04:00
Rudi Grinberg 4ddc5a1f84 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-17 11:19:19 -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
Rudi Grinberg 06209ca224 cc-4105: removed useless comments 2012-07-17 10:21:06 -04:00
denise e0a674a96c CC-84: Smart Playlists
-added save button for static playlists
2012-07-16 18:24:46 -04:00
Rudi Grinberg 860d504621 cc-4105: renamed controller action and method to correct name 2012-07-16 18:08:17 -04:00