eb00b5cbb3
cc-4105: renamed controller action and method to correct name
2012-07-17 16:43:04 -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
1e76845e9c
more sophisticated remote_addr determining
2012-07-17 13:34:48 -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
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
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
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
632f039977
CC-430: Audio normalization (Replaygain Support)
...
-values are now written through to database
2012-07-15 22:19:55 -04:00
b4f1cc13c0
CC-430: Audio normalization (Replaygain Support)
...
make code simpler (don't download database to file)
2012-07-15 22:19:16 -04:00
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
44d91f7798
cc-4105: clean up url construction in api client
2012-07-15 22:17:36 -04:00
0fd6c4adbf
fixed typo
2012-07-15 22:17:36 -04:00
9f1ec3c05c
created a new controller action for chunked requests from media monitor
2012-07-15 22:16:58 -04:00
794cf2c845
CC-4090: Make code style PSR compliant
...
-run psr-cs-fixer
2012-07-15 21:17:13 -04:00
5661872034
checkAuth in init() function
2012-07-15 21:07:34 -04:00
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
47893865cc
cc-4105: clean up url construction in api client
2012-07-13 16:32:17 -04:00
3b708fae6a
fixed typo
2012-07-13 14:54:04 -04:00
a6d51bea8d
created a new controller action for chunked requests from media monitor
2012-07-13 14:51:43 -04:00
f0f033b4fb
CC-430: Audio normalization (Replaygain Support)
2012-07-12 17:58:29 -04:00
8f6d6058a2
CC-4100: Make number of shows displayed in widget customizable
...
-removed Logging message
2012-07-11 19:33:19 -04:00
bd51b4db02
CC-4100: Make number of shows displayed in widget customizable
...
-fixed
2012-07-11 19:31:24 -04:00
d9cde230cd
CC-4090: Make code style PSR compliant
...
-removed all trailing whitespace
2012-07-10 18:53:06 -04:00
3d243468a7
CC-4090: Make code style PSR compliant
...
Subjects.php
2012-07-10 10:36:53 -04:00
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
598bf8942c
Merge branch '2.1.x' into devel
2012-07-03 14:57:16 -04:00
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
3e75b28c9d
Merge branch '2.1.x' into devel
...
Conflicts:
airtime_mvc/application/controllers/ApiController.php
2012-07-03 10:42:29 -04:00
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
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
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
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
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
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
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
22453f3820
CC-3968: Cannot preview file as * .MP3
...
-fixed
2012-06-12 11:31:10 -04:00
06d90c53aa
CC-3957: Make Schedule Widgets show future Sunday instead of past Sunday
...
- fixed
2012-06-11 16:42:12 -04:00
0ca45e343b
CC-3878: Recorded media file's track number is changed after restarting media-monitor
...
- fixed
2012-06-06 14:18:54 -04:00
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
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
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
025ef0ed27
CC-3826: Couldn't find constant MDATA_KEY_RECORD_DATE
...
-fixed
2012-05-15 12:35:02 -04:00
cc71c61fce
CC-3816 : Automatic uploading of recorded shows, View on Soundcloud choice in menu doesn't work
2012-05-14 13:01:44 +02:00
de3e5a6e3c
SAAS-223: Airtime Usage Metric: Amount of time spent broadcasting
...
-fixed inserts into cc_live_log
2012-05-11 16:09:36 -04:00
b9ab11ce28
CC-3702: System -> Status: No difference between a service is failed vs a service is not monitor
...
-fixed
2012-04-23 17:18:34 -04:00
96b010e7f0
CC-1927 Remove PEAR DB
...
* Removed all traces of PEAR functions.
* Fixed AirtimeInstall::GetVersionInstalled() to return the correct answer
even when it cant connect to the database. Also fixed return value to
be consistent on failure.
* Fixed phone_home_stat.php and soundcloud-uploader.php
2012-04-19 16:35:19 -04:00
7f78a7f663
CC-1927: Remove PEAR DB
...
First pass through the model classes to remove use of $CC_DBC.
Web application is working.
There are still other parts of the app that use PEAR DB.
2012-04-19 16:33:05 -04:00
d258e39b2e
CC-3456: PlaylistBuilder -> does not identify NetworkDrive outage.
...
-Remove unecessary "continue;" statements
2012-04-17 16:25:10 -04:00
ffc17ba705
CC-3636: Media Folder: dir path in cc_music_dir should be in consistent format
...
- DateHelper.php is moved from model to common folder
- created OsPath.php file which contains normpath()
- normpath() is used instead of realpath()
2012-04-13 17:45:28 -04:00
9cafc91785
CC-3456: PlaylistBuilder -> does not identify NetworkDrive outage. Attempt to
...
play unavailable track leads to platform hanging
- in cast of mount/unmoun drive has some nested folder that were already in the
cc_music_dirs table, airtime was only setting true/false flag on only one of
the entry.
2012-04-13 17:18:31 -04:00
53e37ee826
CC-3634: Media Folder: if file was deleted from file system, and the file was
...
scheduled in the future, it wasn't getting deleted from AIrtime
- fixed
2012-04-12 16:17:19 -04:00
0ec58f0bc3
CC-3250: UI design for mount monitor for media monitor
...
( Manage Media Folder and Playlist Builder screen)
- adding tooltip and fixed a minor bug
2012-04-11 17:24:26 -04:00
548c4ffb8d
-change it so that user can access API actions if logged in.
2012-04-07 22:28:10 -04:00
bcdd27863f
CC-3513: Playlist Builder->Download makes user be redirected to a blank page
...
- fixed
2012-04-03 16:30:54 -04:00
5a24331ef6
CC-3547 : Refactoring Views, removing action stack to better work with permissions. Reorganizing Statistics Dialog.
2012-03-29 17:37:18 +02:00
3f713ca8dc
CC-3426: apache log errors from plupload
...
-fixed
2012-03-26 19:00:40 -04:00
b4e9f9699c
CC-3483: Live Stream: default fade in/out for live stream transition
...
- take care of bootstrap of pypo
2012-03-20 22:29:52 -04:00
d4142f8b8b
CC-3484: Pypo: On bootup, it should grab station name and stream
...
label for liquidsoap
- fixed
- created new function set_bootstrap_variables()
2012-03-20 16:41:15 -04:00
7914b30233
CC-3429: Firefox does not natively support mp3 file playing so preview does nothing.
...
- after reading about the trick foudn in Mark Panaghiston's posting from this link https://groups.google.com/forum/#!topic/jplayer/gTJrSCjwftw
- the current imperfect solution for firefox sould be to show a video jplayer that can play all the audio types.
2012-03-16 18:03:35 -04:00
06e810c35d
CC-3437: Live Stream: Liquidsoap(Pypo) should preserve the last switch
...
status when it restarts
- missed one file from previous commit
2012-03-14 14:43:10 -04:00
540f262a77
CC-3224: "On-the-fly" stream rebroadcasting
...
- removed "Allow override" checkbox from show live stream section.
- removed "auto enable live stream" checkbox from stream setting page.
- implemented authentication functionality of live dj source connection.
2012-03-14 14:43:10 -04:00
efee025691
CC-3406: Live Stream: Switch off live sources on disconnection
...
- done
2012-03-14 14:43:10 -04:00
f193047a1c
CC-3367: Display in Now Playing whether Live DJ stream and Live Master stream
...
are connected and give user the ability to block those streams
- added stream source switch interface
- backend code
2012-03-14 14:43:10 -04:00
128a497059
CC-3224: "On-the-fly" stream rebroadcasting
...
- frond-end implementation for master dj and live dj
- db implementation
- liquidsoap is broken on this commit
2012-03-14 14:41:00 -04:00
30901aa0d6
CC-3224: "On-the-fly" stream rebroadcasting
...
- A section where user can setup port and mount point for harbor input in
stream setting page(front-end and back-end)
- updated the part where it rewrites the liquidsoap.cfg file
2012-03-14 14:41:00 -04:00
48bb19d758
CC-3224: "On-the-fly" stream rebroadcasting
...
- web interface
- auth script for liquidsoap
- DB changes
2012-03-14 14:41:00 -04:00
9e850838ca
CC-3404: Change "Now Playing" dashboard SQL query to take advantage of the "playout_status" field in the schedule table
...
- Updated ApiController to use Schedule's GetPlayOrderRange which has better performance.
2012-03-13 10:36:11 -04:00
470cf0dbf8
CC-3395: Play preview for playlists and timelines for shows should show a list under the pop-up player which will play the entire playlist.
...
- Updated jplayer so it now shows a list view under the player which shows details of the track being played, and for playlists the entire playlist list.
- Also enabled playing playlists from the library.
2012-03-09 18:47:08 -05:00
709e117f41
CC-3391: Audio Preview cannot play tracks with commas in their filename
...
- The content distribution header filename attribute, wasn't properly quoted for inline content. This causes a bug for files with comma names.
- changed the play button in library back to the speaker icon
- removed some dead code preview_player.js
- removed the file name attribute, will need better approch to presenting the user with audio information.
2012-03-06 13:50:07 -05:00
a09b63b8d0
CC-2430: Preview tracks in the library + better preview (ability to jump around in clip)
...
- removed javascript from php files
- removed preview.js
- fixed small problems with editor
2012-03-05 19:00:14 -05:00
aacbac4757
CC-2430: Preview tracks in the library + better preview (ability to jump around in clip)
...
- Updated functionality so user can play a track and in jplayer and jump around it.
2012-03-05 19:00:14 -05:00
7d95e4ffa7
CC-2430 : Preview tracks in the library + better preview (ability to jump around in clip)
...
- added accept ranges header to the response to enable seek ahead in the music file.
2012-03-05 19:00:14 -05:00
508c623850
-remove comments that should not have been committed
2012-03-01 18:00:46 -05:00
92f19139b9
CC-3336: Refactor schedule API used by pypo
...
-done
2012-02-29 21:27:42 -05:00
b572b26b68
CC-3336: Refactor schedule API used by pypo
...
-make sure that empty arrays are objects and not arrays
-clean up some comments
2012-02-28 15:32:18 -05:00
322d1bfa99
CC-3336: Refactor schedule API used by pypo
...
-initial commit
2012-02-28 14:43:39 -05:00
446233fbd4
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-02-24 14:15:06 -05:00
2f689ed583
CC-3346: Recorder: Merge recorder with pypo
...
- Pypo fech works as msg listner for recroder now.
- recorder is part of pypo and all it does is waiting for msg from pypo
fetch and spwan a show recorder thread.
- added new parameter logger to api client. This way apiclient will log
into specific log file instead of grabbing current log file.
- show recoder is removed from all check system/status page
2012-02-24 14:11:35 -05:00
9b5a0fc565
CC-3174 : showbuilder
...
working on trying to save/load state serialized into the db for datatables.
2012-02-21 17:31:54 +01:00
14a9225b97
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-02-14 18:12:51 -05:00
14cd9ed0e9
CC-323: Show appropriate error message if disk is full when attempting to upload files via the web UI
...
- Updated the StoreFile logic so it won't die while trying to copy a file, and instead pass error messages to the controller which can decide if it wants to die, which I've set ApiController and PluploadController todo on receipt of error code.
2012-02-14 18:12:29 -05:00
54cbc86a0a
Merge branch '2.0.x' into devel
...
Conflicts:
VERSION
airtime_mvc/application/Bootstrap.php
airtime_mvc/application/controllers/LibraryController.php
airtime_mvc/application/controllers/ScheduleController.php
airtime_mvc/application/models/Nowplaying.php
airtime_mvc/application/models/Show.php
airtime_mvc/application/models/airtime/CcShowInstances.php
2012-02-14 14:47:07 -05:00
b603726a39
CC-3289: Widgets should have a version string so users can make sure widgets are up to date
...
-I've updated the messages used to notify the user to be more explicit.
-I've moved the constant used to track widget api versioning to /application/configs/constants.php
2012-02-09 15:04:52 -05:00
5d31e4c2a0
CC-3289: Widgets should have a version string so users can make sure widgets are up to date
...
- I updated the ApiController.php file to add a widgetsVersion value used in the response to widgets
- I updated the widgets jquery.showinfo.js file to check the version and report back to the user.
2012-02-08 14:57:48 -05:00
54ee177f7d
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-01-16 13:58:45 -05:00
08a09e4096
CC-2977: Never delete files from the database
...
- using mtab(previous and current) files to figure out directories to be
added or removed
- adding index to cc_files
- see the tickets and media monitor design page for more info
2012-01-12 17:55:05 -05:00
09d50e7e25
Merge branch 'airtime-2.0.x' of dev.sourcefabric.org:airtime into airtime-2.0.x
2012-01-12 16:38:21 -05:00
04b592b831
CC-3245: upgrade 1.8->2.0 cause error in show recorder
...
- fixed
2012-01-12 16:36:14 -05:00
04b48d47cc
CC-2977: Never delete files from the database
...
- Files are marked deleted(file_exists to false) on deletion.
- Dirs are marked removed(removed flag to true) on removal of watched
folder in a usual way. If dir is unmounted, without being removed from
watched list first, it will be marked as not exists(exist flag to false)
- Manage Media Folders will show if dirs exist or not( mounted or not)
- Playlist builder will show if files exists or not
2012-01-11 12:17:48 -05:00
c3430e5411
-various optimizations
2012-01-09 17:47:58 -05:00
Rudi Grinberg
Martin Konecny
Vladimir
James
denise
james
Naomi Aro
paul.baranowski
James
Daniel
Martin Konecny