Merge lp://staging/~daker/summit/configurable-webchat-url into lp://staging/summit
Proposed by
Adnane Belmadiaf
| Status: | Merged |
|---|---|
| Approved by: | Chris Johnston |
| Approved revision: | 553 |
| Merged at revision: | 550 |
| Proposed branch: | lp://staging/~daker/summit/configurable-webchat-url |
| Merge into: | lp://staging/summit |
| Prerequisite: | lp://staging/~mhall119/summit/create-attendee-for-bp-usernames |
| Diff against target: |
201 lines (+34/-15) 11 files modified
summit/linaro_settings.py (+1/-0) summit/schedule/models/roommodel.py (+7/-0) summit/schedule/templates/schedule/by_participant.html (+1/-1) summit/schedule/templates/schedule/by_room.html (+1/-1) summit/schedule/templates/schedule/by_track.html (+1/-1) summit/schedule/templates/schedule/daily.html (+1/-1) summit/schedule/templates/schedule/meeting.html (+1/-1) summit/schedule/templates/schedule/virtual_meeting.html (+6/-6) summit/schedule/tests/virtual.py (+12/-4) summit/settings.py (+2/-0) summit/ubuntu_settings.py (+1/-0) |
| To merge this branch: | bzr merge lp://staging/~daker/summit/configurable-webchat-url |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Chris Johnston | Approve | ||
|
Review via email:
|
|||
Commit message
Make webchat URL configurable via settings files
To post a comment you must log in.
Revision history for this message
| Chris Johnston (cjohnston) | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
