Merge lp://staging/~mhall119/summit/qrcode-to-current-page into lp://staging/summit
Proposed by
Michael Hall
| Status: | Merged |
|---|---|
| Approved by: | Chris Johnston |
| Approved revision: | 471 |
| Merged at revision: | 470 |
| Proposed branch: | lp://staging/~mhall119/summit/qrcode-to-current-page |
| Merge into: | lp://staging/summit |
| Prerequisite: | lp://staging/~mhall119/summit/unschedule-missing-blueprints |
| Diff against target: |
141 lines (+39/-24) 6 files modified
summit/common/templatetags/qrcode.py (+23/-0) summit/media/css/site.css (+4/-4) summit/schedule/templates/schedule/by_participant.html (+9/-5) summit/schedule/templates/schedule/by_room.html (+1/-5) summit/schedule/templates/schedule/by_track.html (+1/-5) summit/schedule/templates/schedule/daily.html (+1/-5) |
| To merge this branch: | bzr merge lp://staging/~mhall119/summit/qrcode-to-current-page |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Chris Johnston | Approve | ||
|
Review via email:
|
|||
Commit message
Add new template tag for generating a qrcode image for the current page, switch all list-view schedules to use that instead of all pointint to the main summit page
Description of the change
Add new template tag for generating a qrcode image for the current page, switch all list-view schedules to use that instead of all pointint to the main summit page
To post a comment you must log in.
Revision history for this message
| Chris Johnston (cjohnston) | # |
review:
Approve
Revision history for this message
| Tarmac WebDev (tarmac-webdev) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The prerequisite lp:~mhall119/summit/unschedule-missing-blueprints has not yet been merged into lp:summit.