Merge lp://staging/~cjohnston/summit/update-django-1-4 into lp://staging/summit
Proposed by
Chris Johnston
| Status: | Merged |
|---|---|
| Approved by: | Michael Hall |
| Approved revision: | 506 |
| Merged at revision: | 510 |
| Proposed branch: | lp://staging/~cjohnston/summit/update-django-1-4 |
| Merge into: | lp://staging/summit |
| Diff against target: |
433 lines (+113/-70) 12 files modified
requirements.txt (+2/-2) setup.py (+1/-1) summit/common/management/commands/lpupdate.py (+24/-6) summit/schedule/admin/attendeeadmin.py (+22/-5) summit/schedule/admin/crewadmin.py (+6/-2) summit/schedule/admin/leadadmin.py (+6/-2) summit/schedule/admin/meetingadmin.py (+17/-10) summit/schedule/admin/roomadmin.py (+11/-2) summit/schedule/admin/summitadmin.py (+7/-12) summit/schedule/forms.py (+2/-0) summit/schedule/models/attendeemodel.py (+8/-5) summit/settings.py (+7/-23) |
| To merge this branch: | bzr merge lp://staging/~cjohnston/summit/update-django-1-4 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Michael Hall (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Updates Summit to work with Django 1.4.x... This will allow much improvement for the vUDS events.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
4 test failures: http://