Commit Graph

17 Commits

Author SHA1 Message Date
Fabiennne
108876348f feat: merge master 2020-03-30 17:51:25 +02:00
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 Amstutz
fa750a5068 improve some functions 2020-03-30 07:23:43 +02:00
Livio Amstutz
40734f27c7 fix configs 2020-03-25 11:17:38 +01:00
Fabiennne
5bab685340 fix: start server and gateway 2020-03-25 10:54:45 +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
3100d4b48b fix: imports 2020-03-24 16:16:05 +01:00
Fabiennne
f2a9fa8972 fix: add grpc server and gateway 2020-03-24 11:20:45 +01:00
Fabiennne
c20dd3cb3f fix: add requests 2020-03-24 10:14:39 +01:00
Fabiennne
46c3289ee3 fix: add server 2020-03-24 07:09:28 +01:00
Fabiennne
e55b137455 fix: generate proto files 2020-03-23 16:56:02 +01:00
Fabiennne
bf3b770700 fix: remove generated files 2020-03-23 16:28:35 +01:00
Fabiennne
c5a5b65a03 fix: generated files 2020-03-23 12:25:16 +01:00
Fabiennne
43d45ab727 fix: generated files 2020-03-23 10:52:06 +01:00
Fabiennne
3c819e561a feat: add proto files 2020-03-23 10:50:40 +01:00
Fabiennne
f6801200a9 feat: add admin proto 2020-03-20 17:13:53 +01:00