ArrisLee bda164fca4 resolve conflicts

2021-09-23 10:23:45 +12:00

..

agent

feat(dockerhub): EE-1384 new endpoint prefix for proxying requests to agent (#5428)

2021-08-20 15:04:28 +12:00

angulartics.matomo

feat(analytics): track existing features (#5448) [EE-1076]

2021-09-05 13:03:48 +03:00

assets

fix danger button hover color (#5605)

2021-09-22 15:17:52 +12:00

azure

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

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

docker

fixed docker image pull text on error scenario (#5656)

2021-09-20 01:42:55 +12:00

edge

resolve conflicts

2021-09-23 10:23:45 +12:00

integrations

chore(deps): upgrade eslint and use eslint-plugin (#4989)

2021-08-24 07:34:18 +03:00

kubernetes

resolve conflicts

2021-09-23 10:23:45 +12:00

portainer

resolve conflicts

2021-09-23 10:23:45 +12:00

__module.js

feat(analytics): add apis for event tracking (#5298)

2021-08-11 10:45:53 +12:00

app.js

feat(sidebar): add indicator for an openable submenu (#5398) [EE-538]

2021-08-22 12:23:49 +03:00

config.js

feat(telemetry): replace GA with matomo (#4140)

2020-08-07 10:46:25 +12:00

constants.js

feat(k8s/resource-pool): add the ability to mark/unmark resource pool as system (#5360)

2021-08-26 16:00:59 +02:00

index.html

fit(ui): use new portainer in login page and license page EE-1637 (#5604)

2021-09-22 11:16:12 +12:00

matomo-setup.js

feat(telemetry): replace GA with matomo (#4140)

2020-08-07 10:46:25 +12:00

vendors.js

feat(telemetry): replace GA with matomo (#4140)

2020-08-07 10:46:25 +12:00