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

705 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 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
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
Rudi Grinberg 1f603bb75b cc-4105 : merge devel into my branch 2012-07-19 10:51:04 -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
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 c23023bcd9 Removed irrelevant comment 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 98b4e3c47b cc-4105: Tweaked php method to have more consistent return values 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
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
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
Vladimir 1e76845e9c more sophisticated remote_addr determining 2012-07-17 13:34:48 -04:00
Rudi Grinberg 20e32b98ba Merge branch 'devel' into mediamonitor2 
Conflicts:
	python_apps/api_clients/api_client.py
 2012-07-16 17:41:36 -04:00
Rudi Grinberg 1804531e84 removed comment 2012-07-16 17:19:11 -04:00
James fc09baacd7 CC-84: Smart Playlists 
- static playlist is done.
 2012-07-16 17:18:37 -04:00
Rudi Grinberg a1c205edff cc-4105: Removed wrong error handling from api_client. Split up controller action to make it reusable through other actions 2012-07-16 16:43:48 -04:00
Rudi Grinberg 1c084a3101 moved misplaced docstring 2012-07-16 15:47:44 -04:00
Rudi Grinberg d08b62dd39 cc-4105: removed dead code path 2012-07-16 15:25:45 -04:00
Rudi Grinberg 723e6356bc Merge branch 'mediamonitor2' of dev.sourcefabric.org:airtime into mediamonitor2 2012-07-16 14:58:34 -04:00
Rudi Grinberg a9f6bb3b5c cc-4105: changed error handling from returning none to throwing exception 2012-07-16 14:58:23 -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
Martin Konecny 312f35ae48 CC-430: Audio normalization (Replaygain Support) 
-change default database value to null
 2012-07-16 12:10:42 -04:00
Rudi Grinberg 3e24b71436 removed wrong comments 2012-07-16 10:31:00 -04:00
Martin Konecny ce1a63f47d CC-430: Audio normalization (Replaygain Support) 
-small bug fixes
 2012-07-15 22:55:52 -04:00
Martin Konecny 583695f98c CC-430: Audio normalization (Replaygain Support) 
-values are now written through to database
 2012-07-15 22:22:42 -04:00
Martin Konecny 39760f8494 CC-4090: Make code style PSR compliant 2012-07-15 22:22:07 -04:00
Martin Konecny 632f039977 CC-430: Audio normalization (Replaygain Support) 
-values are now written through to database
 2012-07-15 22:19:55 -04:00
Martin Konecny b4f1cc13c0 CC-430: Audio normalization (Replaygain Support) 
make code simpler (don't download database to file)
 2012-07-15 22:19:16 -04:00
Rudi Grinberg 71dc7d99b4 cc-4105: added a method in API client corresponding to chunked requests.\nAlso add prepared corresponding apicontroller method 2012-07-15 22:17:36 -04:00
Rudi Grinberg 44d91f7798 cc-4105: clean up url construction in api client 2012-07-15 22:17:36 -04:00
Rudi Grinberg 0fd6c4adbf fixed typo 2012-07-15 22:17:36 -04:00
Rudi Grinberg 9f1ec3c05c created a new controller action for chunked requests from media monitor 2012-07-15 22:16:58 -04:00
Martin Konecny 794cf2c845 CC-4090: Make code style PSR compliant 
-run psr-cs-fixer
 2012-07-15 21:17:13 -04:00
Martin Konecny 5661872034 checkAuth in init() function 2012-07-15 21:07:34 -04:00
Rudi Grinberg 8340079b95 cc-4105: added a method in API client corresponding to chunked requests.\nAlso add prepared corresponding apicontroller method 2012-07-13 17:57:18 -04:00