Pull requests

#9 Open
Repository
frol frol
Branch
default
Repository
psam psam
Branch
default

Optional CaptchaField and jinja2 support (with coffin)

Bitbucket cannot automatically merge this request due to conflicts.

Review the conflicts on the Overview tab. You can then either decline the request or merge it manually on your local system using the following commands:

hg update default
hg pull -r default https://bitbucket.org/frol/django-postman
hg merge c33a6de14755
hg commit -m 'Merged in frol/django-postman (pull request #9)'
Author
  1. frol
Reviewers
Description

There is an experimental jinja2 templates in another my branch experimental_jinja2_templates - https://bitbucket.org/frol/django-postman/src/701e0a94d7c2/postman/templates?at=experimental_jinja2_templates

add optional captcha protect with custom CaptchaField, more details in README

Comments (5)

  1. frol author

    Patrick, it was a long time ago, so I'm not quite sure about reproduce, but seems it was very simple: Use django 1.6, open any folder (inbox, output or others) with user that has no messages yet.

  2. Patrick Samson repo owner

    About the problem with query.py: this was also reported in issue #32, created after your pull request, and fixed. As you merged the master repo on 2013-08-22, your change is no more needed (and even never run). Thanks anyway. The PR is still valid for the others points. I suggest you clean-up it to avoid confusion.