Commit graph

727 commits

Author SHA1 Message Date
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
Rudi Grinberg
47893865cc cc-4105: clean up url construction in api client 2012-07-13 16:32:17 -04:00
James
ae9442d7f5 CC-84: Smart Playlists
- editing playlist
2012-07-13 15:58:23 -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
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
James
207582eb7e CC-84: Smart Playlists
- temp commit
2012-07-13 14:23:30 -04:00
James
3bce6b4999 CC-84: Smart Playlists
- db inserting into cc_playlistcriteria
- error validations
2012-07-12 17:58:44 -04:00
Martin Konecny
f0f033b4fb CC-430: Audio normalization (Replaygain Support) 2012-07-12 17:58:29 -04:00
James
f0134ba3fa CC-84: Smart Playlists
- validation on server side
- getting list of files from db which satisfies criteria
2012-07-12 15:27:51 -04:00
Martin Konecny
8f6d6058a2 CC-4100: Make number of shows displayed in widget customizable
-removed Logging message
2012-07-11 19:33:19 -04:00
Martin Konecny
bd51b4db02 CC-4100: Make number of shows displayed in widget customizable
-fixed
2012-07-11 19:31:24 -04:00
James
93b34bb079 CC-84: Smart Playlists
- controller skeleton
- playlist model dummy functions
2012-07-11 16:14:11 -04:00
Martin Konecny
646e028037 Merge branch 'cc-84-smart-playlist' of dev.sourcefabric.org:airtime into cc-84-smart-playlist 2012-07-11 10:47:14 -04:00
denise
4bed5e647e CC-84: Smart Playlists
-moved smart_playlistbuilder.js into playlist folder
2012-07-11 10:45:24 -04:00
denise
b7cd90bc28 CC-84: Smart Playlists
-created form and view script
2012-07-11 10:42:51 -04:00
Martin Konecny
d9cde230cd CC-4090: Make code style PSR compliant
-removed all trailing whitespace
2012-07-10 18:53:06 -04:00
Martin Konecny
ee3447f903 CC-4090: Make code style PSR compliant
-User.php
-removed all trailing whitespace
2012-07-10 18:51:32 -04:00
James
24a90700a1 CC-4095: Media Library -> Playlist: dj user can delete the playlist owned by
others on some situation.
2012-07-10 17:24:57 -04:00
James
f174a2bcf3 Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x 2012-07-10 17:09:46 -04:00
James
39506740eb CC-4095: Media Library -> Playlist: dj user can delete the playlist owned by
others on some situation.

- fixed
2012-07-10 17:09:21 -04:00
Martin Konecny
f072be5d0e Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x 2012-07-10 16:41:48 -04:00
Martin Konecny
6d98cca9c3 SAAS-270: Apache2 errors on SaaS
-no reason to pass $pl since it is not even used. Fixed
2012-07-10 16:41:30 -04:00
denise
72dd48e33e CC-84: Smart Playlists
-created form and view script
2012-07-10 15:25:29 -04:00
James
62b0fec595 CC-4095: Media Library -> Playlist: dj user can delete the playlist owned by
others on some situation.

- fixed
2012-07-10 15:11:59 -04:00
Martin Konecny
3d243468a7 CC-4090: Make code style PSR compliant
Subjects.php
2012-07-10 10:36:53 -04:00
Martin Konecny
dc2b4fed0a Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-07-10 10:19:35 -04:00
Martin Konecny
e91c96b90e CC-4090: Make code style PSR compliant
StreamSetting.php
2012-07-09 23:32:21 -04:00
denise
e4fb42cbd0 CC-4027: In the Calendar view, please have a little play icon indicating the currently playing show.
-done
2012-07-06 15:26:51 -04:00