ArrisLee d191e4f9b9 resolve conflicts

2021-09-02 11:33:53 +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): add apis for event tracking (#5298)

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

assets

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

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

azure

Xt 485/give front end elements data cy attributes (#5483)

2021-08-26 12:05:28 +12:00

docker

Xt 485/give front end elements data cy attributes (#5483)

2021-08-26 12:05:28 +12:00

edge

Xt 485/give front end elements data cy attributes (#5483)

2021-08-26 12:05:28 +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-02 11:33:53 +12:00

portainer

resolve conflicts

2021-09-02 11:33:53 +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

chore(app): fail on angular components missing nginject (#4224)

2021-01-17 20:28:09 +13: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