Commit Graph
39 Commits
Author SHA1 Message Date
Fabiennne 85aa907d12 Merge branch 'master' into proto-files
# Conflicts:
#	go.mod
#	go.sum
#	pkg/admin/admin.go
#	pkg/admin/api/config.go
#	pkg/auth/api/config.go
#	pkg/auth/auth.go
#	pkg/management/api/config.go
#	pkg/management/management.go
2020-03-30 17:43:59 +02:00
livio-aandGitHub c564f47b92 single marshaller 2020-03-30 16:53:29 +02:00
Fabiennne 8ced7fb04c Merge remote-tracking branch 'origin/basics' into basics 2020-03-30 14:11:24 +02:00
Livio Amstutz 39039dde62 fix tracing/statusFromError 2020-03-30 13:17:49 +02:00
Livio Amstutz 40e4f69ca3 change context keys and fix tests 2020-03-30 11:52:08 +02:00
Livio Amstutz 96b1817d62 add multi files config test and some more 2020-03-30 11:44:17 +02:00
Fabiennne 78e6d19098 fix: reformat test 2020-03-30 11:42:22 +02:00
Livio Amstutz e04c0116f5 refactor crypto tests 2020-03-30 11:26:02 +02:00
Livio Amstutz 106a6ec143 fix test 2020-03-30 10:09:38 +02:00
Livio Amstutz e5e39b3a6a remove pointer on ctxData 2020-03-30 10:06:48 +02:00
Livio Amstutz 501d453822 remove x-grpc-web header in cors 2020-03-30 09:58:55 +02:00
Livio Amstutz 59dc4dbe85 improve some functions 2020-03-30 09:28:00 +02:00
Livio Amstutz fa750a5068 improve some functions 2020-03-30 07:23:43 +02:00
Livio Amstutz b753e06f0b improve some functions 2020-03-30 07:04:21 +02:00
Livio Amstutz f5af4461ad remove pointers on configs 2020-03-27 13:57:16 +01:00
Livio Amstutz f280da5a76 remove empty lines 2020-03-27 13:45:08 +01:00
Livio Amstutz eb1d22c6a3 clarify array_flag.go 2020-03-27 13:44:50 +01:00
Livio Amstutz 8b23c491f9 Merge branch 'basics' into proto-files
# Conflicts:
#	cmd/zitadel/main.go
#	go.sum
#	pkg/admin/admin.go
#	pkg/auth/auth.go
#	pkg/management/management.go
2020-03-25 11:08:42 +01:00
Fabiennne 5bab685340 fix: start server and gateway 2020-03-25 10:54:45 +01:00
Livio Amstutz 1aaf721d92 cleanup 2020-03-25 10:41:17 +01:00
Livio Amstutz 6bf96ecbd7 add duration type 2020-03-25 09:32:52 +01:00
Fabiennne 209764de79 Merge branch 'basics' into proto-files 2020-03-25 08:22:44 +01:00
Livio Amstutz 5cd9ca506a add basic config and change i18n pkg 2020-03-25 07:58:58 +01:00
Fabiennne e6a4b7398c Merge branch 'basics' into proto-files
# Conflicts:
#	go.mod
#	go.sum
2020-03-24 14:22:34 +01:00
Livio Amstutz 96b88f5d8c add tracing and refactor some api pkgs 2020-03-24 14:15:01 +01:00
Livio Amstutz a5ca611dcc fix path in error_creator.go message 2020-03-24 07:22:31 +01:00
Fabiennne e55b137455 fix: generate proto files 2020-03-23 16:56:02 +01:00
Livio Amstutz 6deb0b029a add tests for config 2020-03-23 16:31:26 +01:00
Fabiennne bf3b770700 fix: remove generated files 2020-03-23 16:28:35 +01:00
Livio Amstutz 5843bac5f9 ad i18n and renderer and move headers 2020-03-23 13:26:05 +01:00
Fabiennne c5a5b65a03 fix: generated files 2020-03-23 12:25:16 +01:00
Livio Amstutz 781e8b215e feat: add protoc pkg 2020-03-23 11:53:12 +01:00
Livio Amstutz 265ea450b1 fix: import 2020-03-23 08:43:08 +01:00
Livio Amstutz 90342ed872 feat: add crypto pkg 2020-03-23 07:06:44 +01:00
Livio Amstutz c89397e1b4 feat: add some api packages 2020-03-23 07:01:59 +01:00
Livio Amstutz 021ee07350 fix: imports in error pkg tests 2020-03-23 06:34:08 +01:00
Livio Amstutz 7ef62528d1 return error on file not found and added log ids and messages 2020-03-19 08:32:47 +01:00
Livio Amstutz d3cb575e1d added config pkg 2020-03-18 15:45:55 +01:00
Livio Amstutz 238347ddfb add error pkg 2020-03-18 15:45:24 +01:00