Merge lp://staging/~bloodearnest/django-preflight/gargoyle3-plus-json into lp://staging/django-preflight
Proposed by
Simon Davy
| Status: | Merged |
|---|---|
| Approved by: | Simon Davy |
| Approved revision: | 30 |
| Merged at revision: | 26 |
| Proposed branch: | lp://staging/~bloodearnest/django-preflight/gargoyle3-plus-json |
| Merge into: | lp://staging/django-preflight |
| Diff against target: |
476 lines (+222/-52) 8 files modified
doc/api-use.rst (+27/-0) doc/index.rst (+2/-0) doc/switches.rst (+16/-0) preflight/management/commands/preflight.py (+5/-5) preflight/models.py (+84/-13) preflight/templates/preflight/overview.html (+0/-5) preflight/tests.py (+70/-19) preflight/views.py (+18/-10) |
| To merge this branch: | bzr merge lp://staging/~bloodearnest/django-preflight/gargoyle3-plus-json |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Łukasz Czyżykowski (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Expose preflight as json data if so requested. A better solution that embedding
it in the page ina script tag, which didn't work properly anyway.
Description of the change
Expose preflight as json data if so requested. A better solution that embedding
it in the page ina script tag, which didn't work properly anyway.
Also, fixed django 1.1 support which was accidentally broken after adjusting
review comments (and forgetting to run tox :/). Also, added docs for the new
switches and JSON features.
To post a comment you must log in.
Revision history for this message
| Łukasz Czyżykowski (lukasz-czyzykowski) | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Awesome.