Merge lp://staging/~dholbach/ubucon-site/small-fixes into lp://staging/ubucon-site
Proposed by
Daniel Holbach
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://staging/~dholbach/ubucon-site/small-fixes |
| Merge into: | lp://staging/ubucon-site |
| Diff against target: |
456 lines (+90/-85) 8 files modified
ubucon_site/cms_plugins.py (+2/-1) ubucon_site/management/commands/initdb.py (+16/-23) ubucon_site/models.py (+0/-4) ubucon_site/settings/__init__.py (+20/-23) ubucon_site/templatetags/assets.py (+4/-5) ubucon_site/templatetags/text_extras.py (+9/-2) ubucon_site/urls.py (+7/-6) ubucon_site/views.py (+32/-21) |
| To merge this branch: | bzr merge lp://staging/~dholbach/ubucon-site/small-fixes |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| UbuCon site developers | Pending | ||
|
Review via email:
|
|||
Description of the change
- Make pep8 mostly happy, remove unused imports,
- configure aldryn boilerplate (copied from
http://
- fixed permissions look up in initdb management command
To post a comment you must log in.
Unmerged revisions
- 46. By Daniel Holbach
-
make pep8 mostly happy, remove useless comments
- 45. By Daniel Holbach
-
remove unused imports and reorder
- 44. By Daniel Holbach
-
add aldryn boilerplate
- 43. By Daniel Holbach
-
fix permissions lookup
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
