ArrisLee a77f189b45 resolve conflicts

2021-09-20 14:18:16 +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

fix(backup): backup certs [EE-1479] (#5469)

2021-09-10 11:12:21 +12:00

bolt

fix(swagger): fix swagger api docs endpoint(s) rename to environment(s) EE-1661 (#5629)

2021-09-20 12:14:22 +12:00

chisel

resolve conflicts

2021-09-20 14:18:16 +12:00

cli

feat(ui):rename endpoint(s) to environment(s) EE-1206 (#5588)

2021-09-08 20:42:17 +12:00

cmd/portainer

resolve conflicts

2021-09-20 14:18:16 +12:00

crypto

fix(swagger): fix swagger api docs endpoint(s) rename to environment(s) EE-1661 (#5629)

2021-09-20 12:14:22 +12:00

docker

fix(swagger): fix swagger api docs endpoint(s) rename to environment(s) EE-1661 (#5629)

2021-09-20 12:14:22 +12:00

exec

resolve conflicts

2021-09-20 14:18:16 +12:00

filesystem

resolve conflicts

2021-09-20 14:18:16 +12:00

git

feat(stacks): support automated sync for stacks [EE-248] (#5340)

2021-08-17 13:12:07 +12:00

http

resolve conflicts

2021-09-20 14:18:16 +12:00

internal

resolve conflicts

2021-09-20 14:18:16 +12:00

jwt

feat(helm/templates): helm app templates EE-943 (#5449)

2021-09-10 14:06:57 +12:00

kubernetes

resolve conflicts

2021-09-20 14:18:16 +12:00

ldap

refactor(errors): reorganize errors (#3938)

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

oauth

fix(swagger): fix swagger api docs endpoint(s) rename to environment(s) EE-1661 (#5629)

2021-09-20 12:14:22 +12:00

scheduler

feat(stacks): support automated sync for stacks [EE-248] (#5340)

2021-08-17 13:12:07 +12:00

stacks

resolve conflicts

2021-09-20 14:18:16 +12:00

api-description.md

fix(swagger): fix swagger api docs endpoint(s) rename to environment(s) EE-1661 (#5629)

2021-09-20 12:14:22 +12:00

go.mod

feat(helm/tests): update libhelm with new search mock EE-1599 (#5615)

2021-09-16 16:56:46 +12:00

go.sum

feat(helm/tests): update libhelm with new search mock EE-1599 (#5615)

2021-09-16 16:56:46 +12:00

kubernetes.go

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

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

portainer.go

resolve conflicts

2021-09-20 14:18:16 +12:00

swagger_config.json

chore(version): bump version number

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

swagger.yaml

Remove references to deviantony gist (#5594)

2021-09-13 09:00:49 +12:00