Commit graph

428 commits

Author SHA1 Message Date
martin
095a218969 CC-2046: About box could display version number
-Made About box use the defined constant
2011-03-25 15:08:52 -04:00
naomiaro
d067cf0222 Merge branch 'master' of dev.sourcefabric.org:campcaster 2011-03-24 23:47:08 -04:00
martin
1107a67579 CC-2098: Only push playlists that havent ended yet
-implemented. Removed ability to specify time ranges for now, and defaulted to looking from now to 24 hours ahead.
Being able to specify time ranges was removed, since we are not using bi-directional communication between pypofetch and Airtime server.
2011-03-24 23:43:27 -04:00
naomiaro
d5707c514b Merge branch 'master' of dev.sourcefabric.org:campcaster
Conflicts:
	python_apps/show-recorder/install/recorder-daemontools.sh
2011-03-24 23:10:04 -04:00
naomiaro
c727c338af CC-2097: Show-recorder: Use RabbitMQ, api_client, and the structure of pypofetch
using api client now
2011-03-24 23:07:13 -04:00
martin
343fb593ee CC-2051: Unable to change user password
-Password is changeable, and success message appears whenever a user is added/updated.
2011-03-24 22:29:14 -04:00
martin
d71bfbe191 CC-2108: Show time is hardcoded to 00:00
-fixed
2011-03-24 22:07:04 -04:00
naomiaro
35b2ddfd29 CC-2097 : Show-recorder: Use RabbitMQ, api_client, and the structure of pypofetch
setting up configs
2011-03-24 17:43:37 -04:00
paul.baranowski
bdf98c9ec8 CC-2035: Context menu says 'Add Content' when it should say 'Add/Remove Content'
Changed.
2011-03-24 15:08:58 -04:00
paul.baranowski
38e84b81db CC-2047: Add Audio menu could be labeled Add Media
Changed.
2011-03-24 15:05:49 -04:00
naomiaro
e57b18168a Merge branch 'master' of dev.sourcefabric.org:campcaster 2011-03-23 23:37:01 -04:00
naomiaro
9447f4fb82 CC-2063 : record/rebroadcast icons for calendar display
icons are put on calendar.
2011-03-23 23:36:45 -04:00
paul.baranowski
f9c8a7cc11 CC-2096 Schedule changes should be sent to RabbitMQ at most once per user request
Implemented as a plugin to Zend.  Now at most one schedule push to RabbitMQ
will happen per user action.  It's pretty sweet.
2011-03-23 23:24:06 -04:00
martin
50432c0b66 CC-2046: About box could display version number
-Done
2011-03-23 22:32:12 -04:00
martin
3fed7a7ab5 CC-2045: Role drop-down box has no label in Manage users page, should default to 'guest'
-fixed
2011-03-23 22:22:07 -04:00
martin
5d0e224139 Merge branch 'master' of dev.sourcefabric.org:airtime 2011-03-23 22:15:28 -04:00
martin
8a2610aa84 CC-1894: Warn users about time zone differences or clock drift problems on the server
-Now using timezone offsets from UTC instead of regions to compare timezones between pypo and the airtime webserver
2011-03-23 22:14:57 -04:00
paul.baranowski
d943548f27 CC-2095: Changes to the stream metadata are not pushed to pypo
Fixed.
2011-03-23 18:16:08 -04:00
martin
7c605c4a28 Merge branch 'master' of dev.sourcefabric.org:airtime 2011-03-23 13:43:22 -04:00
martin
d982419b16 CC-1894: Warn users about time zone differences or clock drift problems on the server
-An error msg now appears in pypo log when pypo and server timezones do not match
2011-03-23 13:43:11 -04:00
naomiaro
224fa1a0b8 CC-1985 : Automatic rebroadcast of recorded content
sending group_id instead of playlist id to playout
anything not in a playlist won't have a playlist id
scheduling just a file for rebroadcast shows.
2011-03-23 12:09:29 -04:00
paul.baranowski
c4b632e8ad Merge branch 'master' of dev.sourcefabric.org:airtime 2011-03-23 01:09:48 -04:00
paul.baranowski
78b33b9e23 CC-2084: Integrate RabbitMQ for immediate schedule updates and commands
Implemented RabbitMQ on the pypo side.  Schedule updates are now
almost instantaneous and we are only polling the server once per
hour if we aren't updated in that time.  Canceling a show happens
right away.
2011-03-23 01:09:27 -04:00
paul.baranowski
7f7800aa2b CC-2084: Integrate RabbitMQ for immediate schedule updates and commands
Fixed minor issue where schedule was pushed back to pypo after updating
the "played" flag for media files and playlists.

Found one other spot where this was happening and fixed it.
2011-03-23 00:27:31 -04:00
paul.baranowski
72c9e44a91 CC-2084: Integrate RabbitMQ for immediate schedule updates and commands
Fixed minor issue where schedule was pushed back to pypo after updating
the "played" flag for media files and playlists.  This isnt necessary.
2011-03-23 00:17:41 -04:00
martin
a1d7bcad90 Merge branch 'master' of dev.sourcefabric.org:airtime 2011-03-22 18:08:49 -04:00
naomiaro
8ffcd75682 bug, forgot to delete useless line 2011-03-22 18:07:00 -04:00
martin
e92be3c186 CC-1990: Widget to display schedule and "Now Playing" on any website
-First working version, needs to be called using:

<script>
    $(document).ready(function() {
        $("#headerLiveHolder").airtimeLiveInfo();
        $("#onAirToday").airtimeShowSchedule();
    });
</script>
2011-03-22 18:04:27 -04:00
naomiaro
8016737968 Merge branch 'master' of dev.sourcefabric.org:campcaster
Conflicts:
	application/models/Shows.php
2011-03-22 12:16:42 -04:00
naomiaro
fae71ed051 CC-1985 : Automatic rebroadcast of recorded content
scheduling the recorded file in any rebroadcast shows.
2011-03-22 12:08:09 -04:00
paul.baranowski
b650abcbb8 Merge branch 'master' of dev.sourcefabric.org:airtime
Conflicts:
	application/models/Shows.php
2011-03-22 10:00:37 -04:00
paul.baranowski
d38e2adb58 CC-2084: Integrate RabbitMQ for immediate schedule updates and commands
This is the code for the server side to push the schedule to RabbitMQ.
Right now it is disabled and should cause no changes in behavior.

Also added comments to functions and formatted code correctly.
2011-03-22 09:55:33 -04:00
martin
730df4c345 Merge branch 'master' of dev.sourcefabric.org:airtime 2011-03-22 01:29:38 -04:00
martin
cbe8f98a7c CC-1990: Widget to display schedule and "Now Playing" on any website
-initial checkin, some hardcoded values
2011-03-22 01:29:23 -04:00
naomiaro
864cda6c34 CC-1630 : Automatic recording of shows
multi threading now used in recorded for back to back shows.
recorded file id is put into show instances table.
2011-03-22 00:46:31 -04:00
naomiaro
60649cba8a CC-1987 : Automatic upload of recorded shows to Soundcloud
created Soundcloud.php in models, added upload track method.
using python-setuptools in install to find poster package to be able to upload recoded file to airtime and then to soundcloud.
2011-03-21 15:48:44 -04:00
martin
a3a8ae104a CC-2030: Icon needed for Cue In/Out
-Implemented
2011-03-21 15:01:43 -04:00
Naomi
3a0f9ddcd1 CC-1987 : Automatic upload of recorded shows to Soundcloud
Added fields to preference form for the station's soundcloud user/pass
need to generalize file upload as commented out in the new Soundcloud.php file.
2011-03-18 17:15:12 -04:00
Naomi
5ddd670979 CC-1630 : Automatic recording of shows
not going to use ECI python bindings, has deprecated code in the ubuntu package currently
also simpler just to call a subprocess
2011-03-18 15:33:23 -04:00
naomiaro
28b7d8e882 CC-1985 : Automatic rebroadcast of recorded content
can't move a rebroadcast show infront of it's original recorded show,
know how to print form element errors out in a custom view script,
removed show content option from a recorded show's context menu.
2011-03-18 00:20:38 -04:00
naomiaro
e3e8f10021 CC-1985 : Automatic rebroadcast of recorded content
added url column to cc_shows table, logic to show/hide form components for rebroadcast
2011-03-17 18:23:05 -04:00
naomiaro
20f3c49dcb CC-1985 : Automatic rebroadcast of recorded content
rebroadcast shows are automatically resized if parent recorded shows are altered.
progress bar is removed from recorded/rebroadcast shows, waiting on special icons.
2011-03-16 11:33:08 -04:00
naomiaro
f104872175 CC-1985 : Automatic rebroadcast of recorded content
modified full calendar code to allow disabling resize of specific events (rebrodcast shows)
2011-03-15 17:26:59 -04:00
naomiaro
8f86b05a4b Merge branch 'master' of dev.sourcefabric.org:campcaster
Conflicts:
	application/controllers/ScheduleController.php
	public/css/styles.css
2011-03-15 17:02:22 -04:00
naomiaro
bd81b0cd4f CC-1985 : Automatic rebroadcast of recorded content
working on disabling resizing of a rebroadcast show.
2011-03-15 16:39:52 -04:00
naomiaro
29816f32fa CC-1985 : Automatic rebroadcast of recorded content
can add absolute dates/times for non repeating show instances to rebroadcast.
2011-03-15 15:20:10 -04:00
naomiaro
6ef4169315 CC-1985: Automatic rebroadcast of recorded content
populates rebroadcast show instances now, added a new table cc_show_rebroadcast,
added columns record, rebroadcast, instance_id, file_id to cc_show_instances table.
added column record to cc_show_days.
2011-03-15 12:05:41 -04:00
mkonecny
ba81e947ec -add code comments / some code cleanup 2011-03-13 19:24:45 -04:00
martin
a947306222 CC-2002
GUI changes done
2011-03-11 13:56:13 -05:00
martin
55745d1a4a CC-2025
Indicate songs that are over-booked
2011-03-10 19:28:57 -05:00