Merge lp://qastaging/~dholbach/serious-donut/add-onair-app into lp://qastaging/serious-donut
Proposed by
Daniel Holbach
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://qastaging/~dholbach/serious-donut/add-onair-app |
| Merge into: | lp://qastaging/serious-donut |
| Diff against target: |
544 lines (+150/-78) 14 files modified
README.local.md (+1/-1) community/cms_plugins.py (+2/-1) community/management/commands/initdb.py (+13/-22) community/models.py (+0/-1) community/settings/__init__.py (+17/-20) community/templatetags/assets.py (+5/-6) community/templatetags/text_extras.py (+9/-2) community/urls.py (+3/-4) community/views.py (+33/-21) onair/admin.py (+7/-0) onair/migrations/0001_initial.py (+26/-0) onair/models.py (+28/-0) onair/tests.py (+3/-0) onair/views.py (+3/-0) |
| To merge this branch: | bzr merge lp://qastaging/~dholbach/serious-donut/add-onair-app |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Registry Administrators | Pending | ||
|
Review via email:
|
|||
To post a comment you must log in.
Unmerged revisions
- 49. By Daniel Holbach
-
clarify that it's a LP team
- 48. By Daniel Holbach
-
add admin interface
- 47. By Daniel Holbach
-
fix almost all pep8/pyflakes issues
- 46. By Daniel Holbach
-
remove South, remove aldryn_
boilerplates. template_ loaders. AppDirectoriesL oader because of django warning, add onair app - 45. By Daniel Holbach
-
add onair app with initial Show model
- 44. By Daniel Holbach
-
use migrate instead of syncdb
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
