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

0001_initial.py

*(minor): small refactor

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

0002_auto_20191010_1058.py

core(minor): add separate permission to reset user's password

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

0002_nonce_description.py

core(minor): add new, optional description field to nonce

2019-10-10 14:04:58 +02:00

0003_auto_20191011_0914.py

core(minor): tags -> attributes, add attributes to user, add propertymappings to source

2019-10-11 12:47:06 +02:00

0003_merge_20191010_1541.py

core(minor): merge migrations

2019-10-10 17:41:22 +02:00

0004_remove_policy_action.py

core(major): remove action field from policy

2019-10-14 13:57:38 +02:00