Merge lp://staging/~thomir-deactivatedaccount/wikkid/wikkid-improvments into lp://staging/wikkid
Proposed by
Thomi Richards
| Status: | Merged |
|---|---|
| Merged at revision: | 53 |
| Proposed branch: | lp://staging/~thomir-deactivatedaccount/wikkid/wikkid-improvments |
| Merge into: | lp://staging/wikkid |
| Diff against target: |
802 lines (+532/-24) 18 files modified
Hacking.txt (+2/-1) ToDo.txt (+0/-2) bin/wikkid-serve (+19/-5) wikkid/app.py (+19/-8) wikkid/context.py (+43/-0) wikkid/dispatcher.py (+3/-2) wikkid/fileutils.py (+58/-0) wikkid/formatter/markdownformatter.py (+27/-0) wikkid/formatter/registry.py (+7/-2) wikkid/formatter/textileformatter.py (+26/-0) wikkid/skin/default/missing-directory.html (+19/-0) wikkid/skin/loader.py (+2/-0) wikkid/tests/formatters/__init__.py (+2/-0) wikkid/tests/formatters/test_markdown.py (+166/-0) wikkid/tests/formatters/test_textile.py (+121/-0) wikkid/view/base.py (+2/-1) wikkid/view/missing.py (+11/-0) wikkid/view/wiki.py (+5/-3) |
| To merge this branch: | bzr merge lp://staging/~thomir-deactivatedaccount/wikkid/wikkid-improvments |
| Related bugs: | |
| Related blueprints: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Tim Penhey | Pending | ||
|
Review via email:
|
|||
Description of the change
Several small changes:
* Added wiki text formatters for markdown and textile. To use these, you must have the python-markdown and python-textile packages installed, respectively.
* User can now specify which wiki text format they want to use by default when running wikkid-serve. The default is still 'rest'.
* User can now specify which network interface to listen on. Default is still 'localhost'
* When requesting a directory that does not exist, we now give a nice page, rather than an error.
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
