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
10,206 Commits 31 Branches 461 Tags 183 MiB
fabd3ebae8
Commit Graph

5531 Commits

Author SHA1 Message Date
Mohamed Rashd
7df4aff569 Fix retrieving favicon as logo when retrieving existing images for rollback 2022-06-07 13:32:42 +05:30
Mohamed Rashd
743a12083b Refactor whitelabel update api method name to update from create 2022-06-07 09:34:16 +05:30
Rushdi
ab332e20ed Fix platform configuration for traccar 2022-06-03 16:11:18 +05:30
Rushdi
9f642701ea fix merge conflicts 2022-05-30 17:33:07 +05:30
Rushdi
f4d0050270 fix removing permission and organizing the code 2022-05-30 15:58:09 +05:30
Rushdi
83651efcb5 Remove unwanted codes 2022-05-30 15:52:21 +05:30
Rushdi
35a5230ef7 Fix admin login to tracker 2022-05-30 15:52:10 +05:30
Rushdi
a521985e98 Update tracker get token api 2022-05-30 15:52:09 +05:30
Rushdi
6b3294bd60 Update tracker get token api 2022-05-30 15:49:32 +05:30
Rushdi
11fa624b39 Add tracker API endpoint to return user token 2022-05-30 15:48:40 +05:30
Rushdi
6ccddf3f4b Update remove permission 2022-05-30 15:48:40 +05:30
Rushdi
6ce4168d75 Update permissions 2022-05-30 15:48:30 +05:30
Rushdi
515e826711 Update with callable thread and add set/remove user permission on enroll/disenroll device 2022-05-30 15:48:29 +05:30
Rushdi
74adeda997 Assign device to user when enrolling a device 2022-05-30 15:45:45 +05:30
Rushdi
2ebc24985a Create user when enrolling device 2022-05-30 15:45:45 +05:30
Rushdi
bd164ea78f fix NullPointerException 2022-05-30 15:45:44 +05:30
Rushdi
5c14315b4a Add JSONException 2022-05-30 15:45:23 +05:30
Rushdi
44ac5c8a8f Fixed the bugs 2022-05-30 15:45:13 +05:30
Rushdi
d1f2bdb296 update the threadpool apporoach/ add traccar devices/groups for existing UEM devices/groups 2022-05-30 15:44:09 +05:30
Rushdi
c3dd560878 Update group add/update/delete and device enroll/disenroll with traccar 2022-05-30 15:43:58 +05:30
Rushdi
9f6eaedbc3 check if location publishing to traccar enable or disabled 2022-05-30 15:39:15 +05:30
Rushdi
53f4fd7ebc Add add/delete a group from traccar 2022-05-30 15:39:03 +05:30
Rushdi
1dd2e35f89 Update traccar cofiguration 2022-05-30 15:38:48 +05:30
Rushdi
2e5a9002da Update traccar configuration 2022-05-30 15:37:24 +05:30
Rushdi
c18b3b1c1f Update the code structure 2022-05-30 15:36:59 +05:30
Rushdi
4e3567202d Update with okhttclient pool and threading 2022-05-30 15:36:59 +05:30
Rushdi
8d99123ec1 Update with Traccar Dis-Enrolling a Device via UEM 2022-05-30 15:36:58 +05:30
Rushdi
c4d75234b0 Initiate traccar to locate the geo locations in the map 2022-05-30 15:36:58 +05:30
Mohamed Rashd
b8a0ffe7c0 Improve favicon/logo response content type handling 2022-05-26 04:16:57 +05:30
Mohamed Rashd
460675fcad Fix favicon/logo response content type 2022-05-26 03:35:57 +05:30
Mohamed Rashd
5677e1e3fe Better feedback message/log if favicon/logo white label images not found 2022-05-24 21:13:26 +05:30
Mohamed Rashd
ed9ec69509 Move metadata and whitelabel config classes to metadata.mgt package 2022-05-24 21:10:49 +05:30
Mohamed Rashd
1559af9660 Adress feedback 
Add missing licenses
 2022-05-24 20:59:21 +05:30
Mohamed Rashd
1d84adbb4f Add java doc comment 
Fix adding default white label on tenant create
Add whitelabel logo and favicon apis as non secured endpoints
Fix License
 2022-05-21 10:44:06 +05:30
Mohamed Rashd
7907a1c5ff Add tenant whitelabeling api 
Make whitelabel favion and logo api public
Refactor whitelabeling feature in separate classes
 2022-05-21 10:41:56 +05:30
builder
8636767cba [maven-release-plugin] prepare for next development iteration 2022-05-10 01:41:05 +05:30
builder
9af9bea2b6 [maven-release-plugin] prepare release v5.0.7 2022-05-10 01:41:01 +05:30
Pahansith Gunathilake
a7a567c971 Fix parse pom 2022-05-09 19:59:31 +00:00
Pahansith Gunathilake
4d76be36de Merge branch 'user-store' into 'master' 
Add new API to fetch userstores

See merge request entgra/carbon-device-mgt!884
 2022-05-08 19:04:45 +00:00
navodzoysa
b62b4aebc3 Add new API to fetch userstores 2022-05-08 22:09:08 +05:30
Pahansith Gunathilake
47fb2c77f5 Merge branch 'billing-api-1226' into 'master' 
Adding the new billing API

See merge request entgra/carbon-device-mgt!848
 2022-05-02 06:04:00 +00:00
builder
817dc57862 [maven-release-plugin] prepare for next development iteration 2022-04-26 06:12:00 +00:00
builder
7196d2daea [maven-release-plugin] prepare release v5.0.6 2022-04-26 06:11:55 +00:00
Mohamed Rashd
ab053807b3 Fix application managment test 2022-04-26 11:10:42 +05:30
Pahansith Gunathilake
da509f5c69 Merge branch 'policy-load' into 'master' 
Add new API to fetch UI policy list

See merge request entgra/carbon-device-mgt!881
 2022-04-25 08:04:13 +00:00
navodzoysa
340be6ed65 Add new API to fetch UI policy list 2022-04-18 22:46:06 +05:30
Mohamed Rashd
aa2fa45a5f Tempory merge conflict resolution 2022-04-16 00:28:05 +05:30
Mohamed Rashd
41a0c9118a Add java doc comments 
Use try-with resource when using CloseableHttpClient
Refactor few variable and method names
 2022-04-12 18:02:45 +05:30
osh
f86617a264 Add the sql files 
fixes https://gitlab.com/entgra/product-iots/-/issues/1226
 2022-04-07 09:42:35 +05:30
Mohamed Rashd
daaeed52e2 Add and Change licence from WSO2 to Entgra 2022-04-06 11:08:33 +05:30
osh
7ba8311c93 fix conflict 
fixes https://gitlab.com/entgra/product-iots/-/issues/1226
 2022-04-05 23:04:41 +05:30
osh
5ad9e3e6b4 Add billing data export api 
fixes https://gitlab.com/entgra/product-iots/-/issues/1226
 2022-04-05 22:59:23 +05:30
builder
946a12b84d [maven-release-plugin] prepare for next development iteration 2022-03-22 12:54:48 +00:00
builder
f55ffbb19a [maven-release-plugin] prepare release v5.0.5 2022-03-22 12:54:43 +00:00
Mohamed Rashd
38f9b60970 Fix sql query that gets subscribed devices 2022-03-21 18:21:40 +05:30
builder
39216aa651 [maven-release-plugin] prepare for next development iteration 2022-03-18 03:48:22 +00:00
builder
8deff13edd [maven-release-plugin] prepare release v5.0.4 2022-03-18 03:48:17 +00:00
Mohamed Rashd
59b2aa42b4 Fix duplicate devices in subscription log 2022-03-14 17:41:01 +05:30
osh
a4b2a325b1 Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt into billing-api-1226 2022-03-11 01:38:59 +05:30
osh
053a57c4f5 Add getting billing cost by domain change 
fixes https://gitlab.com/entgra/product-iots/-/issues/1226
 2022-03-11 01:38:48 +05:30
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
27303cf12b Fix invalid DAO factory handling & invalid event revoke payload 2022-03-04 16:11:10 +05:30
Pahansith Gunathilake
778bb3e987 Fix invalid time immediate after device enrollment 2022-03-03 01:01:08 +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
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
Pahansith Gunathilake
12c48540d8 Fix device enrollment failure 2022-03-01 10:46:36 +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
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
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
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
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
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
b61c97d603 Make timestamps independent from host machine timezone 2021-12-04 17:08:08 +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
Amalka Subasinghe
fbc255b7a8 removed unwanted todos 2021-11-30 11:58:42 +05:30
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
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
lasantha
4c921d54b1 Update APPM subscriptions when operation log updates 2021-10-25 14:55:33 +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
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
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
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
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
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
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
Kaveesha
e111c1dda8 Update DM_DEVICE_INFO table 2021-06-01 10:49:45 +05:30
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
charithag
e5fb17aceb Add geo view API 2021-05-19 17:12:50 +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
Kaveesha
6c947962d6 Update item bean class to get documentation link from xml 2021-05-12 15:00:56 +05:30
Amalka Subasinghe
056987141b cleaned up components/device-mgt 2021-05-10 12:30:38 +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
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
Pahansith
365b073e6a Fix app schedule installation issue in single node 2021-04-22 21:32:48 +05:30
Charitha Goonetilleke
99e5f9f876 Fix executing policy monitoring continuously 2021-04-10 16:18:06 +00:00
Farheen Boosary
0f39b2f253 Handle execution of queries contain IN clause with empty array 2021-03-29 07:49:47 +00:00
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
605168e770 Code modified 2021-03-17 18:37:14 +05:30
MalshaPiumini
74c4f1004a Device search in store uninstall modal 2021-03-16 16:08:21 +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
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
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
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
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
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
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
Pahansith
a7e6b64f70 Fix review issues and format code 2021-01-20 18:05:23 +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
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
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
Pahansith
931fb8ef54 Add windows agent token generation parameters to config API 2020-12-16 21:16:38 +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
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
Inosh Perara
5297dfa73d Merge branch 'lasantha' into 'master' 
Adding heart beat management functionality for dynamic task distribution

See merge request entgra/carbon-device-mgt!695
 2020-12-07 09:24:20 +00:00
Ace
ceab2566ac Addressing review comments 2020-12-07 13:27:57 +05:30
Ace
5531bc0140 Addressing review comments 2020-12-07 13:19:46 +05:30
Ace
4df57ede61 incoorporating review comments 2020-12-07 13:09:14 +05:30
Dharmakeerthi Lasantha
d9386901d4 Merge branch 'corrective-policy' into 'master' 
Implement OIDC Based SSO For All React Applications

Closes product-iots#656

See merge request entgra/carbon-device-mgt!680
 2020-12-04 05:30:10 +00:00
Vigneshan
0917d3bf7f Improve consent management page to process oidc requests 2020-12-04 10:06:28 +05:30
Ace
bac6e3ba67 merging with upstream 2020-12-04 07:45:10 +05:30
Ace
c6db9eeecc adding randomly assigned task functionality and other improvements 2020-12-03 21:09:50 +05:30
Pahansith Gunathilake
caba7fc673 Add missing error logs to OperationManagerImpl 2020-11-30 15:51:52 +00:00
Pahansith
e5dd609dc2 Add method comments and format code 2020-11-30 15:41:51 +05:30
charitha
911bd62a44 Fix not adhering 'initiated by' 2020-11-29 10:47:06 +05:30
charitha
31a6497950 Fix enrollment modification issues 2020-11-29 10:47:06 +05:30
charitha
d75f48166e Provide response based on headers 2020-11-29 10:47:06 +05:30
charitha
10d114ba1e Improve activity retrieval logic 2020-11-29 10:47:05 +05:30
Ace
9d39197844 Adding improvements to dynamic task allocation 2020-11-26 19:16:49 +05:30
Pahansith
a3629d5932 Add group data into geofence response, Format code 2020-11-21 12:24:55 +05:30
Pahansith
8c80185610 Add doc comments and format code 2020-11-21 12:22:53 +05:30
Pahansith
d9d0ba5d90 Add event delete API 2020-11-21 12:22:53 +05:30
Pahansith
fed779302a Fix issues in Event DAO and improvements for the operation task 2020-11-21 12:22:53 +05:30
Pahansith
f073ee9276 Add H2 DAO for event configuration 2020-11-21 12:22:53 +05:30
Pahansith
75b619d5f9 Add event configuration operation creation tasks 2020-11-21 12:22:53 +05:30
Pahansith
efe116d87e Modify geofence get API 2020-11-21 12:22:53 +05:30
Pahansith
af85ca47e0 Change Geo fence edit API - Attach Events 2020-11-21 12:22:53 +05:30
Pahansith
bd8cf5237d Change Geo fence create API - Attach Event creation 2020-11-21 12:22:53 +05:30
Ace
b1d95af5b0 remvoing restriction that prevents activity count to be returned when if-modified-since header is present 2020-11-20 23:37:48 +05:30
Ace
ada570f0a0 fixing NPE when processing operations 2020-11-20 16:11:43 +05:30
tcdlpds@gmail.com
fc0fa92826 Fix incorrect device operation count returning issue 2020-11-20 07:17:47 +05:30
Ace
7cd1baf1af Adding missing license headers 2020-11-20 05:52:38 +05:30
Ace
e7b97d78c7 Imrpoving task implementation 2020-11-20 05:48:54 +05:30
Kaveesha
f99bbe36de Improve Input class in policy ui Configuration 2020-11-19 17:28:39 +05:30
tcdlpds@gmail.com
229068da06 Fix activity details getting issue of a device 2020-11-19 01:38:01 +05:30
Farheen Boosary
8238f7dd22 Add Windows enterprise app installation support for publisher and store 2020-11-18 19:26:15 +00:00
Dharmakeerthi Lasantha
9229ce280d Use device updated timestamp to filter updated devices 2020-11-17 03:58:32 +00:00
Ace
37ef7b9047 Adding interface for dynamic task allocation 2020-11-17 09:02:45 +05:30
Dharmakeerthi Lasantha
2959cab240 Merge branch 'master' into 'master' 
Use device updated timestamp to filter updated devices

See merge request entgra/carbon-device-mgt!687
 2020-11-17 03:01:44 +00:00
Ace
7b28665135 Defining interfaces and other adjustments 2020-11-16 09:19:21 +05:30
Ace
f40f8d02e0 Adding operation partitioning functionality 2020-11-15 22:56:10 +05:30
tcdlpds@gmail.com
b9c2190762 Fix merge conflicts 2020-11-15 00:32:24 +05:30
Malsha Piumini
f347861000 Add functionality to filter Operation Logs 2020-11-14 17:25:36 +00:00
tcdlpds@gmail.com
d25779774b Improve MDM policy functionality 2020-11-12 01:28:23 +05:30
Dharmakeerthi Lasantha
94bdff30ed Merge branch 'geofence-api' into 'corrective-policy' 
Fix issue in Geo fence get by fence name

See merge request entgra/carbon-device-mgt!677
 2020-11-11 14:36:55 +00:00
charitha
9e3ec5e24e Use device updated timestamp to filter updated devices 2020-11-10 21:25:42 +05:30
charitha
5d34b0671e Add new Enrollment statuses for IoT devices 2020-11-10 08:08:48 +05:30
Kaveesha
a38e91499e Add API for get devices history snapshots 2020-11-05 15:36:59 +05:30
Pahansith
84608f2f58 Fix issue in Geo fence get by fence name 2020-11-05 09:49:39 +05:30
tcdlpds@gmail.com
c88ec6077b Fixes multiple device deleting issue 
Fixes entgra/product-iots#656
 2020-10-30 00:59:43 +05:30
tcdlpds@gmail.com
bd8fe8a69d Merge branch 'master' of gitlab.com:entgra/carbon-device-mgt into corrective-policy 2020-10-28 18:27:05 +05:30
Ace
d831ef3284 code improvements 2020-10-26 09:40:50 +05:30
Ace
ad299e676c removing un-necessary files 2020-10-23 17:21:23 +05:30
Ace
61c05143c4 Fixing activity retrieval with intiatedBy 2020-10-23 16:59:35 +05:30
Inosh Perara
f97d9307e7 Merge branch 'geofence-api' into 'corrective-policy' 
Add geo fence search and geo cache

See merge request entgra/carbon-device-mgt!670
 2020-10-19 07:52:23 +00:00
Ace
22eba43aa9 including missing files 2020-10-15 21:05:33 +05:30
Ace
2ae8c126e8 fixing issues with activity retrieval 2020-10-15 21:01:24 +05:30
Pahansith
bc7e39c883 Add geo fence search and geo cache 2020-10-15 10:05:37 +05:30
shamalka
90ed562647 Improve device location history API 2020-10-13 16:11:46 +05:30
tcdlpds@gmail.com
f85224f4ad Update device cache if the device status has updated and the device info has updated 2020-10-08 20:00:20 +05:30
tcdlpds@gmail.com
ce81eac413 Improve endpoint-mgt functionalities 2020-10-08 18:49:12 +05:30
charitha
8493879151 Fixes for device enrollment status change issues 2020-10-08 18:49:12 +05:30
charitha
fb3da8c94d Fixes for device enrollment status change issues 2020-10-08 17:14:00 +05:30
Kaveesha
79f1afe8e4 Improve Select class with APISelect class changes in policy mgt ui pack 2020-10-08 12:42:32 +05:30
tcdlpds@gmail.com
daa24a5922 Fix merge conflicts 2020-10-03 00:27:44 +05:30
tcdlpds@gmail.com
a0b882f755 Fix geo fence deleting issue 2020-10-02 06:33:58 +05:30