Simon Meng db00390cd2 Merge remote-tracking branch 'origin/release/2.9' into develop ... # Conflicts: # api/http/handler/websocket/shell_pod.go # app/portainer/components/box-selector/box-selector-item/box-selector-item.html # app/portainer/rbac/components/access-viewer/access-viewer-datatable/access-viewer-datatable.html # app/portainer/settings/authentication/ldap/ad-settings/ad-settings.html # app/portainer/settings/authentication/ldap/index.js # app/portainer/settings/authentication/ldap/ldap-settings-custom/ldap-settings-custom.html # app/portainer/settings/authentication/ldap/ldap-settings.model.js # app/portainer/settings/authentication/ldap/ldap-settings/ldap-settings.controller.js # app/portainer/views/settings/authentication/settingsAuthenticationController.js		2021-10-26 10:58:19 +13:00
..
client	fix(swagger): fix swagger api docs endpoint(s) rename to environment(s) EE-1661 (#5629)	2021-09-20 12:14:22 +12:00
errors	fix(swagger): fix swagger api docs endpoint(s) rename to environment(s) EE-1661 (#5629)	2021-09-20 12:14:22 +12:00
handler	Merge remote-tracking branch 'origin/release/2.9' into develop	2021-10-26 10:58:19 +13:00
middlewares	feat(ui):rename endpoint(s) to environment(s) EE-1206 (#5588)	2021-09-08 20:42:17 +12:00
offlinegate	feat(backup): Add backup/restore to the server	2021-04-06 22:08:43 +12:00
proxy	fix(edge) EE-1720 activate tunnel and remove proxy cache when needed (#5775)	2021-10-15 18:13:20 +13:00
security	fix(swagger): fix swagger api docs endpoint(s) rename to environment(s) EE-1661 (#5629)	2021-09-20 12:14:22 +12:00
server.go	feat(app): highlight be provided value [EE-882] (#5703) (#5835)	2021-10-07 11:59:53 +13:00