Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Already on GitHub? Sign in to your account

Django 1.4.5 #956

wants to merge 7 commits into


None yet
4 participants

groovecoder commented Mar 25, 2013


supersedes #880 with a rebase on master, squashing, and a vendor submodule pointing to a branch with both django 1.4.5 and elastic library updates.

Fixed 1 and 2 of the frontend issues mentioned by darkwing; others are still present.

@groovecoder groovecoder referenced this pull request Mar 25, 2013


Django 1.4 upgrade #880

@jsocol jsocol commented on the diff Mar 27, 2013

@@ -16,6 +16,7 @@
<div id="content-main" class="full">
<article id="edit-document" class="article" role="main">
<form id="wiki-page-edit" class="editing" method="post" action="">
+ {{ csrf() }}

jsocol Mar 27, 2013


Still need this in new_document.html and probably a number of other places, too.


jsocol commented Mar 27, 2013

Finding more csrf issues:

  • Need {{ csrf() }} in wiki/new_document.html
  • In wiki.js, need to change line 781: the csrf token has a name attribute but no ID.

I can't submit a demo. The form just says "Incorrect, please try again." It also doesn't have a field to include the actual demo code. It looks like the form breaks before it finishes rendering.

I can reproduce the /mwsgi/ redirect issue. Trying to dig into it but PDB is being awful.


jsocol commented Mar 27, 2013

I think the mwsgi issue is Apache or mod_wsgimod_proxy. I walked all the way through the request with PDB and kept checking the Location header, it never included mwsgi once.


groovecoder commented Mar 27, 2013

The submit demo page is all messed up, markup-wise, so it's not rendering some required inputs for the demo source upload and the re-captcha.


jsocol commented Mar 27, 2013

Found it: There's an <iframe> in a localized string, but _ now returns Markup objects, so that needs to be escaped.


ubernostrum and others added some commits Feb 1, 2013

@ubernostrum @groovecoder ubernostrum + groovecoder First draft of Django 1.5 logging configuration.
Django 1.5 compatibility: model field definitions and arguments.

Django 1.5 compatibility: Small typo in log settings.

Django 1.5 compatibility: Stop importing log_settings since we don't use it anymore.

Django 1.5 compatibility: Fix JSON field.

Django compatibility: More model field definitions that got left out of last commit.

Django compatibility: The big one.

Django compatibility: more sumo cleanup.
@lmorchard @groovecoder lmorchard + groovecoder Django compatibility: Fixes to account for caching and misc tweaks 3814530
@groovecoder groovecoder more django compatibility fixes 8043dbc
@groovecoder groovecoder update vendor submodule to django 1.4.5 commit 4213579
@groovecoder groovecoder restore CSRF in templates a4b9098
@groovecoder James Socol + groovecoder Changes from local testing.
Behavior of _ has changed.

Add STATIC_URL setting.

This will need to be coordinated with an Apache config change to serve
admin assets from /static/admin/.
@groovecoder groovecoder fix rebase issue f67d357

groovecoder commented Mar 27, 2013

superseded by #962

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment