Commit Graph

7361 Commits

Author SHA1 Message Date
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
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
44c7affb49 Improve publisher ui to support sso 2020-12-04 10:07:08 +05:30
Vigneshan
6ee1d31a0e Improve store ui to support sso 2020-12-04 10:06:54 +05:30
Vigneshan
0917d3bf7f Improve consent management page to process oidc requests 2020-12-04 10:06:28 +05:30
Vigneshan
f31befb342 Implement oidc based sso among all web apps 2020-12-04 10:06:00 +05:30
Ace
bac6e3ba67 merging with upstream 2020-12-04 07:45:10 +05:30
Ace
cfe206b32c correcting task random candidate election logic 2020-12-04 07:26:29 +05:30
Ace
7734dbd654 Fixing issue with candidate election 2020-12-04 04:43:00 +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
0e4a02635d Add method comments and format code 2020-11-30 16:15:23 +05:30
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
76f09a91a4 Refactor APPM source 2020-11-19 13:22:22 +05:30
Ace
3744a7cfc7 adding fixes to the flow 2020-11-19 11:57:59 +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
Ace
02fb5a09a8 Adding new feature for heart beat functionality 2020-11-17 15:54:13 +05:30
Ace
c1652b61f8 Fixing issues with DS initialization 2020-11-17 11:57:58 +05:30
Ace
5ca299530e refactoring and adding proper licenses 2020-11-17 10:44:23 +05:30
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
eadc1a1992 Adding operation partitioning functionality - missing files 2020-11-15 22:56:46 +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
6b228ee73e Fix monitoring re-applying issue when policy revoking 2020-11-14 09:39:34 +05:30
Farheen99
01e5e30173 Remove added setState method in componentDidMount 2020-11-12 10:01:58 +05:30
Farheen99
fdaf8bd7ef Update changes for lifecycle check method 2020-11-12 06:05:33 +05:30
Farheen99
0df8c8d91c Disable publish button for releases with a published app 2020-11-12 06:05:33 +05:30
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
Dharmakeerthi Lasantha
c4927c3508 Merge branch 'issue-work-287' into 'master'
Hide package name METADATA showing as "default.app.com" for web-clip apps

Closes product-iots#287

See merge request entgra/carbon-device-mgt!688
2020-11-11 04:42:07 +00:00
Inosh Perara
b372856af6 Merge branch 'master' into 'master'
Handle re-applying of failed policies via monitoring through a different operation code

Closes product-iots#265

See merge request entgra/carbon-device-mgt!682
2020-11-11 03:33:18 +00:00
Farheen99
bbf580d43a Hide package name METADATA for web clip apps only 2020-11-10 22:16:57 +05:30
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
Pahansith Gunathilake
2789a7122c Remove old geofence policy transformation 2020-11-10 02:24:20 +00:00
Shamalka Navod
c821808797 Fix store app loading issue 2020-11-09 19:29:15 +00:00
Saad Sahibjan
65266e0685 Handle re-applying of failed policies via monitoring through a different operation code 2020-11-09 19:48:24 +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
b344e9d93b Fix app subscription detail showing issue 2020-10-30 15:50:21 +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
Inosh Perara
ba3aa5c6ce Merge branch 'corrective-policy' into 'corrective-policy'
Add polygon type fence support

See merge request entgra/carbon-device-mgt!665
2020-10-16 05:24:51 +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
Pahansith
09b1711b9c Add polygon type fence support 2020-10-12 22:09:43 +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
Pahansith
83236eb3ac Fix geofence update issue 2020-10-01 19:48:00 +05:30
tcdlpds@gmail.com
7fad79643e Fix mail sending issue when policy violated 2020-10-01 14:23:53 +05:30
Inosh Perara
fcd4bc1a41 Merge branch 'corrective-policy' into 'corrective-policy'
Improve mail sending logic

See merge request entgra/carbon-device-mgt!656
2020-10-01 07:13:04 +00:00
Pahansith Gunathilake
bda0a46429 Merge branch 'corrective-policy' into 'corrective-policy'
Fix payload parsing issue

See merge request entgra/carbon-device-mgt!655
2020-10-01 07:12:16 +00:00
tcdlpds@gmail.com
f32e76346f Improve mail sending logic 2020-10-01 12:38:22 +05:30
Pahansith
635adbb04f Fix payload parsing issue 2020-10-01 12:36:30 +05:30
tcdlpds@gmail.com
4fdfc07e64 Fix SQL syntax error 2020-10-01 12:09:20 +05:30
tcdlpds@gmail.com
b3d1badd1f Improve API interface text 2020-10-01 00:41:22 +05:30
tcdlpds@gmail.com
6014592f2c Add mail sending feature when policy violating 2020-10-01 00:35:22 +05:30
tcdlpds@gmail.com
f9bcb808f9 Improve device location history getting and storing functionalities 2020-10-01 00:35:21 +05:30
Inosh Perara
f7843e5c35 Merge branch 'geofence-api' into 'corrective-policy'
Fix geofence creation validation

See merge request entgra/carbon-device-mgt!651
2020-09-30 18:33:40 +00:00
Inosh Perara
cc8fa5dfb5 Merge branch 'geofencing-feature' into 'corrective-policy'
Add geofence policy transform

See merge request entgra/carbon-device-mgt!644
2020-09-30 18:33:19 +00:00
Pahansith
618b8962b3 Add doc comments 2020-09-30 22:08:31 +05:30
Pahansith
48e1241de6 Add email type corrective action transform 2020-09-30 21:44:03 +05:30
Pahansith
b33c5a312f Fix geofence creation validation 2020-09-30 19:42:00 +05:30
Inosh Perara
f9b25b95a2 Merge branch 'geofence-api' into 'corrective-policy'
Fix issue in geofence creation

See merge request entgra/carbon-device-mgt!650
2020-09-30 13:45:48 +00:00
Dharmakeerthi Lasantha
daaa44a2ea Merge branch 'corrective-policy' into 'corrective-policy'
Add APISelect class to policy mgt ui pack

See merge request entgra/carbon-device-mgt!647
2020-09-30 13:44:29 +00:00