Commit Graph

9657 Commits

Author SHA1 Message Date
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
Dharmakeerthi Lasantha
fec4a84b76 Merge branch 'master' into 'master'
Add scope for create group with admin privilege

See merge request entgra/carbon-device-mgt!726
2021-02-10 13:43:29 +00:00
Kaveesha
cbc11181fa Add scope for create group with admin privilege 2021-02-10 18:54:10 +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
Inosh Perara
2cd142e3e7 Merge branch 'master' into 'master'
Fix EULA loading issue for tenants

Closes product-iots#671

See merge request entgra/carbon-device-mgt!724
2021-02-10 05:22:50 +00:00
tcdlpds@gmail.com
5cbe5a65cc Increase METADATA_VALUE field size 2021-02-10 10:46:45 +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
Dharmakeerthi Lasantha
a61bd6b1db Merge branch 'master' into 'master'
Add new ownership types and fix application updating issues

See merge request entgra/carbon-device-mgt!723
2021-01-29 14:36:32 +00:00
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
Dharmakeerthi Lasantha
a6cfc92283 Merge branch 'master' into 'master'
Append tenant domain when getting default access token

See merge request entgra/carbon-device-mgt!722
2021-01-27 09:36:56 +00:00
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
Inosh Perara
0fc8fc5b3d Merge branch 'fix-event-config' into 'master'
Fix EVENT_CONFIG operation adding to non android devices

See merge request entgra/carbon-device-mgt!719
2021-01-21 09:47:08 +00:00
Pahansith
a7e6b64f70 Fix review issues and format code 2021-01-20 18:05:23 +05:30
Inosh Perara
d0f68babc4 Merge branch 'master' into 'master'
Add access token retrieving service

See merge request entgra/carbon-device-mgt!718
2021-01-19 06:22:07 +00:00
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
Dharmakeerthi Lasantha
44b2621381 Merge branch 'master' into 'master'
Modify DeviceTypeCommonService

See merge request entgra/carbon-device-mgt!717
2021-01-18 10:39:57 +00:00
tcdlpds@gmail.com
b4d7497022 Modify DeviceTypeCommonService 2021-01-16 20:57:59 +05:30
Inosh Perara
8278f8c011 Merge branch 'master' into 'master'
Fix iOS app download path

See merge request entgra/carbon-device-mgt!716
2021-01-16 04:07:32 +00:00
inoshperera
b481150ee9 Fix iOS app download path 2021-01-16 08:53:12 +05:30
Dharmakeerthi Lasantha
03ccee4425 Merge branch 'master' into 'master'
Improve sso ui-request-interceptor to update application as SaaS app

See merge request entgra/carbon-device-mgt!715
2021-01-13 05:15:25 +00:00
vigneshan
52407ba312 Improve sso ui-request-interceptor to update application as SaaS app 2021-01-13 10:28:07 +05:30
Charitha Goonetilleke
8e6ab9d8cd Merge branch 'master' into 'master'
Add Activity ID for repeated operation

See merge request entgra/carbon-device-mgt!714
2021-01-11 04:03:12 +00:00
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
Dharmakeerthi Lasantha
d627bfc6c3 Merge branch 'uninstall' into 'master'
Uninstall applications via Apps Tab - (For Android devices only)

See merge request entgra/carbon-device-mgt!700
2021-01-06 19:07:10 +00:00
Malsha Piumini
89298f933e Uninstall applications via Apps Tab - (For Android devices only) 2021-01-06 19:07:09 +00:00
Dharmakeerthi Lasantha
bedb75847c Merge branch 'master' into 'master'
Fix SLO issue

See merge request entgra/carbon-device-mgt!713
2021-01-05 05:02:08 +00:00
vigneshan
256d6c334f Fix SLO issue 2021-01-04 12:13:54 +05:30
Charitha Goonetilleke
84f3787fc5 Merge branch 'master' into 'master'
Fix issue in not updating operation response for non-removed devices

See merge request entgra/carbon-device-mgt!712
2020-12-21 08:14:54 +00:00
charitha
9a2792dd31 Fix issue in not updating operation response for non-removed devices 2020-12-21 13:25:32 +05:30
Dharmakeerthi Lasantha
60bc2b7196 Merge branch 'upstream-master' into 'master'
Change event task to implement ntask interface

See merge request entgra/carbon-device-mgt!708
2020-12-18 15:24:16 +00:00
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
Pahansith
b4f88f0cfd Add missing h2 table 2020-12-16 18:51:25 +05:30
Dharmakeerthi Lasantha
8864b1355c Merge branch 'master' into 'master'
Add jwt bearer grant type for sso service providers

See merge request entgra/carbon-device-mgt!710
2020-12-16 07:27:39 +00:00
Vigneshan
929a94dc73 Add jwt bearer grant type for sso service providers 2020-12-16 11:55:37 +05:30