Charitha Goonetilleke
12acd443e6
Merge branch 'fix-test-failure' into 'master'
...
Fix test failure
See merge request entgra/carbon-device-mgt!859
2022-03-02 03:58:55 +00:00
Pahansith Gunathilake
cb2e5e9c66
Fix test failure
2022-03-02 09:15:36 +05:30
Charitha Goonetilleke
e11abeed99
Merge branch 'fix-enrollment-issue' into 'master'
...
Add separate DAO factory for event management
See merge request entgra/carbon-device-mgt!858
2022-03-02 00:54:33 +00:00
Pahansith Gunathilake
35e0b9189e
Add separate DAO factory for event management
2022-03-02 00:54:33 +00:00
Charitha Goonetilleke
777392e36c
Merge branch 'fix-enrollment-issue' into 'master'
...
Fix device enrollment failure
See merge request entgra/carbon-device-mgt!856
2022-03-01 05:53:01 +00:00
Pahansith Gunathilake
12c48540d8
Fix device enrollment failure
2022-03-01 10:46:36 +05:30
Inosh Perara
294bf8ae90
Merge branch 'fix/post/api/not/non/repeatable/entity' into 'master'
...
Fix post api failing when trying the with refresh token due to non repeatable http entity
See merge request entgra/carbon-device-mgt!850
2022-03-01 05:03:07 +00:00
Pahansith Gunathilake
ee857a75ef
Merge branch 'add-support-fixes' into 'master'
...
Add support fixes
See merge request entgra/carbon-device-mgt!851
2022-02-23 05:36:56 +00:00
charitha
507a21a047
Fix incorrect response handling logic
2022-02-23 11:03:58 +05:30
Pahansith Gunathilake
3650001012
Merge branch 'master' of gitlab.com:entgra/carbon-device-mgt into entgra-master
2022-02-23 11:03:25 +05:30
Mohamed Rashd
866686c6ea
Fix post api failing when trying the with refresh token due to non repeatable http entity
2022-02-22 16:50:51 +05:30
Pahansith Gunathilake
37e598774e
Merge branch 'fix-device-info-2' into 'master'
...
Add android device info operation permission
See merge request entgra/carbon-device-mgt!843
2022-02-02 19:26:01 +00:00
Pahansith Gunathilake
791436d061
Add android device info operation permission
2022-02-02 19:26:00 +00:00
Pahansith Gunathilake
9c3f2acc2a
Merge branch 'master' of gitlab.com:entgra/carbon-device-mgt into entgra-master
2022-02-02 14:35:07 +05:30
Pahansith Gunathilake
8105e36fbb
Merge branch 'master' into 'master'
...
Setting maintenance user when carbon context user is null + fixing the function which sets statuses of all devices belonging to a user
See merge request entgra/carbon-device-mgt!845
2022-02-02 09:04:29 +00:00
Don Kushan Saminda Wijeratne
1e0e54e818
Setting maintenance user when carbon context user is null + fixing the function which sets statuses of all devices belonging to a user
2022-02-02 09:04:29 +00:00
Pahansith Gunathilake
a1b7320215
Merge branch 'fix/grafana/permission' into 'master'
...
Fix typo in grafana api permission
See merge request entgra/carbon-device-mgt!841
2022-01-31 17:37:35 +00:00
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
2022-01-31 01:32:50 +05:30
Mohamed Rashd
bb3f86defa
Fix typo in grafana api permission
2022-01-26 12:09:12 +05:30
builder
06560d24d4
[maven-release-plugin] prepare for next development iteration
2022-01-24 08:29:39 +00:00
builder
2784633dd6
[maven-release-plugin] prepare release v5.0.2
2022-01-24 08:29:35 +00:00
Pahansith Gunathilake
482101371a
Merge branch 'bump-versions-2' into 'master'
...
Bump dependency versions of analytics-mgt
See merge request entgra/carbon-device-mgt!840
2022-01-24 08:23:15 +00:00
Pahansith Gunathilake
a7400e7074
Bump dependency versions of analytics-mgt
2022-01-24 08:23:15 +00:00
Pahansith Gunathilake
af88cbeceb
Bump dependency versions
2022-01-24 13:52:33 +05:30
Pahansith Gunathilake
84dfe97ec1
Bump dependency versions of analyticsmgt
2022-01-24 13:49:29 +05:30
Pahansith Gunathilake
9085e45e21
Update pom.xml
2022-01-24 07:57:47 +00:00
Pahansith Gunathilake
dcdff9827d
Update pom.xml
2022-01-24 07:57:25 +00:00
Pahansith Gunathilake
c475a3d035
Update pom.xml
2022-01-24 07:57:06 +00:00
Pahansith Gunathilake
27b5283ff7
Update pom.xml
2022-01-24 07:56:23 +00:00
Pahansith Gunathilake
e17ca8a914
Update pom.xml
2022-01-24 07:56:02 +00:00
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
2022-01-24 07:19:31 +00:00
Muhammad Rashad
4e73b778e2
Move grafana to separate module
2022-01-24 07:19:31 +00:00
builder
1896199698
[maven-release-plugin] prepare for next development iteration
2022-01-24 04:04:22 +00:00
builder
a765f780f0
[maven-release-plugin] prepare release v5.0.1
2022-01-24 04:04:17 +00:00
Pahansith Gunathilake
ff1438ac09
Merge branch 'master' into 'master'
...
operation timeout feature
See merge request entgra/carbon-device-mgt!838
2022-01-24 03:56:26 +00:00
Amalka Subasinghe
4ed28820c8
operation timeout feature
2022-01-24 03:56:25 +00:00
builder
ef558458a0
[maven-release-plugin] prepare for next development iteration
2022-01-18 03:25:27 +00:00
builder
8e191e75a6
[maven-release-plugin] prepare release v5.0.0
2022-01-18 03:25:22 +00:00
Pahansith Gunathilake
8b6a3ef77c
Merge branch 'master' into 'master'
...
adding device status history feature
See merge request entgra/carbon-device-mgt!836
2022-01-18 03:18:30 +00:00
Don Kushan Saminda Wijeratne
7e7fa53b8f
adding device status history feature
2022-01-18 03:18:29 +00:00
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
2022-01-18 03:13:38 +00:00
Pahansith Gunathilake
21e014d6a6
Merge branch 'api/pr/grafana/device-mgt' into 'master'
...
Added grafana integration
See merge request entgra/carbon-device-mgt!829
2022-01-18 03:11:09 +00:00
Muhammad Rashad
1f536c40e4
Added grafana integration
2022-01-18 03:11:08 +00:00
builder
2e9832caa6
[maven-release-plugin] prepare for next development iteration
2022-01-12 06:12:38 +00:00
builder
6b0c527bb2
[maven-release-plugin] prepare release v5.0.0
2022-01-12 06:12:32 +00:00
Pahansith Gunathilake
280de8c4eb
Merge branch 'bump-versions' into 'master'
...
Bump websocket dependency version
See merge request entgra/carbon-device-mgt!835
2022-01-12 05:15:21 +00:00
Pahansith Gunathilake
815ee6a8bf
Bump websocket dependency version
2022-01-12 10:40:47 +05:30
Pahansith Gunathilake
66566fcfeb
Revert "[maven-release-plugin] prepare release v5.0.0"
...
This reverts commit 907fb825ea
2022-01-12 10:40:10 +05:30
Pahansith Gunathilake
e2606f57e2
Revert "[maven-release-plugin] prepare for next development iteration"
...
This reverts commit d7ccaa559b
2022-01-12 10:40:06 +05:30
Charitha Goonetilleke
9af1e72b73
Merge branch 'feature/operations' into 'master'
...
Added new operation status
See merge request entgra/carbon-device-mgt!834
2022-01-05 12:01:14 +00:00
