Merge lp:~alanbell/summit/roomlists into lp:summit
Proposed by
Alan Bell
Status: | Rejected |
---|---|
Rejected by: | Chris Johnston |
Proposed branch: | lp:~alanbell/summit/roomlists |
Merge into: | lp:summit |
Diff against target: |
146 lines (+77/-4) 3 files modified
summit/schedule/render.py (+8/-3) summit/schedule/views.py (+65/-0) summit/urls.py (+4/-1) |
To merge this branch: | bzr merge lp:~alanbell/summit/roomlists |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Michael Hall (community) | Disapprove | ||
Review via email: mp+79603@code.launchpad.net |
Description of the change
fix for lp:860683 which adds new roomlist functionality to display schedule for a list of rooms, this will allow a day of schedule to be displayed across two monitors.
To post a comment you must log in.
this bit may also fix it for django in Oneiric, and may break it for prior versions:
+ (r'^admin/', include( admin.site. urls) ),
- (r'^admin/(.*)$', admin.site.root),
+ #(r'^admin/(.*)$', admin.site.urls),