14712d4d78
CC-84: Smart Playlists
...
- fixed undefined index warnings
2012-07-19 19:09:51 -04:00
624986e973
- removed unnecessary logging line
2012-07-19 18:11:31 -04:00
8e60aec601
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-07-19 18:07:55 -04:00
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
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
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
0322e6b0c6
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-07-19 14:45:34 -04:00
82f087c84d
CC-84: Smart Playlists
...
- changed db query so it's lazy loading
2012-07-19 14:45:15 -04:00
1f603bb75b
cc-4105 : merge devel into my branch
2012-07-19 10:51:04 -04:00
6fc41ee4bf
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-07-18 16:12:20 -04:00
266d86d9e4
CC-84: Smart Playlists
...
- fixed a bug
- change LIKE to ILIKE
2012-07-18 16:12:06 -04:00
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
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
7c5291fe0c
CC-84: Smart Playlists
...
- ui cleanup
2012-07-18 11:55:29 -04:00
2a38527161
CC-84: Smart Playlists
...
- propel usage chage
- cleaning up code
- some js changes
2012-07-18 11:52:09 -04:00
c23023bcd9
Removed irrelevant comment
2012-07-17 16:43:04 -04:00
25d3028fb1
cc-4105: added testing support for api client and ApiController
2012-07-17 16:43:04 -04:00
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
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
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
fdf921bbaf
cc-4105: Made reloadMetadataGroupAction safer by validating input
2012-07-17 16:43:04 -04:00
01448d42df
cc-4105: added some comments to describe development
2012-07-17 16:43:04 -04:00
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
98b4e3c47b
cc-4105: Tweaked php method to have more consistent return values
2012-07-17 16:43:04 -04:00
aa298453b7
cc-4105: removed useless comments
2012-07-17 16:43:04 -04:00
eb00b5cbb3
cc-4105: renamed controller action and method to correct name
2012-07-17 16:43:04 -04:00
0aae7c75ae
CC-84: Smart Playlists
...
- added shuffle button
- moved all callbacks into one function
2012-07-17 15:32:26 -04:00
1bd07eeaca
Merge branch '2.1.x' into devel
...
Conflicts:
airtime_mvc/application/models/ServiceRegister.php
2012-07-17 15:00:53 -04:00
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
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
1e76845e9c
more sophisticated remote_addr determining
2012-07-17 13:34:48 -04:00
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
a4ba776b0f
CC-84: Smart Playlists
...
- save playlist type to db
- on edit type is loaded
2012-07-17 11:07:16 -04:00
e0a674a96c
CC-84: Smart Playlists
...
-added save button for static playlists
2012-07-16 18:24:46 -04:00
20e32b98ba
Merge branch 'devel' into mediamonitor2
...
Conflicts:
python_apps/api_clients/api_client.py
2012-07-16 17:41:36 -04:00
1804531e84
removed comment
2012-07-16 17:19:11 -04:00
fc09baacd7
CC-84: Smart Playlists
...
- static playlist is done.
2012-07-16 17:18:37 -04:00
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
1c084a3101
moved misplaced docstring
2012-07-16 15:47:44 -04:00
d08b62dd39
cc-4105: removed dead code path
2012-07-16 15:25:45 -04:00
723e6356bc
Merge branch 'mediamonitor2' of dev.sourcefabric.org:airtime into mediamonitor2
2012-07-16 14:58:34 -04:00
a9f6bb3b5c
cc-4105: changed error handling from returning none to throwing exception
2012-07-16 14:58:23 -04:00
1bb97c8603
CC-84: Smart Playlists
...
- ui clean-up
2012-07-16 14:44:50 -04:00
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
312f35ae48
CC-430: Audio normalization (Replaygain Support)
...
-change default database value to null
2012-07-16 12:10:42 -04:00
2dae5f30f7
CC-84: Smart Playlists
...
- code cleanup
- adds 'Add' button to last row, always
2012-07-16 11:01:34 -04:00
3e24b71436
removed wrong comments
2012-07-16 10:31:00 -04:00
ce1a63f47d
CC-430: Audio normalization (Replaygain Support)
...
-small bug fixes
2012-07-15 22:55:52 -04:00
583695f98c
CC-430: Audio normalization (Replaygain Support)
...
-values are now written through to database
2012-07-15 22:22:42 -04:00
39760f8494
CC-4090: Make code style PSR compliant
2012-07-15 22:22:07 -04:00
denise
James
Rudi Grinberg
Martin Konecny
Vladimir