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 (+1/-1)
community/ (+2/-1)
community/management/commands/ (+13/-22)
community/ (+0/-1)
community/settings/ (+17/-20)
community/templatetags/ (+5/-6)
community/templatetags/ (+9/-2)
community/ (+3/-4)
community/ (+33/-21)
onair/ (+7/-0)
onair/migrations/ (+26/-0)
onair/ (+28/-0)
onair/ (+3/-0)
onair/ (+3/-0)
To merge this branch: bzr merge lp://qastaging/~dholbach/serious-donut/add-onair-app
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.AppDirectoriesLoader 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
The diff is not available at this time. You can reload the page or download it.


People subscribed via source and target branches