diff --git a/setup.py b/setup.py index fd3963b..0ae9bdf 100644 --- a/setup.py +++ b/setup.py @@ -40,6 +40,6 @@ package_dir={'': 'src'}, include_package_data=True, install_requires=['django>=1.5', - 'django-social-auth>=0.7.8', + 'django-browserid', 'mailmanclient'] ) diff --git a/src/postorius/doc/news.rst b/src/postorius/doc/news.rst index fc904da..ce4c260 100644 --- a/src/postorius/doc/news.rst +++ b/src/postorius/doc/news.rst @@ -35,6 +35,9 @@ * Fix broken translation string on the login page. Contributed by Pranjal Yadav. * Show held message details in a modal window. Contributed by Abhilash Raj (LP: 1004049). * Rework of internal testing +* Mozilla Persona integration: switch from django-social-auto to django-browserid: Contributed by Abhilash Raj. +* Fix manage.py mmclient command for non-IPython shells. Contributed by Ankush Sharma (LP: 1428169). + 1.0 beta 1 -- "Year of the Parrot" ================================== diff --git a/src/postorius/management/commands/mmclient.py b/src/postorius/management/commands/mmclient.py index 0e0f91a..d92104b 100644 --- a/src/postorius/management/commands/mmclient.py +++ b/src/postorius/management/commands/mmclient.py @@ -45,5 +45,7 @@ console_fn = shell.interact # connect to mailmanclient client = utils.get_client() + # Putting client back in the global scope + globals()['client'] = client # run the interpreter console_fn() diff --git a/src/postorius/templates/postorius/login.html b/src/postorius/templates/postorius/login.html index 236e477..a139223 100644 --- a/src/postorius/templates/postorius/login.html +++ b/src/postorius/templates/postorius/login.html @@ -2,8 +2,10 @@ {% load url from future %} {% load i18n %} {% load staticfiles %} +{% load browserid %} {% block main %} +{% browserid_info %}
{% trans "Login with username and password or with Mozilla Persona" %}
@@ -17,15 +19,18 @@{% trans "Mozilla Persona is an easy way to sign into multiple websites, while still controlling your personal data. For more information see the Mozilla website" %}.
- + + + +{% trans "Mozilla Persona is an easy way to sign into multiple websites, while still controlling your personal data. For more information see the Mozilla website" %}. +
+