added deployment settings
moved media to 2011
fixes for gondor
added view for panels
protect against no content
fixed slot editing which may not have a kind
Merge branch 'dev'
pass user into Timetable fixing schedule_conference_edit
Revert my last commit, it was subtly wrong.
Don't allow users to sign up for session chair/runner in sessions the…
…y're already signed up in. Thanks to Gabriel, Doug, Ori, Daniel, and Noah for reviewing this patch.
added seesion staff user list
bumped cache buster
Fixing pycon.org print output via phone.
Merge branch 'master' of github.com:eldarion/pycon
Check to see if a presentation has a slot before creating an iCal event.
Fixing a unicode error and adding link to download bookmarks in iCale…
…ndar format to schedule page.
Commenting out feeds link pending a fix for the unicode error.
Adding bookmarks feed to template.
Downgrading to iCalendar 1.2 to avoid faulty datetime handling.
Adding additional fields to the bookmarks ics stream.
give ics file a better name
Merge branch 'feature-ical' into dev
Merge branch 'master' into dev
comment out the link to ICS calendar until we are ready for it
minor style nits
Removing a print statement.
Adding iCalendar export option for bookmarks.
added session roles to track detail