Commit Graph

8040 Commits

Author SHA1 Message Date
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 cdbabfafce -cc 4105 : Added error handling in case server does not respond with
proper json
2012-07-16 17:10:13 -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 ebd12448ee cc-4105: placed docstrings inside of methods instead of above 2012-07-16 15:51:51 -04:00
Rudi Grinberg 1c084a3101 moved misplaced docstring 2012-07-16 15:47:44 -04:00
Martin Konecny 832eafdea1 CC-4104: airtime-uninstall should not purge airtime database be default
-small fix
2012-07-16 15:43:17 -04:00
Martin Konecny 35d3d63e08 CC-4104: airtime-uninstall should not purge airtime database be default
-on reinstall use the database
2012-07-16 15:34:09 -04:00
Martin Konecny e056e5ff01 correctly rename AirTime to Airtime 2012-07-16 15:33: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
denise 1bb97c8603 CC-84: Smart Playlists
- ui clean-up
2012-07-16 14:44:50 -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 6a4fd4973e CC-4104: airtime-uninstall should not purge airtime database be default
-done
2012-07-16 14:18:40 -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
denise 2dae5f30f7 CC-84: Smart Playlists
- code cleanup
- adds 'Add' button to last row, always
2012-07-16 11:01:34 -04:00
Rudi Grinberg 3e24b71436 removed wrong comments 2012-07-16 10:31:00 -04:00
Rudi Grinberg 8ae0d216c6 formatting fix 2012-07-16 10:09:49 -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 0e98bc75c8 cc-4105: hasattr in conditional statement instead of getattr 2012-07-15 22:17:36 -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
Rudi Grinberg 54116fe5aa cosmetic changes 2012-07-15 22:13:24 -04:00
Rudi Grinberg 6b9cf85fc5 cleared up a lot of boilerplate with lazy properties 2012-07-15 22:13:24 -04:00
Rudi Grinberg 206027073c added some stat counting 2012-07-15 22:13:24 -04:00
Rudi Grinberg f9a1af1c1c fixed clean empty dirs 2012-07-15 22:13:24 -04:00
Rudi Grinberg 69674529cd almost alpha version 2012-07-15 22:13:24 -04:00
Rudi Grinberg 3b385df969 initial commit 2012-07-15 22:13:24 -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 499a0a5850 cc-4105: hasattr in conditional statement instead of getattr 2012-07-13 18:04:20 -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
Rudi Grinberg 47893865cc cc-4105: clean up url construction in api client 2012-07-13 16:32:17 -04:00
James 601263b7a0 CC-84: Smart Playlists
- adding propel files for playlistcriteria table
2012-07-13 16:16:07 -04:00
James 46294c3f40 Merge branch 'cc-84-smart-playlist' of dev.sourcefabric.org:airtime into cc-84-smart-playlist
Conflicts:
	airtime_mvc/application/forms/SmartPlaylistCriteria.php
2012-07-13 16:00:02 -04:00
James ae9442d7f5 CC-84: Smart Playlists
- editing playlist
2012-07-13 15:58:23 -04:00
denise b48fb49947 CC-84: Smart Playlists
-fixed add/remove behaviour
2012-07-13 15:15:11 -04:00
Rudi Grinberg 3b708fae6a fixed typo 2012-07-13 14:54:04 -04:00
Rudi Grinberg a6d51bea8d created a new controller action for chunked requests from media monitor 2012-07-13 14:51:43 -04:00
denise 971b4cf7cf Merge branch 'cc-84-smart-playlist' of dev.sourcefabric.org:airtime into cc-84-smart-playlist 2012-07-13 14:32:31 -04:00
James bf46605ea1 CC-84: Smart Playlists
- changing field name in backend
- diabled loading criteria on edit temporarly
2012-07-13 14:32:05 -04:00
denise fcc4c1f9af CC-84: Smart Playlists
-fixed merge conflict
2012-07-13 14:26:17 -04:00