Jens Langhammer 1a0aa7e944 Merge branch 'version-2021.1' ...

# Conflicts:
#	.bumpversion.cfg
#	.github/workflows/release.yml
#	authentik/__init__.py
#	docker-compose.yml
#	helm/Chart.yaml
#	helm/README.md
#	helm/values.yaml
#	outpost/pkg/version.go
#	web/src/constants.ts
#	website/docs/installation/docker-compose.md
#	website/docs/installation/kubernetes.md

2021-01-17 22:37:13 +01:00

..

development

wip: rename to authentik (#361)

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

events

events: triggers -> rules

2021-01-16 14:15:23 +01:00

expressions

wip: rename to authentik (#361)

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

flow

root: global email settings (#448)

2021-01-05 00:41:10 +01:00

installation

release: 2021.1.1-stable

2021-01-17 22:36:16 +01:00

integrations

docs: add grafana integration docs

2020-12-29 20:43:27 +01:00

maintenance/backups

wip: rename to authentik (#361)

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

outposts

wip: rename to authentik (#361)

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

policies

wip: rename to authentik (#361)

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

property-mappings

wip: rename to authentik (#361)

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

providers

wip: rename to authentik (#361)

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

releases

root: use stable version on master

2021-01-17 17:41:49 +01:00

troubleshooting

root: global email settings (#448)

2021-01-05 00:41:10 +01:00

index.md

root: global email settings (#448)

2021-01-05 00:41:10 +01:00

sources.md

docs: point to ad integration in sources overview

2020-12-25 23:11:02 +01:00

terminology.md

wip: rename to authentik (#361)

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