Livio Amstutz 5b84c9b619 Merge branch 'master' into new-eventstore ... # Conflicts: # go.mod # internal/admin/repository/eventsourcing/eventstore/iam.go # internal/authz/repository/eventsourcing/repository.go # internal/eventstore/eventstore.go # internal/setup/config.go # pkg/grpc/management/mock/management.proto.mock.go		2021-01-05 09:27:42 +01:00
..
model	Merge branch 'master' into new-eventstore	2021-01-05 09:27:42 +01:00
cache.go	feat: split users into human and machine (#470)	2020-08-31 17:48:01 +02:00
codes.go	feat: user commands (#75)	2020-05-11 10:16:27 +02:00
eventstore_mock_test.go	feat: add WebAuthN support for passwordless login and 2fa (#966)	2020-12-02 17:00:04 +01:00
eventstore_test.go	fix: improvements for login flow (incl. webauthn) (#1026)	2020-12-07 12:09:10 +01:00
eventstore.go	Merge branch 'master' into new-eventstore	2021-01-05 09:27:42 +01:00
user_test.go	fix: improvements for login flow (incl. webauthn) (#1026)	2020-12-07 12:09:10 +01:00
user.go	fix: improvements for login flow (incl. webauthn) (#1026)	2020-12-07 12:09:10 +01:00