Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
zulip/templates/openid_error.html

16 lines
894 B
HTML
Raw Normal View History

[manual] Rename Django app from zephyr to zerver. This needs to be deployed to both staging and prod at the same off-peak time (and the schema migration run). At the time it is deployed, we need to make a few changes directly in the database: (1) UPDATE django_content_type set app_label='zerver' where app_label='zephyr'; (2) UPDATE south_migrationhistory set app_name='zerver' where app_name='zephyr'; (imported from commit eb3fd719571740189514ef0b884738cb30df1320)
2013-07-29 23:03:31 +02:00
{% extends "zerver/portico.html" %}
[manual] Implement backend support for authenticating a user via Google. This code adds a dependency on python-django-auth-openid, installable as django-openid-auth from PyPI. On prod, one needs to run a syncdb in order to create the required tables. A database *migration* is not required, as these are new tables only. (imported from commit c902a0df8d589d93743b27e480154a04402b2c41)
2013-02-20 22:26:06 +01:00
{% block for_you %} isn't feeling too good. {% endblock %}
{% block portico_content %}
<br/>
<p class="lead">We couldn't validate your Google account<p>
[django 1.5] Use new-style url syntax in templates. Checked using the following (relevant for rebasing): git grep url templates/ | grep -v "'django" | grep -v "'zephyr" This appears to not have a good backwards-compatability story (well, there is one involving a %load from the future, but it seems to not work). (imported from commit d740831658aa23cadbbb82082ac6a3738d449a1d)
2013-03-07 23:05:31 +01:00
<p>You might want to <a href="{% url 'django_openid_auth.views.login_begin' %}">try logging in via Google again</a>
or <a href="{% url 'django.contrib.auth.views.login' %}">log in with a username or password.</a></p>
[manual] Implement backend support for authenticating a user via Google. This code adds a dependency on python-django-auth-openid, installable as django-openid-auth from PyPI. On prod, one needs to run a syncdb in order to create the required tables. A database *migration* is not required, as these are new tables only. (imported from commit c902a0df8d589d93743b27e480154a04402b2c41)
2013-02-20 22:26:06 +01:00
Switch from the @humbughq.com to @zulip.com addresses users can contact. In particular support@ and jobs@. (imported from commit 8051ae5628b7378cde49b160d26b704e7e14bb24)
2013-07-11 16:45:53 +02:00
<p>If you'd like, you can also <a href="mailto:support@zulip.com?Subject=Error%20logging%20in%20with%20Google%20Apps&Body=Hi%20there%2C%0A%0AI%20encountered%20an%20error%20when%20attempting%20to%20log%20in%20with%20Google%20Apps%20on%20Zulip%20using%20my%20email%20address%20youremailgoeshere@yourdomain.example.com%0A%0AError%20message%3A%20%20{{ message|escape }}%0A%0ASincerely%2C%20%0A%0AYour%20name%20here">drop us a line</a> to let us know what happened.</p>
[manual] Implement backend support for authenticating a user via Google. This code adds a dependency on python-django-auth-openid, installable as django-openid-auth from PyPI. On prod, one needs to run a syncdb in order to create the required tables. A database *migration* is not required, as these are new tables only. (imported from commit c902a0df8d589d93743b27e480154a04402b2c41)
2013-02-20 22:26:06 +01:00
{% endblock %}