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
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
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
Martin Konecny
f0f033b4fb
CC-430: Audio normalization (Replaygain Support)
2012-07-12 17:58:29 -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
Martin Konecny
d9cde230cd
CC-4090: Make code style PSR compliant
...
-removed all trailing whitespace
2012-07-10 18:53:06 -04:00
Martin Konecny
3d243468a7
CC-4090: Make code style PSR compliant
...
Subjects.php
2012-07-10 10:36:53 -04:00
James
9bc1c66fe3
CC-2747: If the file contains '\' in its meta title, airtime doesn't
...
detect duplicate
- fixed
- extra fix: there was also problem with web UI upload and it's fixed
see the comment on the ticket for more detail.
2012-07-05 15:27:49 -04:00
denise
598bf8942c
Merge branch '2.1.x' into devel
2012-07-03 14:57:16 -04:00
james
7342ea4d4b
CC-4053: Widget not showing correct day on Sunday
...
- fixed weekly widget
- also fixed today's show widget
2012-07-03 13:17:48 -04:00
denise
3e75b28c9d
Merge branch '2.1.x' into devel
...
Conflicts:
airtime_mvc/application/controllers/ApiController.php
2012-07-03 10:42:29 -04:00
denise
7ea106e0d3
CC-4051: Library -> First character gets cut off of file name when downloading a track from a watched folder
...
-fixed
2012-06-29 16:02:27 -04:00
denise
8141dec3b5
CC-3975: Media Library: Try to download files from watched folder, the filename will be "true"
...
-added comment
2012-06-27 15:13:03 -04:00
denise
d5a5bdd310
CC-3975: Media Library: Try to download files from watched folder, the filename will be "true"
...
-added comment
2012-06-27 14:57:47 -04:00
denise
bdaa64d4d1
CC-3975: Media Library: Try to download files from watched folder, the filename will be "true"
...
-fixed (originally scheduled for 2.2 - adding for 2.1.3)
2012-06-27 13:13:07 -04:00
denise
1300593e8b
CC-3975: Media Library: Try to download files from watched folder, the filename will be "true"
...
-fixed
2012-06-27 13:03:22 -04:00
denise
186b8ef1c2
CC-3975: Media Library: Try to download files from watched folder, the filename will be "true"
...
-fixed
2012-06-15 16:48:51 -04:00
James
57397312f2
CC-3963: If DJ is scheduled to broadcast for show, then automatically
...
enable source when DJ connects.
- done
2012-06-12 15:38:03 -04:00
Martin Konecny
22453f3820
CC-3968: Cannot preview file as * .MP3
...
-fixed
2012-06-12 11:31:10 -04:00
James
06d90c53aa
CC-3957: Make Schedule Widgets show future Sunday instead of past Sunday
...
- fixed
2012-06-11 16:42:12 -04:00
James
0ca45e343b
CC-3878: Recorded media file's track number is changed after restarting media-monitor
...
- fixed
2012-06-06 14:18:54 -04:00
James
b23e3d0a54
CC-3927: Should automatically switch back to Master/Show stream if there is a
...
connection interruption
- done
2012-06-05 16:41:41 -04:00
denise
990dea12a4
CC-3895: Sometimes Media Monitor will not update the length of tracks with the same title but different contents.
...
-fixed
2012-06-05 11:20:00 -04:00
Martin Konecny
f485b9b601
CC-3804: The title of the record show's media will be changed after Media Monitor restart
...
-removed re-setting the track_title. It was causing problems, and it seems to no
longer have a reason to be here (you cannot rename a recorded show after it
has started)
2012-05-21 02:23:34 -04:00