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
Mohamed Rashd
db1aab1f3a
Add identity service provider config
2022-04-06 01:01:22 +05:30
Mohamed Rashd
c58f837585
Complete Identity Server create/delete/update APIs
2022-04-06 00:55:18 +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
Gimhan-minion
aed8d6f277
Fix validation of appname when a webclip is created
2022-03-23 19:43:53 +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
Pahansith Gunathilake
15b5aaa340
Merge branch 'feature1277' into 'master'
...
Generate QR with access token for given user
See merge request entgra/carbon-device-mgt!867
2022-03-18 03:39:05 +00:00
Mohamed Rashd
c0e5edded2
Add sql scripts to favourites table
...
Fix error logging in DAO layer
2022-03-17 23:39:31 +05:30
Pahansith Gunathilake
788eea4e26
Merge branch 'fix-group-search' into 'master'
...
Fix syntax error in group search while uninstalling apps
See merge request entgra/carbon-device-mgt!869
2022-03-16 08:17:33 +00:00
Pahansith Gunathilake
236d356a26
Merge branch 'pr/temp/feature/subscription/status/change' into 'master'
...
API to change application subscription status
See merge request entgra/carbon-device-mgt!868
2022-03-16 06:30:07 +00:00
Mohamed Rashd
59b2aa42b4
Fix duplicate devices in subscription log
2022-03-14 17:41:01 +05:30
Muhammad Rashad
65f5efb638
Add APIs to get favourite apps
2022-03-14 06:09:01 +00:00
Pahansith Gunathilake
c1cb8905fc
Fix syntax error in group search while uninstalling apps
2022-03-12 01:06:30 +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
Mohamed Rashd
0dd9bb2937
Add operation status update wrapper api to store
2022-03-11 00:31:37 +05:30
inoshperera
51cd59f436
Generate QR with access token for given user
...
fixes https://gitlab.com/entgra/product-iots/-/issues/1277
2022-03-10 16:33:09 +05:30
Mohamed Rashd
3f60a0cdda
Fix sql query columns
...
Add createIdentityServer method to all DAOs
2022-03-08 08:27:00 +05:30
Mohamed Rashd
3dd0690552
Add identity server config
...
Add api to create identity server
Return List of identity servers withtout extra bean for response
2022-03-07 21:58:43 +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
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
