Commit Graph

9733 Commits

Author SHA1 Message Date
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
Pahansith Gunathilake
376cb4ec92 Add missing ios scopes into ios.xml.j2 2021-11-30 22:18:13 +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
Dharmakeerthi Lasantha
dd1474c040 Merge branch 'master' into 'master'
Add app subscribing feature improvement

See merge request entgra/carbon-device-mgt!822
2021-11-26 10:13:16 +00:00
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
a2c7f4c751 Merge branch 'fix/gitignore' into 'master'
Add .factorypath file to gitignore

See merge request entgra/carbon-device-mgt!816
2021-11-22 11:06:26 +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
Mohamed Rashd
78955b9a04 Add .factorypath file to gitignore 2021-11-12 16:05:26 +05:30
Pahansith Gunathilake
8234ace3e2 Merge branch 'master' into 'master'
Add missing initiated by field in operation retrieval

See merge request entgra/carbon-device-mgt!814
2021-11-10 05:08:11 +00:00
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
Dharmakeerthi Lasantha
7cf68d7975 Merge branch 'master' into 'master'
Update APPM subscriptions when operation log updates

See merge request entgra/carbon-device-mgt!812
2021-10-25 10:06:17 +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
Charitha Goonetilleke
54ae5aad43 Update pom.xml to fix release plugin issue 2021-10-05 08:43:32 +00:00
Charitha Goonetilleke
9873d236ca Make nexus https 2021-10-04 16:08:25 +00:00
Inosh Perara
5374963480 Merge branch 'kernel-4.6.x' into 'master'
Merge kernel-4.6.x with master

See merge request entgra/carbon-device-mgt!808
2021-10-04 09:18:47 +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