Langhammer, Jens 261d57ad7b Merge branch 'master' into guardian ...

# Conflicts:
#	Pipfile
#	Pipfile.lock
#	passbook/admin/views/invitations.py
#	passbook/admin/views/policy.py
#	passbook/admin/views/providers.py
#	passbook/admin/views/sources.py
#	passbook/admin/views/users.py

2019-10-15 15:09:11 +02:00

..

__init__.py

add working oauth and ldap client

2018-11-11 13:41:48 +01:00

applications.py

Merge branch 'master' into guardian

2019-10-15 15:09:11 +02:00

audit.py

admin(major): rewrite all views to use guardian mixins

2019-10-10 13:01:49 +02:00

debug.py

admin(major): rewrite all views to use guardian mixins

2019-10-10 13:01:49 +02:00

factors.py

Merge branch 'master' into guardian

2019-10-15 15:09:11 +02:00

groups.py

Merge branch 'master' into guardian

2019-10-15 15:09:11 +02:00

invitations.py

admin(major): add pagination to all listviews

2019-10-14 13:15:42 +02:00

overview.py

*(minor): small refactor

2019-10-07 16:33:48 +02:00

policy.py

admin(major): add pagination to all listviews

2019-10-14 13:15:42 +02:00

property_mapping.py

Merge branch 'master' into guardian

2019-10-15 15:09:11 +02:00

providers.py

admin(major): add pagination to all listviews

2019-10-14 13:15:42 +02:00

sources.py

Merge branch 'master' into guardian

2019-10-15 15:09:11 +02:00

users.py

Merge branch 'master' into guardian

2019-10-15 15:09:11 +02:00