ArrisLee c4e2ca1fb9 resolve conflicts

2021-06-11 14:14:31 +12:00

..

adminmonitor

feat(backup): Add backup/restore to the server

2021-04-06 22:08:43 +12:00

archive

feat(git) git clone improvements [EE-451] (#5070)

2021-05-24 17:27:07 +12:00

backup

go 1.13 compatibility

2021-04-07 12:12:19 +12:00

bolt

feat(OAuth): Add SSO support for OAuth EE-390 (#5087)

2021-06-11 10:09:04 +12:00

chisel

feat(backup): Add backup/restore to the server

2021-04-06 22:08:43 +12:00

cli

feat(core/cli): change analytics flag message (#4273)

2020-08-26 23:58:19 +12:00

cmd/portainer

feat(OAuth): Add SSO support for OAuth EE-390 (#5087)

2021-06-11 10:09:04 +12:00

crypto

go 1.13 compatibility

2021-04-07 12:12:19 +12:00

docker

feat(home): add node count to endpoint list. (#4793)

2021-03-04 16:42:47 +01:00

exec

Fix(kube) advanced deployment CE-83 (#4866)

2021-06-09 01:55:17 +02:00

filesystem

feat(stack): add git repo deployment method for k8s EE-638

2021-06-10 12:38:49 +12:00

git

feat(git) git clone improvements [EE-451] (#5070)

2021-05-24 17:27:07 +12:00

http

resolve conflicts

2021-06-11 14:14:31 +12:00

internal

Fix(kube) advanced deployment CE-83 (#4866)

2021-06-09 01:55:17 +02:00

jwt

feat(OAuth): Add SSO support for OAuth EE-390 (#5087)

2021-06-11 10:09:04 +12:00

kubernetes

fix(kubernetes): removes kube client cache when edge proxy is removed (#4487) (#4574)

2021-01-08 11:55:42 +13:00

ldap

refactor(errors): reorganize errors (#3938)

2020-07-08 09:57:52 +12:00

libcompose

fix: normalize stack name only for libcompose (#4862)

2021-03-14 20:08:31 +01:00

oauth

feat(OAuth): Add SSO support for OAuth EE-390 (#5087)

2021-06-11 10:09:04 +12:00

api-description.md

docs(api): document apis with swagger (#4678)

2021-02-23 16:21:39 +13:00

go.mod

feat(git) git clone improvements [EE-451] (#5070)

2021-05-24 17:27:07 +12:00

go.sum

feat(git) git clone improvements [EE-451] (#5070)

2021-05-24 17:27:07 +12:00

kubernetes.go

feat(k8s/ingresses): add more granularity to ingress configuration (#4220)

2020-08-20 12:51:14 +12:00

portainer.go

feat(OAuth): Add SSO support for OAuth EE-390 (#5087)

2021-06-11 10:09:04 +12:00

swagger_config.json

chore(version): bump version number

2020-08-27 17:48:02 +12:00

swagger.yaml

docs(api): document apis with swagger (#4678)

2021-02-23 16:21:39 +13:00