habsi/authentik
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into 23-groups

Browse Source 
# Conflicts:
#	passbook/admin/templates/administration/base.html
This commit is contained in:
Jens Langhammer
2019-03-10 17:13:29 +01:00
parent 2d7e8f1b50 5e11b6687e
commit 5f861189e4
59 changed files with 903 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
passbook/admin/templates/administration/base.html
View File

@ -20,6 +20,10 @@
class="{% is_active 'passbook_admin:providers' 'passbook_admin:provider-create' 'passbook_admin:provider-update' 'passbook_admin:provider-delete' %}">
<a href="{% url 'passbook_admin:providers' %}">{% trans 'Providers' %}</a>
</li>
<li
class="{% is_active 'passbook_admin:property-mappings' 'passbook_admin:property-mapping-create' 'passbook_admin:property-mapping-update' 'passbook_admin:property-mapping-delete' %}">
<a href="{% url 'passbook_admin:property-mappings' %}">{% trans 'Property Mappings' %}</a>
</li>
<li
class="{% is_active 'passbook_admin:factors' 'passbook_admin:factor-create' 'passbook_admin:factor-update' 'passbook_admin:factor-delete' %}">
<a href="{% url 'passbook_admin:factors' %}">{% trans 'Factors' %}</a>