Merge lp://qastaging/~thumper/wikkid/script-name into lp://qastaging/wikkid
Proposed by
Tim Penhey
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Approved by: | Tim Penhey | ||||
| Approved revision: | 85 | ||||
| Merged at revision: | 70 | ||||
| Proposed branch: | lp://qastaging/~thumper/wikkid/script-name | ||||
| Merge into: | lp://qastaging/wikkid | ||||
| Diff against target: |
622 lines (+193/-80) 15 files modified
bin/wikkid-serve (+5/-1) setup.py (+2/-1) wikkid/app.py (+35/-19) wikkid/context.py (+13/-4) wikkid/skin/default/base.html (+4/-4) wikkid/tests/factory.py (+2/-2) wikkid/tests/test_app.py (+40/-12) wikkid/tests/views/test_breadcrumbs.py (+13/-0) wikkid/tests/views/test_root.py (+33/-2) wikkid/tests/views/test_urls.py (+22/-17) wikkid/view/base.py (+13/-9) wikkid/view/directory.py (+5/-5) wikkid/view/edit.py (+1/-1) wikkid/view/root.py (+2/-0) wikkid/view/urls.py (+3/-3) |
||||
| To merge this branch: | bzr merge lp://qastaging/~thumper/wikkid/script-name | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Tim Penhey | Approve | ||
|
Review via email:
|
|||
Description of the change
Allow wikkid-serve to specify a script-name. This is the assumed to be the start of any request for a wikkid served page. If not, a 404 is returned.
Styling and links are updated to use the script-name.
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
I approve :-)