community/device-mgt-core
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-core.git synced 2025-10-06 02:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
9,924 Commits 31 Branches 461 Tags 183 MiB
c8c18c4f3d
Commit Graph

7765 Commits

Author SHA1 Message Date
Pahansith Gunathilake
aa2234dcdd Merge branch 'fix-geofence' into 'master' 
Fix invalid DAO factory handling & invalid event revoke payload

See merge request entgra/carbon-device-mgt!865
 2022-03-07 07:14:08 +00:00
Pahansith Gunathilake
7a4cef26e4 Fix invalid DAO factory handling & invalid event revoke payload 2022-03-07 12:00:09 +05:30
osh
c135105889 fixes https://gitlab.com/entgra/carbon-device-mgt/-/merge_requests/848/commits 
Add re-enrollment device cost calculation
 2022-03-07 01:21:02 +05:30
osh
8872d1baeb Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt into billing-api-1226 2022-03-06 10:03:12 +05:30
builder
96e4aa8436 [maven-release-plugin] prepare for next development iteration 2022-03-05 04:37:48 +00:00
builder
739266feca [maven-release-plugin] prepare release v5.0.3 2022-03-05 04:37:42 +00:00
Pahansith Gunathilake
4ab20f3205 Merge branch 'dev' into 'master' 
Add query param to publish an app directly

See merge request entgra/carbon-device-mgt!847
 2022-03-05 04:31:25 +00:00
Pahansith Gunathilake
ac5e8547c0 Merge branch 'fix/grafana/translation' into 'master' 
Fix grafana translation not working properly

See merge request entgra/carbon-device-mgt!854
 2022-03-05 04:31:18 +00:00
Mohamed Rashd
b512ff0548 Fix grafana translation not working properly 2022-03-04 16:45:48 +05:30
Pahansith Gunathilake
27303cf12b Fix invalid DAO factory handling & invalid event revoke payload 2022-03-04 16:11:10 +05:30
Mohamed Rashd
6d7f082a6b Fix grafana translation not working properly 2022-03-03 12:05:16 +05:30
Pahansith Gunathilake
02e0129d25 Merge branch 'fix/grafana/api/context/path/constant' into 'master' 
Fix grafana api context path

See merge request entgra/carbon-device-mgt!844
 2022-03-03 05:33:16 +00:00
Pahansith Gunathilake
713757c3bd Merge branch 'fix/grafana/orgId/queryParam/constant' into 'master' 
Fix grafana orgId query param name Constant

See merge request entgra/carbon-device-mgt!846
 2022-03-03 05:32:59 +00:00
Pahansith Gunathilake
f0cd2d91a2 Merge branch 'feature/add-installed-version-to-subscription-details' into 'master' 
Add installed version for installation details view

See merge request entgra/carbon-device-mgt!842
 2022-03-03 05:30:29 +00:00
Pahansith Gunathilake
7ef698058a Merge branch 'fix-timestamp' into 'master' 
Fix invalid time showing in device list

See merge request entgra/carbon-device-mgt!861
 2022-03-03 04:49:46 +00:00
Pahansith Gunathilake
778bb3e987 Fix invalid time immediate after device enrollment 2022-03-03 01:01:08 +05:30
Gimhan-minion
1186c9e292 Add query param to publish an enterprise release directly 2022-03-02 20:49:02 +05:30
Gimhan-minion
8bdffc90c6 Add query param to publish an app directly 2022-03-02 20:49:02 +05:30
Mohamed Rashd
986828bc16 Fix application count query not containing AP_APP_RELEASE columns when filtering 
Fix inaccurate application count when an appliction has more than 1 release
 2022-03-02 19:22:47 +05:30
navodzoysa
b402d14910 Remove production scope when token is refreshed 2022-03-02 15:52:29 +05:30
osh
f611c45d3b Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt into billing-api-1226 2022-03-02 15:44:55 +05:30
osh
7b1b8ecffd Add last billed date 2022-03-02 15:44:41 +05:30
Pahansith Gunathilake
87808ec9df Merge branch 'certificate-removal-issue-fix' into 'master' 
Fix remove certificate API

See merge request entgra/carbon-device-mgt!855
 2022-03-02 06:14:03 +00:00
Pahansith Gunathilake
cb2e5e9c66 Fix test failure 2022-03-02 09:15:36 +05:30
Pahansith Gunathilake
35e0b9189e Add separate DAO factory for event management 2022-03-02 00:54:33 +00:00
Mohamed Rashd
097423b2b0 Improve api 2022-03-01 19:33:07 +05:30
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
Chamindu Senanayake
5b5257301a Fix remove certificate API 2022-03-01 10:27:59 +05:30
osh
3658e8fad2 Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt into billing-api-1226 2022-02-27 08:50:22 +05:30
Mohamed Rashd
fb2ab0963d Remove unwanted new lines 2022-02-26 22:34:26 +05:30
Mohamed Rashd
9cdc438970 Change to base64 string for file uploads instead of using multipart form data 
Make release optional when creating new application
Fix screenshots not getting saved if duplicate screenshot file name found
Delete artifacts if errors while adding release to db
Improve service provider application related apis
Refactor code
 2022-02-26 22:25:57 +05:30
charitha
507a21a047 Fix incorrect response handling logic 2022-02-23 11:03:58 +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
Mohamed Rashd
5e247c6e6b Add identity server service provider app integration 2022-02-21 13:47:48 +05:30
osh
ed256ad346 fixes https://gitlab.com/entgra/product-iots/-/issues/1226 
resole cofilict
 2022-02-17 14:06:43 +05:30
osh
d01aa2026d fixes https://gitlab.com/entgra/product-iots/-/issues/1226 
Adding the new billing API
 2022-02-17 13:58:15 +05:30
Mohamed Rashd
2c518aa2ac Fix grafana orgId query param name Constant 2022-02-07 13:21:47 +05:30
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
Mohamed Rashd
65ae8dd774 Fix grafana api context path 2022-01-31 23:48:24 +05:30
Chandima
c89db6787d Add installed version for installation details view 2022-01-26 16:53:49 +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
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
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
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
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
Pahansith Gunathilake
a136fa4901 Merge branch 'master' into 'master' 
Fix session expire issue during sso authorization

See merge request entgra/carbon-device-mgt!766
 2021-06-01 09:50:57 +00:00
Kaveesha
e111c1dda8 Update DM_DEVICE_INFO table 2021-06-01 10:49:45 +05:30
Pahansith Gunathilake
bc680df8e5 Merge branch 'revert-70ac1926' into 'master' 
Revert Merge request : https://gitlab.com/entgra/carbon-device-mgt/-/merge_requests/769/

See merge request entgra/carbon-device-mgt!773
 2021-06-01 02:58:09 +00:00
charitha
3a17cb2329 Consider not now operations as pending 2021-05-24 21:41:09 +05:30
Amalka Subasinghe
83b31f0d02 updated from master and fixed conf copying issue 2021-05-24 16:40:05 +05:30
Dharmakeerthi Lasantha
75dc57165c Merge branch 'issue-works-868-NN' into 'master' 
[App New Release] - Add a query get the applications sort according to latest timestamp order

Closes product-iots#868

See merge request entgra/carbon-device-mgt!761
 2021-05-22 03:59:37 +00:00
Pahansith Gunathilake
22dc7aaf25 Revert "Merge branch 'invoker' into 'master'" 
This reverts merge request !769
 2021-05-21 13:22:25 +00:00
Amalka Subasinghe
af2f8155e5 added webapp authenticator component 2021-05-21 12:32:02 +05:30
charithag
e5fb17aceb Add geo view API 2021-05-19 17:12:50 +05:30
Amalka Subasinghe
0162753d6a Fixed SSO 2021-05-19 11:16:22 +05:30
Farheen99
5ac273f362 Add code changes to read a new xml element named scope from android.xml file 2021-05-16 20:31:50 +05:30
Amalka Subasinghe
a12be72a13 updated to kernel 4.6.2 2021-05-14 10:34:41 +05:30
Inosh Perara
70ac192696 Merge branch 'invoker' into 'master' 
Update invoker handler to append tenant-id for reporting backend get api calls

See merge request entgra/carbon-device-mgt!769
 2021-05-13 05:52:57 +00:00
vigneshan
6cfdf85c1d Update invoker handler to append tenant-id for reporting backend get api calls 2021-05-12 21:53:43 +05:30
Kaveesha
6c947962d6 Update item bean class to get documentation link from xml 2021-05-12 15:00:56 +05:30
Amalka Subasinghe
0d8750f0a7 cleaned up components/webapp-authenticator-framework 2021-05-10 13:07:47 +05:30
Amalka Subasinghe
73df5e2fed cleaned up components/ui-request-interceptor 2021-05-10 13:06:30 +05:30
Amalka Subasinghe
95695e850d cleaned up components/transport-mgt 2021-05-10 12:48:50 +05:30
Amalka Subasinghe
bf074061f1 cleaned up components/identity-extensions 2021-05-10 12:36:01 +05:30
Amalka Subasinghe
8590268db4 cleaned up components/heartbeat-management/ 2021-05-10 12:33:04 +05:30
Amalka Subasinghe
056987141b cleaned up components/device-mgt 2021-05-10 12:30:38 +05:30
Amalka Subasinghe
584dbd7894 cleaned up components/certificate-mgt 2021-05-10 11:02:18 +05:30
Amalka Subasinghe
7108b15549 cleaned up components/application-mgt 2021-05-10 10:56:16 +05:30
Amalka Subasinghe
3ea79ecf77 cleaned up components/apimgt-extensions 2021-05-10 10:51:19 +05:30
Amalka Subasinghe
c33e13b04c updating to kernel 4.6.1 2021-05-10 09:41:45 +05:30
charithag
515d6b5797 Allow dynamic control of operations 2021-05-07 17:49:54 +05:30
charithag
2d6f3298bf Add NOTNOW status to activity result 2021-05-07 14:16:27 +05:30
vigneshan
c2369cde71 Fix session expire issue during sso authorization 2021-05-06 23:18:05 +05:30
MalshaPiumini
6f325862ec Formatting the SQL query. 2021-05-06 14:12:03 +05:30
MalshaPiumini
60b59f455d Solved test case failure. 2021-05-05 14:37:45 +05:30
MalshaPiumini
b2691996ab Added device filter using serial number. 2021-05-05 14:37:45 +05:30
Inosh Perara
a0ed490b0b Merge branch 'Dummy' into 'master' 
Device filters in store portal

Closes product-iots#866

See merge request entgra/carbon-device-mgt!746
 2021-05-04 04:26:41 +00:00
Inosh Perara
eb69e06fd6 Merge branch 'scope-handler' into 'master' 
Improve the permission loading mechanism

See merge request entgra/carbon-device-mgt!765
 2021-05-04 04:25:44 +00:00
Pahansith
429e76cfdc Add session scope handler 2021-05-04 08:39:20 +05:30
Pahansith
0060083499 Add DAO fix for app schedule subscription 2021-05-03 11:24:07 +05:30
Pahansith
4dee16dffb Fix schedule install DAO issue 2021-04-28 18:54:31 +05:30
Farheen99
86720b1a45 Add a query to get the applications sort according to latest timestamp order 2021-04-24 12:06:04 +05:30
Inosh Perara
a36d5b39f1 Merge branch 'app-subscription-fix-2' into 'master' 
Fix schedule app installation not working issue

See merge request entgra/carbon-device-mgt!758
 2021-04-23 15:58:43 +00:00
Pahansith
365b073e6a Fix app schedule installation issue in single node 2021-04-22 21:32:48 +05:30
vigneshan
10166069d3 Fix token refresh issue 2021-04-19 15:42:15 +05:30
Charitha Goonetilleke
99e5f9f876 Fix executing policy monitoring continuously 2021-04-10 16:18:06 +00:00
vigneshan
872299a617 Add login cache for sso and non-sso flow 2021-04-01 11:30:35 +05:30
Dharmakeerthi Lasantha
853ee700b8 Merge branch 'issue-db-query-changes' into 'master' 
Handle execution of queries contain IN clause with empty array

Closes product-iots#885

See merge request entgra/carbon-device-mgt!748
 2021-03-29 07:49:48 +00:00
Farheen Boosary
0f39b2f253 Handle execution of queries contain IN clause with empty array 2021-03-29 07:49:47 +00:00
Inosh Perara
c889897b9c Merge branch 'master' into 'master' 
Add enterprise API tag to allowed tags in DCR

See merge request entgra/carbon-device-mgt!750
 2021-03-29 04:44:54 +00:00
inoshperera
4116b7776b Add enterprise API tag to allowed tags 2021-03-27 16:21:06 +05:30
Pahansith
19206b13c4 Fix error in unmanaged app uninstall 2021-03-26 13:34:54 +05:30
inoshperera
25c2320956 Fix wrong zip codes from agents persisting 2021-03-24 19:08:39 +05:30
MalshaPiumini
dca6b53a67 Added new filter in subscription details page 2021-03-23 14:50:36 +05:30
MalshaPiumini
645fc43136 Added validations 2021-03-18 17:20:30 +05:30
MalshaPiumini
605168e770 Code modified 2021-03-17 18:37:14 +05:30
MalshaPiumini
c2940a4568 Device search in store subscription details page 2021-03-17 15:25:02 +05:30
MalshaPiumini
74c4f1004a Device search in store uninstall modal 2021-03-16 16:08:21 +05:30
inoshperera
24fad779de Add token expiry time to QR payload 2021-03-16 08:26:05 +05:30
Entgra Builder
feacd5029d [maven-release-plugin] prepare for next development iteration 2021-03-03 13:54:32 +00:00
Entgra Builder
09907233fc [maven-release-plugin] prepare release v4.1.15 2021-03-03 13:54:27 +00:00
tcdlpds@gmail.com
9f76c003a6 Fix app subscription adding issue for removed devices 2021-03-03 09:58:04 +05:30
tcdlpds@gmail.com
3bc6ca31b3 Improve application artifact downloading functionality 2021-03-02 14:13:15 +05:30
Dharmakeerthi Lasantha
8c50af1631 Merge branch 'master' into 'master' 
Fix FCM and configuration fetching issues

See merge request entgra/carbon-device-mgt!742
 2021-03-02 01:05:53 +00:00
inoshperera
28e0c88222 Fix FCM and configuration fetching issues 2021-02-27 10:02:19 +05:30
charitha
0435138fc9 Fix issue with updating status due to cache inconsistency 2021-02-26 14:57:16 +05:30
Entgra Builder
ddab435548 [maven-release-plugin] prepare for next development iteration 2021-02-23 16:02:44 +00:00
Entgra Builder
5b2c085a3e [maven-release-plugin] prepare release v4.1.14 2021-02-23 16:02:39 +00:00
Dharmakeerthi Lasantha
d4aaf3ce4b Merge branch 'sync_fix' into 'master' 
Fix issue in enrollment object modification

See merge request entgra/carbon-device-mgt!741
 2021-02-23 15:16:04 +00:00
inoshperera
bfd1f794de Fix issue in enrollment object modification 2021-02-23 19:34:21 +05:30
Entgra Builder
ca7ded79cb [maven-release-plugin] prepare for next development iteration 2021-02-23 02:24:25 +00:00
Entgra Builder
368bb74436 [maven-release-plugin] prepare release v4.1.13 2021-02-23 02:24:20 +00:00
Inosh Perara
ecca2b3f19 Merge branch 'sync_fix' into 'master' 
Make FCM message priority high

See merge request entgra/carbon-device-mgt!740
 2021-02-22 15:10:31 +00:00
inoshperera
f07df95f52 Make FCM message priority high 2021-02-22 19:30:25 +05:30
tcdlpds@gmail.com
2ccd137ec0 Upgrade product version in device-mgt UI 2021-02-22 18:53:42 +05:30
Dharmakeerthi Lasantha
cb3b07f35e Merge branch 'policy-ui' into 'master' 
Remove unnecessary variable from card bean

See merge request entgra/carbon-device-mgt!736
 2021-02-22 09:35:17 +00:00
Dharmakeerthi Lasantha
28f7bc78c0 Merge branch 'geofence-group-issue' into 'master' 
Fix geofence update issue

See merge request entgra/carbon-device-mgt!737
 2021-02-22 06:48:34 +00:00
Inosh Perara
77ce60dc2a Merge branch 'sync_fix' into 'master' 
Increase FCM TTL

See merge request entgra/carbon-device-mgt!738
 2021-02-22 06:36:10 +00:00
inoshperera
daac0b2891 Increase FCM TTL 2021-02-22 12:03:30 +05:30
Pahansith
e1afa53560 Fix geofence update issue 2021-02-22 11:21:24 +05:30
shamalka
9e3d126c08 Remove unnecessary variable from card bean 2021-02-22 10:53:50 +05:30
Entgra Builder
7463aa6e5a [maven-release-plugin] prepare for next development iteration 2021-02-22 02:16:58 +00:00
Entgra Builder
531672de8e [maven-release-plugin] prepare release v4.1.12 2021-02-22 02:16:53 +00:00
Shamalka Navod
ee5676d815 Improve policy UI bean classes 2021-02-22 01:43:35 +00:00
charithag
31dc6fc839 Fix NPE 2021-02-19 01:21:20 +05:30
Dharmakeerthi Lasantha
7e088ea747 Merge branch 'sync_fix' into 'master' 
Fix cache not updating

See merge request entgra/carbon-device-mgt!734
 2021-02-18 03:35:20 +00:00
inoshperera
4f88c2354c Fix cache not updating 2021-02-18 08:48:29 +05:30
Dharmakeerthi Lasantha
6f4e8a3688 Merge branch 'sync_fix' into 'master' 
Fix for sycning status update in Android

See merge request entgra/carbon-device-mgt!733
 2021-02-17 11:00:37 +00:00
inoshperera
8effa09a8f Fix for sycning status update in Android 2021-02-17 15:51:33 +05:30
Saad Sahibjan
617f8acba5 Merge branch 'master' into 'master' 
Fix sms handler test break

See merge request entgra/carbon-device-mgt!732
 2021-02-17 06:10:29 +00:00
Saad Sahibjan
143816c1e6 Fix sms handler test break 2021-02-17 11:20:02 +05:30
Charitha Goonetilleke
303ce1717e Merge branch 'master' into 'master' 
SMS Mangement Feature

See merge request entgra/carbon-device-mgt!731
 2021-02-17 04:16:30 +00:00
Saad Sahibjan
789ee553e6 Move email-sender component to tranport-mgt 2021-02-16 19:12:57 +05:30
Saad Sahibjan
0ad203e720 Add transport_management tag 2021-02-16 19:00:00 +05:30
Saad Sahibjan
2aa751de23 Change the structure from sms-mgt to sms-handler to have within transport-mgt 2021-02-16 18:58:00 +05:30
Saad Sahibjan
b3919ae4e9 Add sms_management tag to allowed tag list for application register 2021-02-15 22:12:34 +05:30
Saad Sahibjan
1f25e7af91 Implement SMS configuration API to update changes of the sms-config file 2021-02-15 22:11:05 +05:30
Saad Sahibjan
cb2221693e Add sample SMS Sender implementation 2021-02-15 22:09:30 +05:30
Saad Sahibjan
bbfb0584d0 Implement SMS sender factory to retrieve instance of SMS sender 2021-02-15 22:09:10 +05:30
Saad Sahibjan
8b98b7e9de Initialize sms-config.xml file during service activation 2021-02-15 22:08:41 +05:30
Saad Sahibjan
d4f5188f3d Implement SMS configuration file loading and initialization 2021-02-15 22:07:39 +05:30
Saad Sahibjan
97bb7ee87c Add SMS management common classes 2021-02-15 22:06:32 +05:30
tcdlpds@gmail.com
4ea3890a2e Upgrade server version in UI text info 2021-02-15 21:25:24 +05:30
shamalka
1faee050af Remove commented code lines 2021-02-12 22:58:36 +05:30
shamalka
72edb6c323 Accept multiple device status in store API 2021-02-12 22:56:31 +05:30
Entgra Builder
62919fa787 [maven-release-plugin] prepare for next development iteration 2021-02-11 08:09:07 +00:00
Entgra Builder
b98d787367 [maven-release-plugin] prepare release v4.1.11 2021-02-11 08:09:02 +00:00
Dharmakeerthi Lasantha
ce80f4efe0 Merge branch 'event-modify-branch-1' into 'master' 
Code format of event task operation

See merge request entgra/carbon-device-mgt!728
 2021-02-11 06:32:05 +00:00
Pahansith
4cc670a614 Format code 2021-02-11 10:54:57 +05:30
Inosh Perara
bcff3f46ad Merge branch 'master' into 'master' 
Add bundle Id getting method for iOS public apps

See merge request entgra/carbon-device-mgt!727
 2021-02-10 16:47:47 +00:00
tcdlpds@gmail.com
1c47ff56ab Add bundle Id getting method for iOS public apps 2021-02-10 22:00:42 +05:30
Charitha Goonetilleke
1e2afa6439 Merge branch 'event-modify-branch-1' into 'master' 
Modify event creation task

See merge request entgra/carbon-device-mgt!725
 2021-02-10 09:38:26 +00:00
Pahansith
9ef6cfc1e6 Move executor pool to the DeviceManagementDataHolder 2021-02-10 14:48:20 +05:30
tcdlpds@gmail.com
572e93a357 Fix server startup issues 2021-02-10 09:24:38 +05:30
Pahansith
2fa4a6167e Fix test failures 2021-02-10 01:37:00 +05:30
Pahansith
0cbcd747d5 Modify event operation creation 2021-02-10 01:12:13 +05:30
tcdlpds@gmail.com
175205b959 Fix build failure 2021-02-09 10:45:57 +05:30
tcdlpds@gmail.com
7b41e2cd0d Fix EULA loading issue for tenants 
Fix registry loading issue when SSO has enabled. Because of that issue device type EULA displaying page is broken
 2021-02-06 19:38:46 +05:30
tcdlpds@gmail.com
571d8afa11 Fix app updating issues when the payload contains same app name 2021-01-29 19:35:50 +05:30
tcdlpds@gmail.com
104bca0fb5 Add FULLY_MANAGED and DEDICATED_DEVICE ownership types 2021-01-29 19:34:58 +05:30
tcdlpds@gmail.com
51fface401 Append tenant domain when getting default access token 2021-01-27 15:05:38 +05:30
Dharmakeerthi Lasantha
6250921c6f Merge branch 'master' into 'master' 
Improve interceptor source

See merge request entgra/carbon-device-mgt!721
 2021-01-25 09:41:25 +00:00
tcdlpds@gmail.com
d485faad91 Improve interceptor source 2021-01-25 15:10:31 +05:30
Dharmakeerthi Lasantha
0d397b5108 Merge branch 'master' into 'master' 
Improve default-token servlet response

See merge request entgra/carbon-device-mgt!720
 2021-01-25 07:47:25 +00:00
tcdlpds@gmail.com
89613a3b3d Improve default-token servlet response 2021-01-25 13:05:20 +05:30
Pahansith
a7e6b64f70 Fix review issues and format code 2021-01-20 18:05:23 +05:30
tcdlpds@gmail.com
7333329e78 Add access token retrieving service 2021-01-19 11:25:42 +05:30
charitha
ad4d7a453f Fix NPE occur when updating device with null status 2021-01-18 22:16:52 +05:30
tcdlpds@gmail.com
b4d7497022 Modify DeviceTypeCommonService 2021-01-16 20:57:59 +05:30
inoshperera
b481150ee9 Fix iOS app download path 2021-01-16 08:53:12 +05:30
vigneshan
52407ba312 Improve sso ui-request-interceptor to update application as SaaS app 2021-01-13 10:28:07 +05:30
charitha
864bbcdc83 Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt 2021-01-11 09:15:04 +05:30
charitha
2bdaf4186b Add Activity ID for repeated operation 2021-01-11 09:13:54 +05:30
Malsha Piumini
89298f933e Uninstall applications via Apps Tab - (For Android devices only) 2021-01-06 19:07:09 +00:00
vigneshan
256d6c334f Fix SLO issue 2021-01-04 12:13:54 +05:30
charitha
9a2792dd31 Fix issue in not updating operation response for non-removed devices 2020-12-21 13:25:32 +05:30
Pahansith
baeb34e1da Fix review issues and format code 2020-12-18 20:37:04 +05:30
Pahansith
a36733d224 Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt into upstream-master 2020-12-16 23:00:04 +05:30
Dharmakeerthi Lasantha
27a6c45f57 Merge branch 'config-param-modify' into 'master' 
Add windows agent token generation parameters to config API

See merge request entgra/carbon-device-mgt!711
 2020-12-16 17:06:48 +00:00
Pahansith
931fb8ef54 Add windows agent token generation parameters to config API 2020-12-16 21:16:38 +05:30
Vigneshan
929a94dc73 Add jwt bearer grant type for sso service providers 2020-12-16 11:55:37 +05:30
Pahansith
987f8edd61 Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt into upstream-master 2020-12-16 00:02:37 +05:30
tcdlpds@gmail.com
52761c673d Remove APPM store and publisher UIs from device-mgt core 2020-12-12 09:20:31 +05:30
charitha
4943635a61 Fetch enrollment Id if it is not already in the device 2020-12-12 03:01:56 +05:30
charitha
55c3f93deb Update license to entgra 2020-12-11 20:47:45 +05:30
charitha
a9cb2ae84d Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt 
 Conflicts:
	components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/ActivityProviderServiceImpl.java
	components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/operation/mgt/OperationManager.java
	components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/operation/mgt/OperationManagerImpl.java
	components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/operation/mgt/dao/impl/GenericOperationDAOImpl.java
	components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderService.java
 2020-12-11 17:26:53 +05:30
Pahansith
bc85a89cf9 Change event task to implement ntask interface 2020-12-11 04:16:23 +05:30
tcdlpds@gmail.com
087b826d29 Improve information logging 2020-12-09 16:57:15 +05:30
Shamalka Navod
eccb39d6f4 Improve metadata API 2020-12-07 20:15:18 +00:00