Release hotfix 0.11.5 0.11.5

-----BEGIN PGP SIGNATURE-----
 
 iQFIBAABCgAyFiEEKHuXKkUYdvdO9493DXkdyNc3wdkFAlwjdWsUHGphbkBkaXR0
 YmVybmVyLmluZm8ACgkQDXkdyNc3wdlVYAf/Y2AQsMQwp/MYht+xse2tznRVHPid
 XVDj8urrvW/Me7ugcuVdtIoOa1M+sc/8MGhpHWBzp92qAqpkQwkhTZZovaselLzq
 00+cf9HjNdUG+gEOW5eGBP0O0iN7bd/p1HqnmLtGEAx3YoKe4z2YHAl59Nb2jWoV
 9UiohbSK7+4fThC8r2Hj2zPmwnQ3t5QFLEWIp8xyvF+DQ3zuxXOoZlBK+9VR676j
 FxHox9eQ4iJpswlOzYDfS1nGzfVixI0cCvRuZeM1sHWteKVJrqOzNjKAAMi47T+v
 Jqq92EpLUFCsRxH+d5yvhLgNX6BpvWPtTDzd/SO6G+K4l/1whwWU//wG+g==
 =5PHe
 -----END PGP SIGNATURE-----

Merge tag '0.11.5'

Release hotfix 0.11.5 0.11.5
This commit is contained in:
Jan Dittberner 2018-12-26 13:35:55 +01:00
commit 6a982f8db2
3 changed files with 2 additions and 3 deletions

View file

@ -232,7 +232,6 @@ ALLAUTH_APPS = (
'allauth.socialaccount.providers.google', 'allauth.socialaccount.providers.google',
'allauth.socialaccount.providers.linkedin_oauth2', 'allauth.socialaccount.providers.linkedin_oauth2',
'allauth.socialaccount.providers.twitter', 'allauth.socialaccount.providers.twitter',
'allauth.socialaccount.providers.xing',
) )
# Apps specific for this project go here. # Apps specific for this project go here.

View file

@ -26,7 +26,7 @@
<tr> <tr>
<td><input id="id_account_{{base_account.id}}" type="radio" name="account" value="{{base_account.id}}"/></td> <td><input id="id_account_{{base_account.id}}" type="radio" name="account" value="{{base_account.id}}"/></td>
<td><label for="id_account_{{base_account.id}}"><i <td><label for="id_account_{{base_account.id}}"><i
class="fa fa-{% if provider == 'twitter' %}twitter{% elif provider == 'google' %}google{% elif provider == 'xing' %}xing{% elif provider == 'linkedin_oauth2' %}linkedin{% endif %}"></i> <span class="socialaccount_provider {{provider}} {{account.get_brand.id}}">{{account.get_brand.name}}</span></label></td> class="fa fa-{% if provider == 'twitter' %}twitter{% elif provider == 'google' %}google{% elif provider == 'linkedin_oauth2' %}linkedin{% endif %}"></i> <span class="socialaccount_provider {{provider}} {{account.get_brand.id}}">{{account.get_brand.name}}</span></label></td>
<td>{{ account }}</td> <td>{{ account }}</td>
</tr> </tr>
{% endwith %} {% endwith %}

View file

@ -16,7 +16,7 @@
<a title="{{provider.name}}" <a title="{{provider.name}}"
class="socialaccount_provider {{provider.id}}" class="socialaccount_provider {{provider.id}}"
href="{% provider_login_url provider.id process=process scope=scope auth_params=auth_params %}"><i href="{% provider_login_url provider.id process=process scope=scope auth_params=auth_params %}"><i
class="fa fa-{% if provider.id == 'twitter' %}twitter{% elif provider.id == 'google' %}google{% elif provider.id == 'xing' %}xing{% elif provider.id == 'linkedin_oauth2' %}linkedin{% endif %}"></i>&nbsp;{{provider.name}}</a> class="fa fa-{% if provider.id == 'twitter' %}twitter{% elif provider.id == 'google' %}google{% elif provider.id == 'linkedin_oauth2' %}linkedin{% endif %}"></i>&nbsp;{{provider.name}}</a>
</li> </li>
{% endfor %} {% endfor %}