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

..

forms

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

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

migrations

Merge branch 'master' into guardian

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

static

core(minor): small css adjustment

2019-10-11 14:32:19 +02:00

templates

ui(minor): simplify top navigation

2019-10-10 10:02:48 +02:00

templatetags

core(minor): fix import order

2019-10-09 14:37:40 +02:00

tests

*(minor): small refactor

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

views

core/sources(minor): refactor Source's property

2019-10-13 16:47:13 +02:00

__init__.py

*(minor): small refactor

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

admin.py

add working oauth and ldap client

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

apps.py

core(minor): remove unused code

2019-10-08 15:04:38 +02:00

models.py

Merge branch 'master' into guardian

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

signals.py

*(minor): small refactor

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

tasks.py

core(major): add integrated database backup

2019-10-15 13:52:33 +02:00

urls.py

*(minor): small refactor

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