Commit Graph

7509 Commits

Author SHA1 Message Date
Don Kushan Saminda Wijeratne
7e7fa53b8f adding device status history feature 2022-01-18 03:18:29 +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
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
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
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
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
Amalka Subasinghe
fbc255b7a8 removed unwanted todos 2021-11-30 11:58:42 +05:30
Mohamed Rashd
fd0368b8b5 Change api that checks if an appName already exists, to accept the appName as query parameter instead of context-path 2021-11-29 15:26:35 +05:30
lasantha
4b64748448 Add app subscribing feature improvement 2021-11-26 15:23:26 +05:30
Pahansith Gunathilake
5da6c70502 Merge branch 'ios-500' into 'master'
ios enrollment fixes

See merge request entgra/carbon-device-mgt!819
2021-11-22 11:14:57 +00:00
Pahansith Gunathilake
26ef9bcf01 Merge branch 'subs-operation-status-fix' into 'master'
Fix operation status issue in app subscription

See merge request entgra/carbon-device-mgt!818
2021-11-22 11:14:26 +00:00
Pahansith Gunathilake
2026b9a6fa Merge branch 'feature/filter-apis' into 'master'
Add API to retrieve filters for analytics

See merge request entgra/carbon-device-mgt!817
2021-11-22 11:13:59 +00:00
Pahansith Gunathilake
76782a9bb7 Merge branch 'fix-1189' into 'master'
Remove duplicate app subscriptions

See merge request entgra/carbon-device-mgt!820
2021-11-22 07:51:53 +00:00
inoshperera
b6c41eabb9 Remove duplicate app subscriptions
When there are multiple groups on the list, there is a possibility to create multiple subscriptions. The fix is to address this problem. Fixes https://gitlab.com/entgra/product-iots/-/issues/1189
2021-11-22 12:28:39 +05:30
inoshperera
fbfd9ba911 ios enrollment fixes
Fixes https://gitlab.com/entgra/product-iots/-/issues/1184
2021-11-16 10:37:13 +05:30
Chamindu Senanayake
7776e19946 Fix operation status issue in app subscription
Fixes https://gitlab.com/entgra/product-iots/-/issues/999
2021-11-15 05:30:04 +05:30
navodzoysa
71e6ca3bd0 Add API to retrieve filters for analytics 2021-11-12 16:56:18 +05:30
charithag
6f008ea65f Allow users with CDM Admin permission to retrieve activities 2021-11-05 20:50:29 +05:30
charithag
3fea6f79c7 Add missing initiated by field in operation retrieval 2021-11-04 21:24:08 +05:30
Pahansith Gunathilake
731ae83bc4 Merge branch 'RemoteFix' into 'master'
Fix remote session failing issue

See merge request entgra/carbon-device-mgt!811
2021-10-29 04:22:02 +00:00
lasantha
4c921d54b1 Update APPM subscriptions when operation log updates 2021-10-25 14:55:33 +05:30
sandaru
4d0bf16a65 Fix remote session failing issue 2021-10-15 08:01:28 +05:30
builder
216e47b429 [maven-release-plugin] prepare for next development iteration 2021-10-05 15:14:34 +00:00
builder
5c2dc99b09 [maven-release-plugin] prepare release v5.0.0 2021-10-05 15:14:29 +00:00
Pahansith Gunathilake
9daa745001 Merge branch 'kernel-4.6.x' into 'kernel-4.6.x'
Sync with master

See merge request entgra/carbon-device-mgt!807
2021-10-03 15:49:57 +00:00
Pahansith Gunathilake
26fb28efd9 Merge branch 'k-46x-test-fix-2' into 'kernel-4.6.x'
Fix test cases kernel-4.6.x

See merge request entgra/carbon-device-mgt!800
2021-10-03 15:49:38 +00:00
Pahansith Gunathilake
f22fc7e460 Fix test cases kernel-4.6.x 2021-10-03 15:49:37 +00:00
Saad Sahibjan
b3a229a0e7 Update device property table in dm db when updating properties
(cherry picked from commit 5f64b0b1ad)
2021-10-03 20:52:03 +05:30
Saad Sahibjan
1434a27cde Add new device status ASSIGNED
(cherry picked from commit 68405ed229)
2021-10-03 20:51:58 +05:30
sandaru
eb05fb9a3f Fix web-clip install issue
(cherry picked from commit ebe9842d9a)
2021-10-03 20:51:54 +05:30
Saad Sahibjan
6393276503 Fix having UPPER in query of groups retrieval
(cherry picked from commit 4681447ba9)
2021-10-03 20:51:51 +05:30
Pahansith Gunathilake
06935fd5fb Merge branch 'kernel-4.6.2' into 'kernel-4.6.x'
fixed issue in updating apis

See merge request entgra/carbon-device-mgt!806
2021-10-01 05:45:43 +00:00
Amalka Subasinghe
7bb616075a fixed issue in updating apis 2021-10-01 11:03:40 +05:30
Pahansith Gunathilake
9bba7edde8 Merge branch 'kernel-4.6.2' into 'kernel-4.6.x'
updating existing shared scope not required

See merge request entgra/carbon-device-mgt!803
2021-09-24 12:18:01 +00:00
Amalka Subasinghe
de963fa01b updating existing shared scope not required 2021-09-24 15:38:07 +05:30
Pahansith Gunathilake
a960f3b364 Merge branch 'kernel-4.6.2' into 'kernel-4.6.x'
fixed gw, km, iot, apim urls

See merge request entgra/carbon-device-mgt!801
2021-09-15 16:59:30 +00:00
Amalka Subasinghe
a031579b80 fixed gw, km, iot, apim urls 2021-09-15 15:12:10 +05:30
Pahansith
ee95c8aca1 Fix location update timestamp overwrite issue 2021-08-25 15:09:55 +05:30
Amalka Subasinghe
7dc5d7f45d X:Merge branch 'master' into kernel-4.6.2 2021-08-24 15:32:37 +05:30
Amalka Subasinghe
4203226aa5 fixed tenant enrol issue 2021-08-24 15:08:38 +05:30
Pahansith
d8999cd3a6 Fix error while adding app install to a device group 2021-08-24 13:06:37 +05:30
Amalka Subasinghe
eae469fbc5 tenant login issue fixed 2021-08-17 09:53:41 +05:30
Amalka Subasinghe
4503ab77c7 package name change - appmgt 2021-08-10 17:30:48 +05:30
Amalka Subasinghe
8a07dad38c package name change - appmgt common 2021-08-10 16:56:19 +05:30
Amalka Subasinghe
37b08ba389 package name change - appmgt core 2021-08-10 16:48:15 +05:30
Amalka Subasinghe
16af7a44b5 package name change - appmgt addons 2021-08-10 16:15:59 +05:30
Amalka Subasinghe
4de4a15359 package name change - appmgt api 2021-08-10 16:13:23 +05:30
Amalka Subasinghe
a57043b5c1 package name change - appmgt publisher api 2021-08-10 16:07:17 +05:30
Amalka Subasinghe
d6c04ca928 package name change - appmgt store api 2021-08-10 16:02:47 +05:30
Amalka Subasinghe
f7f8ce535a fixed issue - product-iots #1059 2021-08-10 12:39:58 +05:30
Amalka Subasinghe
f9274b0d1a update from master 2021-08-02 11:18:15 +05:30
Pahansith Gunathilake
76deadcf41 Merge branch 'master' into 'master'
Login cache improvements and Refresh token handling improvements

See merge request entgra/carbon-device-mgt!789
2021-08-02 05:11:19 +00:00
Pahansith Gunathilake
dc6856fc0e Merge branch 'master' into 'master'
Block Uninstall Policy Feature

See merge request entgra/carbon-device-mgt!787
2021-08-02 05:09:51 +00:00
Muhammad Rashad
556886daec Block Uninstall Policy Feature 2021-08-02 05:09:51 +00:00
Pahansith Gunathilake
939e9faeff Merge branch 'hierarchical-grouping' into 'master'
Hierarchical grouping

See merge request entgra/carbon-device-mgt!780
2021-08-02 05:00:17 +00:00
vigneshan
b9d591adb5 Improve refresh token handling mechanism 2021-07-29 10:46:41 +05:30
vigneshan
0eb74d9f60 Modify login cache implementatation with LRU cache 2021-07-29 10:46:41 +05:30
Amalka Subasinghe
88d305c1b1 Merge branch 'master' into kernel-4.6.2 2021-07-26 09:51:18 +05:30
navodzoysa
5d23d1d6f6 Fix date range shown in reverse in MDM Reports 2021-07-21 21:34:42 +05:30
Dharmakeerthi Lasantha
eb13d1b70d Revert "Merge branch 'master' into 'master'"
This reverts merge request !785
2021-07-19 10:18:32 +00:00
lasantha
d0ef3beec0 Improve App subscribing flow 2021-07-16 19:53:56 +05:30
Saad Sahibjan
489aaabc44 Move slash to a constant 2021-07-16 00:13:30 +05:30
Saad Sahibjan
ed087e2a0c Update all children groups when updating a group 2021-07-15 21:37:36 +05:30
Amalka Subasinghe
f3720e49ff added scripts and updated config reading 2021-07-15 11:14:20 +05:30
Amalka Subasinghe
bdb01a0098 bug fixing 2021-07-13 22:33:18 +05:30
Amalka Subasinghe
a418fe5d0d Merge branch 'master' into kernel-4.6.2 2021-07-13 09:29:25 +05:30
Amalka Subasinghe
fc9a9ca210 fixed permission issues 2021-07-13 09:28:30 +05:30
Amalka Subasinghe
510a90a59f bug fixing authorize flow 2021-07-09 14:46:28 +05:30
Kaveesha
d84f642b55 Add API for get app subscribed device list from a subscription group 2021-07-07 00:58:07 +05:30
Pahansith Gunathilake
c2dd2130b4 Merge branch 'master' into 'master'
Update DM_DEVICE_INFO table

See merge request entgra/carbon-device-mgt!776
2021-07-06 09:51:15 +00:00
Amalka Subasinghe
52c0e55b07 adding user roles 2021-06-28 14:06:23 +05:30
Amalka Subasinghe
f9a9cff0b9 updated user roles 2021-06-28 13:04:13 +05:30
Amalka Subasinghe
c558cec88e scope-role-permission refactoring and webapp authorization 2021-06-26 13:53:33 +05:30
Amalka Subasinghe
30a1d92fde scope-role-permission refactoring and webapp authorization 2021-06-26 13:48:26 +05:30
Amalka Subasinghe
94dd33ffa5 scope-role-permission refactoring and webapp authorization 2021-06-26 13:45:27 +05:30
Saad Sahibjan
24e69d5492 Fix test cases related to hierarchical group changes 2021-06-24 21:06:30 +05:30
Saad Sahibjan
e18aa57fe8 Add and update api layer related to hierarchical changes 2021-06-24 20:46:44 +05:30
Saad Sahibjan
0ae6c6246a Add and update service layer related to hierarchical changes 2021-06-24 20:46:44 +05:30
Saad Sahibjan
e22d9fd8fc Add and update dao layer methods related to hierarchical changes 2021-06-24 20:46:44 +05:30
Saad Sahibjan
f1892f726d Update device group and request beans classes to have new variable 2021-06-24 20:46:44 +05:30
Amalka Subasinghe
51dd72ff79 commented braking changes related to analytics 2021-06-22 11:26:01 +05:30
Amalka Subasinghe
d090fef2ac updated from master and added oauth2 component 2021-06-21 21:31:44 +05:30
Pahansith Gunathilake
feb8f9ca38 Merge branch 'issue-work-scope' into 'master'
[SBAC] - Add changes to use a newly added scope element in android.xml

Closes product-iots#985 and product-iots#937

See merge request entgra/carbon-device-mgt!771
2021-06-14 08:08:42 +00:00
Amalka Subasinghe
293b5f5a7b updated pom versions to 5.0.0-SNAPSHOT 2021-06-08 12:15:48 +05:30
Charitha Goonetilleke
89ae048a5d Merge branch 'geo-view' into 'master'
Add geo view API

See merge request entgra/carbon-device-mgt!775
2021-06-06 04:12:09 +00:00
MalshaPiumini
a1567d8a3d Increase session time for sso and non-sso login. 2021-06-04 11:20:25 +05:30