Pahansith Gunathilake
|
a1b7320215
|
Merge branch 'fix/grafana/permission' into 'master'
Fix typo in grafana api permission
See merge request entgra/carbon-device-mgt!841
|
3 years ago |
|
Pahansith Gunathilake
|
24f0099bba
|
Merge branch 'master' of gitlab.com:entgra/carbon-device-mgt into entgra-master
# Conflicts:
# features/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.api.feature/pom.xml
# features/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.server.feature/pom.xml
# features/analytics-mgt/grafana-mgt/pom.xml
# features/analytics-mgt/pom.xml
|
3 years ago |
 Chandima Arangala
|
c89db6787d
|
Add installed version for installation details view
|
3 years ago |
Mohamed Rashd
|
bb3f86defa
|
Fix typo in grafana api permission
|
3 years ago |
builder
|
06560d24d4
|
[maven-release-plugin] prepare for next development iteration
|
3 years ago |
|
builder
|
2784633dd6
|
[maven-release-plugin] prepare release v5.0.2
|
3 years ago |
|
Pahansith Gunathilake
|
482101371a
|
Merge branch 'bump-versions-2' into 'master'
Bump dependency versions of analytics-mgt
See merge request entgra/carbon-device-mgt!840
|
3 years ago |
|
Pahansith Gunathilake
|
a7400e7074
|
Bump dependency versions of analytics-mgt
|
3 years ago |
|
Pahansith Gunathilake
|
af88cbeceb
|
Bump dependency versions
|
3 years ago |
|
Pahansith Gunathilake
|
84dfe97ec1
|
Bump dependency versions of analyticsmgt
|
3 years ago |
|
Pahansith Gunathilake
|
9085e45e21
|
Update pom.xml
|
3 years ago |
|
Pahansith Gunathilake
|
dcdff9827d
|
Update pom.xml
|
3 years ago |
|
Pahansith Gunathilake
|
c475a3d035
|
Update pom.xml
|
3 years ago |
|
Pahansith Gunathilake
|
27b5283ff7
|
Update pom.xml
|
3 years ago |
|
Pahansith Gunathilake
|
e17ca8a914
|
Update pom.xml
|
3 years ago |
|
Pahansith Gunathilake
|
7a9c3c1721
|
Merge branch 'api/master/grafana/analytics-mgt' into 'master'
Move grafana to separate module
See merge request entgra/carbon-device-mgt!837
|
3 years ago |
Muhammad Rashad
|
4e73b778e2
|
Move grafana to separate module
|
3 years ago |
|
builder
|
1896199698
|
[maven-release-plugin] prepare for next development iteration
|
3 years ago |
|
builder
|
a765f780f0
|
[maven-release-plugin] prepare release v5.0.1
|
3 years ago |
|
Pahansith Gunathilake
|
ff1438ac09
|
Merge branch 'master' into 'master'
operation timeout feature
See merge request entgra/carbon-device-mgt!838
|
3 years ago |
Amalka Subasinghe
|
4ed28820c8
|
operation timeout feature
|
3 years ago |
|
builder
|
ef558458a0
|
[maven-release-plugin] prepare for next development iteration
|
3 years ago |
|
builder
|
8e191e75a6
|
[maven-release-plugin] prepare release v5.0.0
|
3 years ago |
|
Pahansith Gunathilake
|
8b6a3ef77c
|
Merge branch 'master' into 'master'
adding device status history feature
See merge request entgra/carbon-device-mgt!836
|
3 years ago |
Don Kushan Saminda Wijeratne
|
7e7fa53b8f
|
adding device status history feature
|
3 years ago |
|
Pahansith Gunathilake
|
4cdd8dcb2f
|
Merge branch 'master' into 'master'
Fix not picking up or push_notification_provider in cdm config template
See merge request entgra/carbon-device-mgt!833
|
3 years ago |
|
Pahansith Gunathilake
|
21e014d6a6
|
Merge branch 'api/pr/grafana/device-mgt' into 'master'
Added grafana integration
See merge request entgra/carbon-device-mgt!829
|
3 years ago |
|
Muhammad Rashad
|
1f536c40e4
|
Added grafana integration
|
3 years ago |
|
builder
|
2e9832caa6
|
[maven-release-plugin] prepare for next development iteration
|
3 years ago |
|
builder
|
6b0c527bb2
|
[maven-release-plugin] prepare release v5.0.0
|
3 years ago |
|
Pahansith Gunathilake
|
280de8c4eb
|
Merge branch 'bump-versions' into 'master'
Bump websocket dependency version
See merge request entgra/carbon-device-mgt!835
|
3 years ago |
|
Pahansith Gunathilake
|
815ee6a8bf
|
Bump websocket dependency version
|
3 years ago |
|
Pahansith Gunathilake
|
66566fcfeb
|
Revert "[maven-release-plugin] prepare release v5.0.0"
This reverts commit 907fb825ea.
|
3 years ago |
|
Pahansith Gunathilake
|
e2606f57e2
|
Revert "[maven-release-plugin] prepare for next development iteration"
This reverts commit d7ccaa559b.
|
3 years ago |
 Charitha Goonetilleke
|
9af1e72b73
|
Merge branch 'feature/operations' into 'master'
Added new operation status
See merge request entgra/carbon-device-mgt!834
|
3 years ago |
 Rushdi Mohamed
|
e54765e992
|
Updated the operation status
|
3 years ago |
|
Rushdi Mohamed
|
fd82162909
|
Added new operation status
|
3 years ago |
Saad Sahibjan
|
7f23347701
|
Fix not picking up or push_notification_provider in cdm config template
|
3 years ago |
|
Charitha Goonetilleke
|
78824205c1
|
Merge branch 'master' into 'master'
Allow retrieving activities for multiple device ids
See merge request entgra/carbon-device-mgt!831
|
3 years ago |
Dharmakeerthi Lasantha
|
bb40e4e825
|
Merge branch 'policy-fix' into 'master'
Add additional attributes to policy UI beans
See merge request entgra/carbon-device-mgt!832
|
3 years ago |
shamalka
|
301a7e7009
|
Add additional attributes to policy UI beans
|
3 years ago |
|
Charitha Goonetilleke
|
0284c955cf
|
Allow retrieving activities for multiple device ids
|
3 years ago |
|
builder
|
d7ccaa559b
|
[maven-release-plugin] prepare for next development iteration
|
3 years ago |
|
builder
|
907fb825ea
|
[maven-release-plugin] prepare release v5.0.0
|
3 years ago |
|
Pahansith Gunathilake
|
ee0a1007eb
|
Merge branch 'french-translation' into 'master'
Add access_token grant type
See merge request entgra/carbon-device-mgt!830
|
3 years ago |
|
Pahansith Gunathilake
|
69677b4982
|
Merge branch 'modify-activity-epnew' into 'master'
Add time duration filtering to activities endpoint
See merge request entgra/carbon-device-mgt!828
|
3 years ago |
|
Pahansith Gunathilake
|
51cf354f4a
|
Merge branch 'kernel-4.6.2' into 'master'
removed unwanted todos
See merge request entgra/carbon-device-mgt!825
|
3 years ago |
|
Pahansith Gunathilake
|
91990141c5
|
Merge branch 'timestamp-fixes-1' into 'master'
Make timestamps independent from host machine timezone
See merge request entgra/carbon-device-mgt!823
|
3 years ago |
|
Pahansith Gunathilake
|
b61c97d603
|
Make timestamps independent from host machine timezone
|
3 years ago |
inoshperera
|
0bdd314cb8
|
Add access_token grant type
fixes https://gitlab.com/entgra/product-iots/-/issues/1178
|
3 years ago |
