Jens Langhammer 69ee18e13d Merge branch 'master' into new-forms ...

Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>

# Conflicts:
#	Pipfile.lock
#	authentik/api/decorators.py
#	authentik/core/api/applications.py
#	authentik/core/api/users.py
#	authentik/events/api/event.py
#	authentik/events/api/notification_transport.py
#	authentik/flows/api/flows.py
#	swagger.yaml

2021-03-30 10:26:18 +02:00

..

authentik/sources

wip: rename to authentik (#361)

2020-12-05 22:08:42 +01:00

icons

web: fix icons not being included in static container

2020-12-12 21:49:00 +01:00

src

policies: add test API

2021-03-29 23:40:36 +02:00

.dockerignore

root: attempt to build static image without django's collectstatic (#360)

2020-12-02 21:23:07 +01:00

.eslintignore

web: fix path for artefacts

2021-03-16 22:42:15 +01:00

.eslintrc.json

web: add notification 'mark as seen' button

2021-01-16 19:09:03 +01:00

.gitignore

web: use API as dedicated module

2021-03-16 21:32:39 +01:00

azure-pipelines.yml

web: fix path for artefacts

2021-03-16 22:42:15 +01:00

Dockerfile

web: load missing flow css files and adopt them

2021-03-16 22:02:58 +01:00

nginx.conf

Static SPA (#648)

2021-03-22 13:44:17 +01:00

package-lock.json

Merge branch 'master' into new-forms

2021-03-30 10:26:18 +02:00

package.json

Merge branch 'master' into new-forms

2021-03-30 10:26:18 +02:00

robots.txt

root: move webapp to /web (#347)

2020-11-28 19:43:42 +01:00

rollup.config.js

web: cleanup entrypoints

2021-03-27 22:06:42 +01:00

tsconfig.json

web: further cleanup, more linting

2020-12-02 15:44:40 +01:00