DjangoBB

Add test case for utils.add_rel_nofollow() Both convert_text_to_html() and add_rel_nofollow() should add the rel="nofollow" attribute to <a> tags. Signed-off-by: Stefan Hajnoczi <stefanha@…>

Merged in _qll/djangobb/_qll/remove_optional_import_parameter (pull request #42) Fix Python 3.4.0 incompatibility in import (remove optional default value).

Close branch _qll/remove_optional_import_parameter

Fix Python 3.4.0 incompatibility in import (remove optional default value).

fix send_mail() when no HTML content was given In commit "remove print from subscription" the EMAIL_DEBUG setting was removed from send_mail(). The msg.send() was mistakingly moved inside the if html: body. This patch fixes the bug so email is also sent when no HTML content was given. Signed-off-by: Stefan Hajnoczi <stefanha@…>

sync with stable

Python 3 fix: dictionary changed size during iteration Under python 3, this error would pop as soon as a user or guest times out.

Merged in tomds/djangobb/email_settings (pull request #40) Addition to #39: also hide email address on user profile page if USER_TO_USER_EMAIL is False

Close branch email_settings

#39 - also hide email address on user profile page if USER_TO_USER_EMAIL is False