This repository has been archived on 2024-05-31. You can view files and clone it, but cannot push or open issues or pull requests.

Jens Langhammer 7f65ae3f92 Merge branch 'master' into stage-challenge ... # Conflicts: # web/package-lock.json		2021-02-28 00:47:18 +01:00
..
admin	Merge branch 'master' into stage-challenge	2021-02-27 18:10:08 +01:00
api	Merge branch 'master' into stage-challenge	2021-02-20 12:51:10 +01:00
core	core: fix path for blank avatar when avatars are disabled	2021-02-26 15:07:30 +01:00
crypto	admin: migrate certificate-keypair list to web	2021-02-16 23:16:52 +01:00
events	Merge branch 'master' into stage-challenge	2021-02-27 18:10:08 +01:00
flows	Merge branch 'master' into stage-challenge	2021-02-27 18:10:08 +01:00
lib	*: remove unused templates and code, move avatar to User model	2021-02-25 19:58:23 +01:00
managed	*: rewrite managed objects, use nullable text flag instead of boolean as uid (#533)	2021-02-06 15:56:21 +00:00
outposts	Merge branch 'master' into stage-challenge	2021-02-28 00:47:18 +01:00
policies	Merge branch 'master' into stage-challenge	2021-02-27 16:04:57 +01:00
providers	Merge branch 'master' into stage-challenge	2021-02-28 00:47:18 +01:00
recovery	*: replace shortcuts.reverse with urls.reverse	2021-02-20 19:13:50 +01:00
root	root: don't use failfast	2021-02-26 15:39:50 +01:00
sources	Merge branch 'master' into stage-challenge	2021-02-27 18:10:08 +01:00
stages	stages/prompt: fix fields not being sorted correctly	2021-02-27 21:03:57 +01:00
__init__.py	release: 2021.2.6-stable	2021-02-27 18:16:46 +01:00