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
