Commit Graph

214 Commits

Author SHA1 Message Date
Naomi a9d288385b CC-2129 : Retry automatic upload to Soundcloud if Internet connection problem
static retries/wait time right now.
2011-03-29 19:36:36 -04:00
martin 70dd2a4838 Merge branch 'master' of dev.sourcefabric.org:airtime 2011-03-28 16:30:00 -04:00
martin 2aa0cd22c6 CC-1990: Widget to display schedule and "Now Playing" on any website
-update to API controller to support new widget
2011-03-28 16:29:50 -04:00
Naomi c0e8152077 CC-2110 : Soundcloud file metadata
added text area to preferences to allow for additional soundcloud tags.
2011-03-28 15:39:01 -04:00
naomiaro df8b9af8f6 CC-2110 : Soundcloud file metadata
uploading show description, show name in filename, tags ready to be uploaded for creator need to figure out what to upload.
2011-03-28 12:10:51 -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
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 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 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
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
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
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 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 43a9b63fb5 CC-1848
-began progress, not complete yet. Show can be deleted from database while it is playing, need to notify pypo as well
2011-03-09 22:25:02 -05:00
Naomi 9509dc52e0 Merge branch 'master' of dev.sourcefabric.org:campcaster 2011-03-06 16:45:19 -05:00
Naomi b4207698c3 uploading a recorded file via multipart form http request. 2011-03-06 16:45:11 -05:00
paul.baranowski 3727195c54 Merge branch 'master' of dev.sourcefabric.org:airtime 2011-03-06 11:05:23 -05:00
paul.baranowski 95a4694b5a Created a new Metadata class to hold static functions which parse audio
file metadata.  This got rid of the "camp_" prefixes on the function names.
2011-03-06 11:05:12 -05:00
martin e16dd6c486 early implementation of CC-1962 2011-03-06 00:08:02 -05:00
Naomi 4b4174fe50 Merge branch 'master' of dev.sourcefabric.org:campcaster 2011-03-05 11:54:05 -05:00
Naomi f68a8f67ea soundcloud python/php apis, recorder python script so far. 2011-03-05 11:53:29 -05:00
martin cb119802df -further modifications to now-playing view with grouping by shows 2011-03-04 23:53:29 -05:00
martin d22ab329d8 -CC-1944 2011-03-04 12:07:22 -05:00
martin 25237087a2 Merge branch 'master' of dev.sourcefabric.org:airtime 2011-03-03 20:14:07 -05:00
martin 2346be671e -initial changes for CC-1944 2011-03-03 20:13:55 -05:00
Paul Baranowski 7b58f3563f Cleaned up conf.php to make it more obvious what a user should change and what they shouldnt.
Removed old code that isnt used anymore.

Changed the login screen to use config variables for AIRTIME_VERSION.
2011-03-03 18:08:51 -05:00
Naomi b3e111b0a0 tested deleting files, will unlink file from stor folder, will delete file from all playlists if not scheduled 2011-03-02 11:47:07 -05:00
naomiaro 810aa3845b Merge branch 'airtime-1.6.1' of dev.sourcefabric.org:campcaster into airtime-1.6.1 2011-02-24 11:06:49 -05:00
naomiaro 860c70b21e fix for file metadata form. 2011-02-24 11:06:19 -05:00
martin dab39f391e -interface is now notified when a song starts playing. ON-AIR graphic only turns red after this notification. 2011-02-23 17:03:27 -05:00
paul.baranowski 7e8f61549e Merged Naomi's change for CC-1955 2011-02-22 18:26:51 +01:00
paul.baranowski 15153727c1 CC-1971
Remove "?>" from the end of pure-PHP files to prevent "HEADERS ALREADY SENT"
2011-02-22 18:22:31 +01:00
Naomi 2d95a90049 CC-1952 cannot delete a file that is scheduled in the future. 2011-02-22 11:44:23 -05:00
paul.baranowski 2fbabd82eb CC-1930 Improve right-click menu on the schedule so the most common actions are first 2011-02-14 13:30:52 +01:00