Commit Graph

9514 Commits

Author SHA1 Message Date
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
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
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
Rushdi
e54765e992 Updated the operation status 2022-01-05 13:30:42 +05:30
Rushdi
fd82162909 Added new operation status 2022-01-05 13:04:42 +05:30
Saad Sahibjan
7f23347701 Fix not picking up or push_notification_provider in cdm config template 2021-12-21 15:56:33 +05:30
Charitha Goonetilleke
78824205c1 Merge branch 'master' into 'master'
Allow retrieving activities for multiple device ids

See merge request entgra/carbon-device-mgt!831
2021-12-17 13:13:40 +00:00
Dharmakeerthi Lasantha
bb40e4e825 Merge branch 'policy-fix' into 'master'
Add additional attributes to policy UI beans

See merge request entgra/carbon-device-mgt!832
2021-12-16 18:56:22 +00:00
shamalka
301a7e7009 Add additional attributes to policy UI beans 2021-12-16 01:09:07 +05:30
charitha
0284c955cf Allow retrieving activities for multiple device ids 2021-12-15 14:48:49 +05:30
builder
d7ccaa559b [maven-release-plugin] prepare for next development iteration 2021-12-04 17:57:16 +00:00
builder
907fb825ea [maven-release-plugin] prepare release v5.0.0 2021-12-04 17:57:11 +00:00
Pahansith Gunathilake
ee0a1007eb Merge branch 'french-translation' into 'master'
Add access_token grant type

See merge request entgra/carbon-device-mgt!830
2021-12-04 17:09:12 +00:00
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
2021-12-04 17:08:27 +00:00
Pahansith Gunathilake
51cf354f4a Merge branch 'kernel-4.6.2' into 'master'
removed unwanted todos

See merge request entgra/carbon-device-mgt!825
2021-12-04 17:08:14 +00:00
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
2021-12-04 17:08:08 +00:00
Pahansith Gunathilake
b61c97d603 Make timestamps independent from host machine timezone 2021-12-04 17:08:08 +00:00
inoshperera
0bdd314cb8 Add access_token grant type
fixes https://gitlab.com/entgra/product-iots/-/issues/1178
2021-12-04 15:14:15 +05:30
Pahansith Gunathilake
d2df228e8b Merge branch 'change/api/isExistingApp' into 'master'
Change API that checks if an appName already exists, to accept the appName as query parameter

See merge request entgra/carbon-device-mgt!824
2021-12-02 18:13:14 +00:00
Pahansith Gunathilake
9f2cedd09c Change time filtering DB column 2021-12-01 17:10:45 +05:30
Pahansith Gunathilake
a0856f7069 Add time duration filtering to activities EP 2021-12-01 17:03:38 +05:30
Pahansith Gunathilake
9d9a588b10 Merge branch 'ios-scopes' into 'master'
Add missing ios scopes into mdm-ui-config.xml.j2

See merge request entgra/carbon-device-mgt!826
2021-11-30 16:54:56 +00:00